forked from Wavyzz/dolibarr
FIX resolve conflicts
This commit is contained in:
@@ -2288,3 +2288,4 @@ DoesNotWorkWithAllThemes=Will not work with all themes
|
||||
NoName=No name
|
||||
ShowAdvancedOptions= Show advanced options
|
||||
HideAdvancedoptions= Hide advanced options
|
||||
CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
|
||||
|
||||
@@ -24,7 +24,8 @@ 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.
|
||||
ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
|
||||
ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
|
||||
ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
|
||||
ErrorDatabaseAlreadyExists=Database '%s' already exists.
|
||||
ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
|
||||
|
||||
@@ -178,3 +178,4 @@ IsAnAnswer=Is an answer of an initial email
|
||||
RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
|
||||
DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
|
||||
DefaultStatusEmptyMandatory=Empty but mandatory
|
||||
WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
|
||||
|
||||
@@ -155,3 +155,4 @@ LinkToParentMenu=Parent menu (fk_xxxxmenu)
|
||||
ListOfTabsEntries=List of tab entries
|
||||
TabsDefDesc=Define here the tabs provided by your module
|
||||
TabsDefDescTooltip=The tabs provided by your module/application are defined into the array <strong>$this->tabs</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.
|
||||
BadValueForType=Bad value for type %s
|
||||
Reference in New Issue
Block a user