diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 8a023e99569..2e3d011a0bd 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -141,7 +141,7 @@ LangFile=.lang file System=System SystemInfo=System information SystemToolsArea=System tools area -SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for. +SystemToolsAreaDesc=This area provides administration functions. Use the menu to choose the required feature. Purge=Purge PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in %s directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server. PurgeDeleteLogFile=Delete log files, including %s defined for Syslog module (no risk of losing data) @@ -1071,7 +1071,7 @@ SecurityEventsPurged=Security events purged LogEventDesc=Enable logging for specific security events. Administrators the log via menu %s - %s. Warning, this feature can generate a large amount of data in the database. AreaForAdminOnly=Setup parameters can be set by administrator users 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. +SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction. CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page. AccountantDesc=Edit the details of your accountant/bookkeeper AccountantFileNumber=File number @@ -1162,7 +1162,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire TranslationSetup=Setup of translation TranslationKeySearch=Search a translation key or string TranslationOverwriteKey=Overwrite a translation string -TranslationDesc=How to set the display language:
* Default/Systemwide: menu Home -> Setup -> Display
* Per user: Click on the username at the top of the screen and modify the User display setup tab on the user card. +TranslationDesc=How to set the display language:
* Default/Systemwide: menu Home -> Setup -> Display
* Per user: Click on the username at the top of the screen and modify the User Display Setup tab on the user card. TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s" TranslationOverwriteDesc2=You can use the other tab to help you know which translation key to use TranslationString=Translation string @@ -1175,7 +1175,7 @@ TotalNumberOfActivatedModules=Activated application/modules: %s / %s SuhosinSessionEncrypt=Session storage encrypted by Suhosin ConditionIsCurrently=Condition is currently %s YouUseBestDriver=You use driver %s which is the best driver currently available. diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index eab8a6d916f..4702d6188b5 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -96,8 +96,8 @@ PasswordForgotten=Password forgotten? NoAccount=No account? SeeAbove=See above HomeArea=Home -LastConnexion=Latest connection -PreviousConnexion=Previous connection +LastConnexion=Last login +PreviousConnexion=Previous login PreviousValue=Previous value ConnectedOnMultiCompany=Connected on environment ConnectedSince=Connected since diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang index c850aca50e3..862d137a510 100644 --- a/htdocs/langs/en_US/users.lang +++ b/htdocs/langs/en_US/users.lang @@ -12,7 +12,7 @@ PasswordChangedTo=Password changed to: %s SubjectNewPassword=Your new password for %s GroupRights=Group permissions UserRights=User permissions -UserGUISetup=User display setup +UserGUISetup=User Display Setup DisableUser=Disable DisableAUser=Disable a user DeleteUser=Delete @@ -69,7 +69,7 @@ InternalUser=Internal user ExportDataset_user_1=Users and their properties DomainUser=Domain user %s Reactivate=Reactivate -CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, vendor, ...), use the button 'Create Dolibarr user' from third-party's contact card. +CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc. ..), use the button 'Create Dolibarr User' from that third-party's contact card. InternalExternalDesc=An internal user is a user that is part of your company/organization.
An external user is a customer, vendor or other.

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 @@ -107,5 +107,5 @@ DisabledInMonoUserMode=Disabled in maintenance mode UserAccountancyCode=User accounting code UserLogoff=User logout UserLogged=User logged -DateEmployment=Date of Employment -DateEmploymentEnd=End date of Employment +DateEmployment=Employment Start Date +DateEmploymentEnd=Employment End Date diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang index bdfe8130d2b..016ef62fca5 100644 --- a/htdocs/langs/en_US/withdrawals.lang +++ b/htdocs/langs/en_US/withdrawals.lang @@ -102,6 +102,9 @@ SEPARCUR=SEPA CUR SEPAFRST=SEPA FRST ExecutionDate=Execution date CreateForSepa=Create direct debit file +ICS=Creditor Identifier CI +END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction +USTRD="Unstructured" SEPA XML tag ### Notifications InfoCreditSubject=Payment of direct debit payment order %s by the bank