From d0a15d32b2e04e0e3600d0b32e1d3592c12d602f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 18 Jun 2016 19:48:58 +0200 Subject: [PATCH] Clean language files --- dev/translation/sanity_check_en_langfiles.php | 30 +++++++- htdocs/langs/en_US/main.lang | 57 --------------- htdocs/langs/en_US/margins.lang | 7 +- htdocs/langs/en_US/members.lang | 35 --------- htdocs/langs/en_US/opensurvey.lang | 7 -- htdocs/langs/en_US/orders.lang | 26 ------- htdocs/langs/en_US/other.lang | 16 ---- htdocs/langs/en_US/paypal.lang | 2 - htdocs/langs/en_US/printing.lang | 35 +-------- htdocs/langs/en_US/products.lang | 73 ------------------- htdocs/langs/en_US/projects.lang | 15 ---- htdocs/langs/en_US/propal.lang | 22 ------ htdocs/langs/en_US/receiptprinter.lang | 54 -------------- htdocs/langs/en_US/resource.lang | 4 - htdocs/langs/en_US/sendings.lang | 20 ----- htdocs/langs/en_US/stocks.lang | 15 ---- htdocs/langs/en_US/supplier_proposal.lang | 13 +--- htdocs/langs/en_US/suppliers.lang | 10 +-- htdocs/langs/en_US/trips.lang | 16 ---- htdocs/langs/en_US/users.lang | 23 ------ htdocs/langs/en_US/website.lang | 3 +- htdocs/langs/en_US/withdrawals.lang | 13 ---- 22 files changed, 32 insertions(+), 464 deletions(-) diff --git a/dev/translation/sanity_check_en_langfiles.php b/dev/translation/sanity_check_en_langfiles.php index 9c422338d90..d32f45c6161 100755 --- a/dev/translation/sanity_check_en_langfiles.php +++ b/dev/translation/sanity_check_en_langfiles.php @@ -292,15 +292,39 @@ if ((! empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') || (isset($a if (preg_match('/^ErrorPriceExpression/', $value)) $qualifiedforclean=0; if (preg_match('/^Language_/', $value)) $qualifiedforclean=0; if (preg_match('/^DescADHERENT_/', $value)) $qualifiedforclean=0; + // main.lang if (preg_match('/^Duration/', $value)) $qualifiedforclean=0; if (preg_match('/^FormatDate/', $value)) $qualifiedforclean=0; if (preg_match('/^DateFormat/', $value)) $qualifiedforclean=0; if (preg_match('/^.b$/', $value)) $qualifiedforclean=0; if (preg_match('/^.*Bytes$/', $value)) $qualifiedforclean=0; - if (preg_match('/^By/', $value)) $qualifiedforclean=0; - if (preg_match('/^(DoTest|Under|Limits|Cards|CurrentValue|DateLimit|DateAndHour|NbOfLines|NbOfObjects|NbOfReferes|TotalTTCShort|VATs)/', $value)) $qualifiedforclean=0; - + // orders + if (preg_match('/^OrderSource/', $value)) $qualifiedforclean=0; + if (preg_match('/^TypeContact_/', $value)) $qualifiedforclean=0; + // other.lang + if (preg_match('/^Notify_/', $value)) $qualifiedforclean=0; + if (preg_match('/^PredefinedMail/', $value)) $qualifiedforclean=0; + if (preg_match('/^DemoCompany/', $value)) $qualifiedforclean=0; + if (preg_match('/^WeightUnit/', $value)) $qualifiedforclean=0; + if (preg_match('/^LengthUnit/', $value)) $qualifiedforclean=0; + if (preg_match('/^SurfaceUnit/', $value)) $qualifiedforclean=0; + if (preg_match('/^VolumeUnit/', $value)) $qualifiedforclean=0; + if (preg_match('/^SizeUnit/', $value)) $qualifiedforclean=0; + if (preg_match('/^EMailText/', $value)) $qualifiedforclean=0; + if (preg_match('/ById$/', $value)) $qualifiedforclean=0; + if (preg_match('/ByLogin$/', $value)) $qualifiedforclean=0; + // products + if (preg_match('/GlobalVariableUpdaterType$/', $value)) $qualifiedforclean=0; + if (preg_match('/GlobalVariableUpdaterHelp$/', $value)) $qualifiedforclean=0; + if (preg_match('/OppStatus/', $value)) $qualifiedforclean=0; + if (preg_match('/AvailabilityType/', $value)) $qualifiedforclean=0; + + if (preg_match('/sms/i', $value)) $qualifiedforclean=0; + if (preg_match('/TF_/i', $value)) $qualifiedforclean=0; + if (preg_match('/WithBankUsing/i', $value)) $qualifiedforclean=0; + if (preg_match('/descWORKFLOW_/i', $value)) $qualifiedforclean=0; + if (! $qualifiedforclean) { continue; diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 750e02fa11c..4b41f0ba038 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -45,10 +45,8 @@ 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. @@ -69,7 +67,6 @@ 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 @@ -79,8 +76,6 @@ 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 %s in configuration file conf.php.
This means that password database is extern to Dolibarr, so changing this field may have no effects. Administrator=Administrator Undefined=Undefined @@ -94,7 +89,6 @@ ConnectedSince=Connected since AuthenticationMode=Authentification mode RequestedUrl=Requested Url DatabaseTypeManager=Database type manager -RequestLastAccess=Latest database access request RequestLastAccessInError=Latest database access request error ReturnCodeLastAccessInError=Return code for latest database access request error InformationLastAccessInError=Information for latest database access request error @@ -115,7 +109,6 @@ Yes=Yes no=no No=No All=All -Alls=All Home=Home Help=Help OnlineHelp=Online help @@ -139,8 +132,6 @@ AddLink=Add link RemoveLink=Remove link AddToDraft=Add to draft Update=Update -AddActionToDo=Add event to do -AddActionDone=Add event done Close=Close CloseBox=Remove widget from your dashboard Confirm=Confirm @@ -158,7 +149,6 @@ Save=Save SaveAs=Save As TestConnection=Test connection ToClone=Clone -ConfirmCloneAction=Are you sure you want to clone this event ? ConfirmClone=Choose data you want to clone : NoCloneOptionsSpecified=No data to clone defined. Of=of @@ -187,13 +177,11 @@ 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 @@ -202,7 +190,6 @@ Type=Type Language=Language MultiLanguage=Multi-language Note=Note -CurrentNote=Current note Title=Title Label=Label RefOrLabel=Ref. or label @@ -220,7 +207,6 @@ AmountByMonth=Amount by month Numero=Number Limit=Limit Limits=Limits -DevelopmentTeam=Development Team Logout=Logout NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode %s Connection=Connection @@ -253,8 +239,6 @@ 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 @@ -308,7 +292,6 @@ Copy=Copy Paste=Paste Default=Default DefaultValue=Default value -DefaultGlobalValue=Global value Price=Price UnitPrice=Unit price UnitPriceHT=Unit price (net) @@ -316,7 +299,6 @@ UnitPriceTTC=Unit price PriceU=U.P. PriceUHT=U.P. (net) PriceUHTCurrency=U.P (currency) -SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Amount AmountInvoice=Invoice amount @@ -335,10 +317,7 @@ 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 @@ -355,7 +334,6 @@ 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 @@ -383,9 +361,7 @@ 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 @@ -398,7 +374,6 @@ 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 @@ -411,15 +386,11 @@ Generate=Generate Duration=Duration TotalDuration=Total duration Summary=Summary -MyBookmarks=My bookmarks -OtherInformationsBoxes=Other widgets -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 @@ -438,7 +409,6 @@ ApprovedBy2=Approved by (second approval) Approved=Approved Refused=Refused ReCalculate=Recalculate -ResultOk=Success ResultKo=Failure Reporting=Reporting Reportings=Reporting @@ -458,11 +428,9 @@ 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 @@ -534,10 +502,8 @@ ReportDescription=Description Report=Report Keyword=Keyword Legend=Legend -FillTownFromZip=Fill city from zip Fill=Fill Reset=Reset -ShowLog=Show log File=File Files=Files NotAllowed=Not allowed @@ -548,10 +514,8 @@ 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 NbOfObjectReferers=Number of related items Referers=Related items TotalQuantity=Total quantity @@ -566,20 +530,13 @@ 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 @@ -590,7 +547,6 @@ UndoExpandAll=Undo expand Reason=Reason FeatureNotYetSupported=Feature not yet supported CloseWindow=Close window -Question=Question Response=Response Priority=Priority SendByMail=Send by EMail @@ -601,7 +557,6 @@ EMail=E-mail 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 @@ -611,7 +566,6 @@ 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 widget Offered=Offered @@ -620,18 +574,14 @@ 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 YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup Color=Color Documents=Linked files -DocumentsNb=Linked files (%s) Documents2=Documents -BuildDocuments=Generated documents UploadDisabled=Upload disabled MenuECM=Documents MenuAWStats=AWStats @@ -654,7 +604,6 @@ 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 @@ -662,7 +611,6 @@ 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 %s is allowed to use application at the moment. CoreErrorTitle=System error CoreErrorMessage=Sorry, an error occurred. Check the logs or contact your system administrator. @@ -689,7 +637,6 @@ Frequency=Frequency IM=Instant messaging NewAttribute=New attribute AttributeCode=Attribute code -OptionalFieldsSetup=Extra attributes setup URLPhoto=URL of photo/logo SetLinkToAnotherThirdParty=Link to another third party CreateDraft=Create draft @@ -705,8 +652,6 @@ 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 AdminTools=Admin tools SystemTools=System tools @@ -714,7 +659,6 @@ ModulesSystemTools=Modules tools Test=Test Element=Element NoPhotoYet=No pictures available yet -HomeDashboard=Home summary Dashboard=Dashboard Deductible=Deductible from=from @@ -750,7 +694,6 @@ ConfirmDeleteLine=Are you sure you want to delete this line ? NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records TooManyRecordForMassAction=Too many records selected for mass action. The action is restricted to a list of %s records. MassFilesArea=Area for files built by mass actions -HideTempMassFilesArea=Hide area of files built by mass actions ShowTempMassFilesArea=Show area of files built by mass actions RelatedObjects=Related Objects ClassifyBilled=Classify billed diff --git a/htdocs/langs/en_US/margins.lang b/htdocs/langs/en_US/margins.lang index 32e6abf355e..12a61c146be 100644 --- a/htdocs/langs/en_US/margins.lang +++ b/htdocs/langs/en_US/margins.lang @@ -20,7 +20,6 @@ UserMargins=User margins ProductService=Product or Service AllProducts=All products and services ChooseProduct/Service=Choose product or service -Launch=Start ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default. MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts @@ -29,15 +28,11 @@ 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=Buying/Cost price suggested by default for margin calculation -MargeBrute=Raw margin -MargeNette=Net margin MargeType1=Margin on Best supplier price MargeType2=Margin on Weighted Average Price (WAP) MargeType3=Margin on Cost Price -MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price
Net margin : Selling price - Cost price MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card
* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined
* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined CostPrice=Cost price -BuyingCost=Cost price UnitCharges=Unit charges Charges=Charges AgentContactType=Commercial agent contact type @@ -45,4 +40,4 @@ AgentContactTypeDetails=Define what contact type (linked on invoices) will be us rateMustBeNumeric=Rate must be a numeric value markRateShouldBeLesserThan100=Mark rate should be lower than 100 ShowMarginInfos=Show margin infos -CheckMargins=Margins detail \ No newline at end of file +CheckMargins=Margins detail diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang index 7ebbe1dde4f..527a5bd7db3 100644 --- a/htdocs/langs/en_US/members.lang +++ b/htdocs/langs/en_US/members.lang @@ -1,19 +1,14 @@ # 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: %s, login: %s) is already linked to a third party %s. Remove this link first because a third party can't be linked to only a member (and vice versa). @@ -36,21 +31,16 @@ 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) @@ -62,17 +52,9 @@ MemberStatusPaidShort=Up to date MemberStatusResiliated=Resiliated member 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 @@ -81,8 +63,6 @@ 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 @@ -90,7 +70,6 @@ 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 @@ -111,23 +90,18 @@ 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=Latest %s members LastMembersModified=Latest %s modified members LastSubscriptionsModified=Latest %s modified subscriptions -AttributeName=Attribute name String=String Text=Text Int=Int DateAndTime=Date and time PublicMemberCard=Member public card -MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe SubscriptionNotRecorded=Subscription not recorded 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 @@ -147,12 +121,9 @@ 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 @@ -171,7 +142,6 @@ 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. @@ -192,11 +162,6 @@ 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 http://wiki.dolibarr.org/index.php/Subscribe.
To pay using a Credit Card or Paypal, click on button at bottom of this page.
ByProperties=By characteristics MembersStatisticsByProperties=Members statistics by characteristics MembersByNature=This screen show you statistics on members by nature. diff --git a/htdocs/langs/en_US/opensurvey.lang b/htdocs/langs/en_US/opensurvey.lang index bc90d1488e3..f42ea006eb6 100644 --- a/htdocs/langs/en_US/opensurvey.lang +++ b/htdocs/langs/en_US/opensurvey.lang @@ -3,7 +3,6 @@ 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 @@ -40,26 +39,20 @@ 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 %s does not exists. -OpenSurveyNothingToSetup=There is no specific setup to do. -PollWillExpire=Your poll will expire automatically %s 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 :
- empty,
- "8h", "8H" or "8:00" to give a meeting's start hour,
- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,
- "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 poll has been closed or voting delay has expired. diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index b7ed77b30ba..a57bce0569f 100644 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -6,7 +6,6 @@ OrderId=Order Id Order=Order Orders=Orders OrderLine=Order line -OrderFollow=Follow up OrderDate=Order date OrderDateShort=Order date OrderToProcess=Order to process @@ -20,7 +19,6 @@ CustomerOrder=Customer order 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 @@ -35,7 +33,6 @@ StatusOrderProcessedShort=Processed StatusOrderDelivered=Delivered StatusOrderDeliveredShort=Delivered StatusOrderToBillShort=Delivered -StatusOrderToBill2Short=To bill StatusOrderApprovedShort=Approved StatusOrderRefusedShort=Refused StatusOrderBilledShort=Billed @@ -49,7 +46,6 @@ StatusOrderOnProcess=Ordered - Standby reception StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Processed StatusOrderToBill=Delivered -StatusOrderToBill2=To bill StatusOrderApproved=Approved StatusOrderRefused=Refused StatusOrderBilled=Billed @@ -58,13 +54,8 @@ 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 CreateOrder=Create Order RefuseOrder=Refuse order @@ -76,22 +67,16 @@ DeleteOrder=Delete order CancelOrder=Cancel order OrderReopened= Order %s Reopened AddOrder=Create order -AddToMyOrders=Add to my orders -AddToOtherOrders=Add to other orders AddToDraftOrders=Add to draft order ShowOrder=Show order OrdersOpened=Orders to process -NoOpenedOrders=No open orders -NoOtherOpenedOrders=No other open orders NoDraftOrders=No draft orders NoOrder=No order NoSupplierOrder=No supplier order -OtherOrders=Other orders LastOrders=Latest %s customer orders LastCustomerOrders=Latest %s customer orders LastSupplierOrders=Latest %s supplier orders LastModifiedOrders=Latest %s modified orders -LastClosedOrders=Latest %s closed orders AllOrders=All orders NbOfOrders=Number of orders OrdersStatistics=Order's statistics @@ -101,7 +86,6 @@ 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 %s ? ConfirmUnvalidateOrder=Are you sure you want to restore order %s to draft status ? @@ -109,24 +93,17 @@ ConfirmCancelOrder=Are you sure you want to cancel this order ? ConfirmMakeOrder=Are you sure you want to confirm you made this order on %s ? GenerateBill=Generate invoice ClassifyShipped=Classify delivered -ComptaCard=Accountancy card DraftOrders=Draft orders DraftSuppliersOrders=Draft suppliers orders -RelatedOrders=Related orders -RelatedCustomerOrders=Related customer orders -RelatedSupplierOrders=Related supplier orders OnProcessOrders=In process orders RefOrder=Ref. order RefCustomerOrder=Ref. order for customer -RefCustomerOrderShort=Ref. order for cust. RefOrderSupplier=Ref. order for supplier 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 @@ -151,8 +128,6 @@ TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order 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 # Sources OrderSource0=Commercial proposal @@ -163,7 +138,6 @@ OrderSource4=Fax campaign OrderSource5=Commercial OrderSource6=Store QtyOrdered=Qty ordered -AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order # Documents models PDFEinsteinDescription=A complete order model (logo...) PDFEdisonDescription=A simple order model diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang index 66f734f3c1c..1d0452a2596 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -77,11 +77,9 @@ 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 latest change @@ -95,10 +93,7 @@ CanceledByLogin=User login who canceled ClosedByLogin=User login who closed FileWasRemoved=File %s was removed DirWasRemoved=Directory %s was removed -FeatureNotYetAvailableShort=Available in a future version FeatureNotYetAvailable=Feature not yet available in the current version -FeatureExperimental=Experimental feature. Not stable in the current version -FeatureDevelopment=Development feature. Not stable in the current version FeaturesSupported=Supported features Width=Width Height=Height @@ -110,7 +105,6 @@ Right=Right CalculatedWeight=Calculated weight CalculatedVolume=Calculated volume Weight=Weight -TotalWeight=Total weight WeightUnitton=tonne WeightUnitkg=kg WeightUnitg=g @@ -129,7 +123,6 @@ SurfaceUnitmm2=mm² SurfaceUnitfoot2=ft² SurfaceUnitinch2=in² Volume=Volume -TotalVolume=Total volume VolumeUnitm3=m³ VolumeUnitdm3=dm³ (L) VolumeUnitcm3=cm³ (ml) @@ -151,7 +144,6 @@ SendNewPasswordDesc=This form allows you to request a new password. It will be s BackToLoginPage=Back to login page AuthenticationDoesNotAllowSendNewPassword=Authentication mode is %s.
In this mode, Dolibarr can't know nor change your password.
Contact your system administrator if you want to change your password. EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option. -EnablePhpAVModuleDesc=You need to install a module compatible with your anti-virus. (Clamav : php4-clamavlib ou php5-clamavlib) ProfIdShortDesc=Prof Id %s is an information depending on third party country.
For example, for country %s, it's code %s. DolibarrDemo=Dolibarr ERP/CRM demo StatsByNumberOfUnits=Statistics in number of products/services units @@ -210,11 +202,8 @@ SourcesRepository=Repository for sources Chart=Chart ##### 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 @@ -222,9 +211,6 @@ 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 @@ -241,10 +227,8 @@ 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 ##### External sites ##### -ExternalSites=External sites WebsiteSetup=Setup of module website WEBSITE_PAGEURL=URL of page WEBSITE_TITLE=Title diff --git a/htdocs/langs/en_US/paypal.lang b/htdocs/langs/en_US/paypal.lang index 54f8cb1980f..179c9027089 100644 --- a/htdocs/langs/en_US/paypal.lang +++ b/htdocs/langs/en_US/paypal.lang @@ -3,7 +3,6 @@ PaypalSetup=PayPal module setup PaypalDesc=This module offer pages to allow payment on PayPal 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 @@ -15,7 +14,6 @@ PaypalModeOnlyPaypal=PayPal only PAYPAL_CSS_URL=Optionnal Url of CSS style sheet on payment page ThisIsTransactionId=This is id of transaction: %s 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 diff --git a/htdocs/langs/en_US/printing.lang b/htdocs/langs/en_US/printing.lang index 427b4973e80..14577a126e4 100644 --- a/htdocs/langs/en_US/printing.lang +++ b/htdocs/langs/en_US/printing.lang @@ -5,7 +5,6 @@ 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. MenuDirectPrinting=Direct Printing jobs DirectPrint=Direct print -ModuleDriverSetup=Setup Module Driver PrintingDriverDesc=Configuration variables for printing driver. ListDrivers=List of drivers PrintTestDesc=List of Printers. @@ -14,10 +13,8 @@ NoActivePrintingModuleFound=No active module to print document PleaseSelectaDriverfromList=Please select a driver from list. PleaseConfigureDriverfromList=Please configure the selected driver from list. SetupDriver=Driver setup -TestDriver=Test TargetedPrinter=Targeted printer UserConf=Setup per user -PRINTGCP=Google Cloud Print PRINTGCP_INFO=Google OAuth API setup PRINTGCP_AUTHLINK=Authentication PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token @@ -26,21 +23,6 @@ PRINTGCP_TOKEN_EXPIRED=Token Expired PRINTGCP_TOKEN_EXPIRE_AT=Token expire at PRINTGCP_DELETE_TOKEN=Delete saved token 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 @@ -48,21 +30,14 @@ 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 @@ -73,14 +48,6 @@ 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 DirectPrintingJobsDesc=This page lists printing jobs found for available printers. GoogleAuthNotConfigured=Google OAuth setup not done. Enable module OAuth and set a Google ID/Secret. -GoogleAuthConfigured=Google OAuth credentials found into setup of module OAuth. \ No newline at end of file +GoogleAuthConfigured=Google OAuth credentials found into setup of module OAuth. diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang index c0509e6a902..a6f2ba51f23 100644 --- a/htdocs/langs/en_US/products.lang +++ b/htdocs/langs/en_US/products.lang @@ -14,8 +14,6 @@ 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 @@ -25,29 +23,17 @@ 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 not for sale -ProductsAndServicesStatistics=Products and Services statistics -ProductsStatistics=Products statistics 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 not for sale ServicesOnSellAndOnBuy=Services for sale and for purchase -InternalRef=Internal reference -LastRecorded=Latest recorded products/services on sell -LastRecordedProductsAndServices=Latest %s recorded products/services LastModifiedProductsAndServices=Latest %s modified products/services LastRecordedProducts=Latest %s recorded products LastRecordedServices=Latest %s recorded services -LastProducts=Latest products -CardProduct0=Product card -CardProduct1=Service card -CardContract=Contract card Stock=Stock Stocks=Stocks -Movement=Movement Movements=Movements Sell=Sales Buy=Purchases @@ -62,7 +48,6 @@ ProductStatusOnBuy=For purchase ProductStatusNotOnBuy=Not for purchase ProductStatusOnBuyShort=For purchase ProductStatusNotOnBuyShort=Not for purchase -UpdatePrice=Update price UpdateVAT=Update vat UpdateDefaultPrice=Update default price UpdateLevelPrices=Update prices for each level @@ -70,22 +55,12 @@ AppliedPricesFrom=Applied prices from SellingPrice=Selling price SellingPriceHT=Selling price (net of tax) SellingPriceTTC=Selling price (inc. tax) -PublicPrice=Public price -CurrentPrice=Current price CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost. CostPriceUsage=In a future version, this value could be used for margin calculation. NewPrice=New price 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=Ongoing -ContractStatusExpired=expired -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. @@ -97,30 +72,19 @@ 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 ListOfStockMovements=List of stock movements BuyingPrice=Buying price PriceForEachProduct=Products with specific prices -NoPriceSpecificToCustomer=This customer has no specific prices. All standard prices for products/services will be used. SupplierCard=Supplier 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 package feature AssociatedProducts=Package product AssociatedProductsNumber=Number of products composing this package product @@ -128,12 +92,10 @@ ParentProductsNumber=Number of parent packaging product ParentProducts=Parent products 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 CategoryFilter=Category filter ProductToAddSearch=Search product to add -AddDel=Add/Delete NoMatchFound=No match found 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 @@ -147,22 +109,13 @@ 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 @@ -171,7 +124,6 @@ PredefinedServicesToPurchase=Predefined services to purchase PredefinedProductsAndServicesToPurchase=Predefined products/services to puchase NotPredefinedProducts=Not predefined products/services GenerateThumb=Generate thumb -ProductCanvasAbility=Use special "canvas" addons ServiceNb=Service #%s ListProductServiceByPopularity=List of products/services by popularity ListProductByPopularity=List of products by popularity @@ -192,7 +144,6 @@ 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 @@ -211,42 +162,24 @@ gram=gram g=g meter=meter m=m -linearmeter=linear meter lm=lm -squaremeter=square meter m2=m² -cubicmeter=cubic meter m3=m³ liter=liter l=L 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 MultipriceRules=Price level rules UseMultipriceRules=Use price level rules (defined into product module setup) to autocalculate prices of all other level according to first level PercentVariationOver=%% variation over %s PercentDiscountOver=%% discount over %s ### 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=Products and prices for each price level ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices) ProductSellByQuarterHT=Products turnover quarterly before tax @@ -297,12 +230,6 @@ AddUpdater=Add Updater GlobalVariables=Global variables VariableToUpdate=Variable to update 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 diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index 6d1c8e4e3cb..1a370ecf47a 100644 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -26,18 +26,13 @@ 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=Latest %s projects -AllProjects=All projects OpenedProjects=Open projects OpenedTasks=Open tasks OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status OpportunitiesStatusForProjects=Opportunities amount of projects by status -ProjectsList=List of projects ShowProject=Show project SetProject=Set project NoProject=No project defined or owned -NbOpenTasks=Nb of open tasks NbOfProjects=Nb of projects TimeSpent=Time spent TimeSpentByYou=Time spent by you @@ -53,7 +48,6 @@ TasksOnOpenedProject=Tasks on open projects WorkloadNotDefined=Workload not defined NewTimeSpent=New time spent MyTimeSpent=My time spent -MyTasks=My tasks Tasks=Tasks Task=Task TaskDateStart=Task start date @@ -61,10 +55,8 @@ 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 MyProjectsArea=My projects Area @@ -87,7 +79,6 @@ 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 @@ -150,18 +141,13 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Select element AddElement=Link to element -UnlinkElement=Unlink element # Documents models DocumentModelBeluga=Project template for linked objects overview DocumentModelBaleine=Project report template for tasks PlannedWorkload=Planned workload PlannedWorkloadShort=Workload -WorkloadOccupation=Workload assignation ProjectReferers=Related items -SearchAProject=Search a project -SearchATask=Search a task ProjectMustBeValidatedFirst=Project must be validated first -ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a resource to allocate time InputPerDay=Input per day InputPerWeek=Input per week @@ -170,7 +156,6 @@ 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 ResourceNotAssignedToTheTask=Not assigned to the task AssignTaskToMe=Assign task to me AssignTask=Assign diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang index 943cde76835..8c8c37a7bb1 100644 --- a/htdocs/langs/en_US/propal.lang +++ b/htdocs/langs/en_US/propal.lang @@ -3,27 +3,21 @@ 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 %s ? LastPropals=Latest %s proposals -LastClosedProposals=Latest %s closed proposals LastModifiedProposals=Latest %s modified proposals AllPropals=All proposals -LastProposals=Latest proposals SearchAProposal=Search a proposal NoProposal=No proposal ProposalsStatistics=Commercial proposal's statistics @@ -33,17 +27,12 @@ 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 @@ -52,24 +41,14 @@ 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 -NoPropal=No commercial proposal 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=Set status to SetAcceptedRefused=Set accepted/refused -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 @@ -96,7 +75,6 @@ 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) diff --git a/htdocs/langs/en_US/receiptprinter.lang b/htdocs/langs/en_US/receiptprinter.lang index a2f3ba26a21..756461488cc 100644 --- a/htdocs/langs/en_US/receiptprinter.lang +++ b/htdocs/langs/en_US/receiptprinter.lang @@ -35,64 +35,10 @@ DOL_ALIGN_RIGHT=Right align text DOL_USE_FONT_A=Use font A of printer DOL_USE_FONT_B=Use font B of printer DOL_USE_FONT_C=Use font C of printer -DOL_BOLD=Text Bold -/DOL_BOLD=End of Text Bold -DOL_DOUBLE_HEIGHT=Text double height -/DOL_DOUBLE_HEIGHT=End of Text double height -DOL_DOUBLE_WIDTH=Text double width -/DOL_DOUBLE_WIDTH=End of Text double width -DOL_UNDERLINE=Underline text -/DOL_UNDERLINE=End of Underline text -DOL_UNDERLINE_2DOTS=Underline with double line -/DOL_UNDERLINE_2DOTS=End of Underline with double line -DOL_EMPHASIZED=Emphasized text -/DOL_EMPHASIZED=End of Emphasized text -DOL_SWITCH_COLORS=Print in white on black -/DOL_SWITCH_COLORS=End of Print in white on black DOL_PRINT_BARCODE=Print barcode DOL_PRINT_BARCODE_CUSTOMER_ID=Print barcode customer id -DOL_SET_PRINT_WIDTH_57=Ticket print width of 57mm DOL_CUT_PAPER_FULL=Cut ticket completely DOL_CUT_PAPER_PARTIAL=Cut ticket partially DOL_OPEN_DRAWER=Open cash drawer DOL_ACTIVATE_BUZZER=Activate buzzer DOL_PRINT_QRCODE=Print QR Code -DOL_PRINT_DATE=Print date AAAA-MM-DD -DOL_PRINT_DATE_TIME=Print date and time AAAA-MM-DD HH:MM:SS -DOL_PRINT_YEAR=Print Year -DOL_PRINT_MONTH_LETTERS=Print month in letters (example : november) -DOL_PRINT_MONTH=Print month number -DOL_PRINT_DAY=Print day number -DOL_PRINT_DAY_LETTERS=Print day number -DOL_PRINT_TABLE=Print table number (for restaurant, bar...) -DOL_PRINT_CUTLERY=Print number of cutlery (for restaurant) -DOL_PRINT_PAYMENT=Print payment method -DOL_PRINT_LOGO=Print logo stored on printer. Example : 32|32 -DOL_PRINT_LOGO_OLD=Print logo stored on printer. Must be followed by logo code. For old printers. -DOL_PRINT_ORDER_LINES=Print order lines -DOL_PRINT_ORDER_TAX=Print order total tax -DOL_PRINT_ORDER_LOCAL_TAX=Print order local tax -DOL_PRINT_ORDER_TOTAL=Print order total -DOL_PRINT_ORDER_NUMBER=Print order number -DOL_PRINT_ORDER_NUMBER_UNIQUE=Print order number after validation -DOL_PRINT_CUSTOMER_FIRSTNAME=Print customer name -DOL_PRINT_CUSTOMER_LASTNAME=Print customer surname -DOL_PRINT_CUSTOMER_MAIL=Print customer mail -DOL_PRINT_CUSTOMER_PHONE=Print customer phone -DOL_PRINT_CUSTOMER_MOBILE=Print customer mobile -DOL_PRINT_CUSTOMER_SKYPE=Print customer skype -DOL_PRINT_CUSTOMER_TAX_NUMBER=Print customer VAT number -DOL_PRINT_CUSTOMER_ACCOUNT_BALANCE=Print customer account balance -DOL_PRINT_VENDOR_LASTNAME=Print vendor surname -DOL_PRINT_VENDOR_FIRSTNAME=Print vendor name -DOL_PRINT_VENDOR_MAIL=Print vendor mail -DOL_PRINT_CUSTOMER_POINTS=Print customer points -DOL_PRINT_ORDER_POINTS=Print number of points for this order -DOL_PRINT_IF_CUSTOMER=Print the line IF a customer is affected to the order -DOL_PRINT_IF_VENDOR=Print the line IF a vendor is affected to the order -DOL_PRINT_IF_HAPPY_HOUR=Print the line IF Happy Hour -DOL_PRINT_IF_NUM_ORDER_UNIQUE=Print the line IF order is validated -DOL_PRINT_IF_CUSTOMER_POINTS=Print the line IF customer points > 0 -DOL_PRINT_IF_ORDER_POINTS=Print the line IF points of the order > 0 -DOL_PRINT_IF_CUSTOMER_TAX_NUMBER=Print the line IF customer has vat number -DOL_PRINT_IF_CUSTOMER_ACCOUNT_BALANCE_POSITIVE=Print the line IF customer balance > 0 diff --git a/htdocs/langs/en_US/resource.lang b/htdocs/langs/en_US/resource.lang index cdff0391c30..f95121db351 100644 --- a/htdocs/langs/en_US/resource.lang +++ b/htdocs/langs/en_US/resource.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - resource MenuResourceIndex=Resources MenuResourceAdd=New resource -MenuResourcePlanning=Resource planning DeleteResource=Delete resource ConfirmDeleteResourceElement=Confirm delete the resource for this element NoResourceInDatabase=No resource in database. @@ -18,8 +17,6 @@ ResourceFormLabel_description=Resource description ResourcesLinkedToElement=Resources linked to element ShowResource=Show resource -ShowResourcePlanning=Show resource planning -GotoDate=Go to date ResourceElementPage=Element resources ResourceCreatedWithSuccess=Resource successfully created @@ -27,7 +24,6 @@ RessourceLineSuccessfullyDeleted=Resource line successfully deleted RessourceLineSuccessfullyUpdated=Resource line successfully updated ResourceLinkedWithSuccess=Resource linked with success -TitleResourceCard=Resource card ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted DictionaryResourceType=Type of resources diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang index 270c92b3045..5a4ef0da435 100644 --- a/htdocs/langs/en_US/sendings.lang +++ b/htdocs/langs/en_US/sendings.lang @@ -10,42 +10,31 @@ Receivings=Delivery Receipts SendingsArea=Shipments area ListOfSendings=List of shipments SendingMethod=Shipping method -SendingReceipt=Shipping receipt LastSendings=Latest %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 QtyShipped=Qty shipped QtyToShip=Qty to ship QtyReceived=Qty received KeepToShip=Remain to ship OtherSendingsForSameOrder=Other shipments for this 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 %s ? 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. @@ -57,11 +46,7 @@ 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 opened customer order already sent @@ -69,14 +54,9 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened suppli NoProductToShipFoundIntoStock=No product to ship found into warehouse %s. Correct stock or go back to choose another warehouse. WeightVolShort=Weight/Vol. ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments. -CloseShippeOrdersAutomatically=Classify the order "Delivered" if entirely shipped. # Sending methods -SendingMethodCATCH=Catch by customer -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 diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang index c0f304bce35..d295e4b3451 100644 --- a/htdocs/langs/en_US/stocks.lang +++ b/htdocs/langs/en_US/stocks.lang @@ -5,8 +5,6 @@ Warehouses=Warehouses NewWarehouse=New warehouse / Stock area WarehouseEdit=Modify warehouse MenuNewWarehouse=New warehouse -WarehouseOpened=Warehouse open -WarehouseClosed=Warehouse closed WarehouseSource=Source warehouse WarehouseSourceNotDefined=No warehouse defined, AddOne=Add one @@ -17,11 +15,8 @@ DeleteSending=Delete sending Stock=Stock Stocks=Stocks StocksByLotSerial=Stocks 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 @@ -41,7 +36,6 @@ StockMovements=Stock movements 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 @@ -63,7 +57,6 @@ DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification close 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. @@ -73,10 +66,6 @@ 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 @@ -96,10 +85,8 @@ 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 optimal stock DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature. -DesiredMaxStock=Desired maximum stock StockToBuy=To order Replenishment=Replenishment ReplenishmentOrders=Replenishment orders @@ -122,7 +109,6 @@ 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 @@ -137,7 +123,6 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse 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 which lot/serial are available for products requiring 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 (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/en_US/supplier_proposal.lang b/htdocs/langs/en_US/supplier_proposal.lang index 394d4cabe01..86127b11a96 100644 --- a/htdocs/langs/en_US/supplier_proposal.lang +++ b/htdocs/langs/en_US/supplier_proposal.lang @@ -13,34 +13,23 @@ SupplierProposalArea=Supplier proposals area SupplierProposalShort=Supplier proposal SupplierProposals=Supplier proposals NewAskPrice=New price request -NewAsk=New request ShowSupplierProposal=Show price request AddSupplierProposal=Create a price request SupplierProposalRefFourn=Supplier ref SupplierProposalDate=Delivery date SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references. -RelatedSupplierProposal=Related price requests suppliers ConfirmValidateAsk=Are you sure you want to validate this price request under name %s ? -DateAsk=Date of request DeleteAsk=Delete request ValidateAsk=Validate request -AddAsk=Create a request -SupplierProposalDraft=Drafts -SupplierProposalOpened=Open SupplierProposalStatusDraft=Draft (needs to be validated) SupplierProposalStatusValidated=Validated (request is open) -SupplierProposalStatusOpened=Validated (request is open) SupplierProposalStatusClosed=Closed SupplierProposalStatusSigned=Accepted SupplierProposalStatusNotSigned=Refused -SupplierProposalStatusBilled=Billed SupplierProposalStatusDraftShort=Draft -SupplierProposalStatusValidatedShort=Validated -SupplierProposalStatusOpenedShort=Open SupplierProposalStatusClosedShort=Closed SupplierProposalStatusSignedShort=Accepted SupplierProposalStatusNotSignedShort=Refused -SupplierProposalStatusBilledShort=Billed CopyAskFrom=Create price request by copying existing a request CreateEmptyAsk=Create blank request CloneAsk=Clone price request @@ -60,4 +49,4 @@ ListOfSupplierProposal=List of supplier proposal requests SupplierProposalsToClose=Supplier proposals to close SupplierProposalsToProcess=Supplier proposals to process LastSupplierProposals=Last price requests -AllPriceRequests=All requests \ No newline at end of file +AllPriceRequests=All requests diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang index 8c96a0a68e8..10b4a5e60c8 100644 --- a/htdocs/langs/en_US/suppliers.lang +++ b/htdocs/langs/en_US/suppliers.lang @@ -1,7 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Suppliers -AddSupplier=Create a supplier -SupplierRemoved=Supplier removed SuppliersInvoice=Suppliers invoice ShowSupplierInvoice=Show Supplier Invoice NewSupplier=New supplier @@ -11,14 +9,11 @@ ShowSupplier=Show supplier OrderDate=Order date BuyingPriceMin=Minimum purchase price BuyingPriceMinShort=Min purchase price -SellingPriceMinShort=Min sell price -TotalBuyingPriceMin=Total of subproducts buying prices TotalBuyingPriceMinShort=Total of subproducts purchase prices TotalSellingPriceMinShort=Total of subproducts sell prices SomeSubProductHaveNoPrices=Some sub-products have no price defined AddSupplierPrice=Add supplier price ChangeSupplierPrice=Change supplier price -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 @@ -33,12 +28,9 @@ ConfirmApproveThisOrder=Are you sure you want to approve order %s ? DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ? ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ? -AddCustomerOrder=Create customer order -AddCustomerInvoice=Create customer invoice AddSupplierOrder=Create supplier order AddSupplierInvoice=Create supplier invoice ListOfSupplierProductForSupplier=List of products and prices for supplier %s -NoneOrBatchFileNeverRan=None or batch %s not ran recently SentToSuppliers=Sent to suppliers ListOfSupplierOrders=List of supplier orders MenuOrdersSupplierToBill=Supplier orders to invoice @@ -48,4 +40,4 @@ UseDoubleApproval=Use double approval when amount (without tax) is higher than ( SupplierReputation=Supplier reputation DoNotOrderThisProductToThisSupplier=Do not order NotTheGoodQualitySupplier=Wrong quality -ReputationForThisProduct=Reputation \ No newline at end of file +ReputationForThisProduct=Reputation diff --git a/htdocs/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang index 9b96843f98d..33f98d6d5a7 100644 --- a/htdocs/langs/en_US/trips.lang +++ b/htdocs/langs/en_US/trips.lang @@ -1,7 +1,6 @@ # 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 @@ -12,21 +11,18 @@ ListOfFees=List of fees ShowTrip=Show expense report 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 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report ExpenseReportLine=Expense report line @@ -43,13 +39,8 @@ TF_HOTEL=Hotel TF_TAXI=Taxi ErrorDoubleDeclaration=You have declared another expense report into a similar date range. -AucuneNDF=No expense reports found for this criteria AucuneLigne=There is no expense report declared yet -AddLine=Add a line -AddLineMini=Add -Date_DEBUT=Period date start -Date_FIN=Period date end ModePaiement=Payment mode VALIDATOR=User responsible for approval @@ -64,21 +55,15 @@ MOTIF_CANCEL=Reason DATE_REFUS=Deny date DATE_SAVE=Validation date -DATE_VALIDE=Validation date DATE_CANCEL=Cancelation date DATE_PAIEMENT=Payment date -TO_PAID=Pay 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. -RefuseTrip=Deny an expense report ConfirmRefuseTrip=Are you sure you want to deny this expense report ? ValideTrip=Approve expense report @@ -87,7 +72,6 @@ ConfirmValideTrip=Are you sure you want to approve this expense report ? PaidTrip=Pay an expense report ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? -CancelTrip=Cancel an expense report ConfirmCancelTrip=Are you sure you want to cancel this expense report ? BrouillonnerTrip=Move back expense report to status "Draft" diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang index 13f816c7a3e..a8447504235 100644 --- a/htdocs/langs/en_US/users.lang +++ b/htdocs/langs/en_US/users.lang @@ -1,9 +1,7 @@ # 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 @@ -11,8 +9,6 @@ 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 @@ -20,31 +16,23 @@ 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 %s ? -ConfirmDisableGroup=Are you sure you want to disable group %s ? ConfirmDeleteUser=Are you sure you want to delete user %s ? ConfirmDeleteGroup=Are you sure you want to delete group %s ? ConfirmEnableUser=Are you sure you want to enable user %s ? -ConfirmEnableGroup=Are you sure you want to enable group %s ? ConfirmReinitPassword=Are you sure you want to generate a new password for user %s ? ConfirmSendNewPassword=Are you sure you want to generate and send new password for user %s ? 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 SuperAdministrator=Super Administrator SuperAdministratorDesc=Global administrator AdministratorDesc=Administrator -AdministratorDescEntity=Administrator (for its company) DefaultRights=Default permissions DefaultRightsDesc=Define here default permissions that are automatically granted to a new created user (Go on user card to change permission of an existing user). DolibarrUsers=Dolibarr users @@ -57,7 +45,6 @@ RemoveFromGroup=Remove from group PasswordChangedAndSentTo=Password changed and sent to %s. PasswordChangeRequestSent=Request to change password for %s sent to %s. MenuUsersAndGroups=Users & Groups -MenuMyUserCard=My user card LastGroupsCreated=Latest %s created groups LastUsersCreated=Latest %s users created ShowGroup=Show group @@ -65,25 +52,17 @@ 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 @@ -94,8 +73,6 @@ 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 diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang index d43b65fc0f8..64e5041061a 100644 --- a/htdocs/langs/en_US/website.lang +++ b/htdocs/langs/en_US/website.lang @@ -4,7 +4,6 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n DeleteWebsite=Delete website ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. WEBSITE_PAGENAME=Page name/alias -WEBSITE_URL=Web site URL WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS content MediaFiles=Media library @@ -21,4 +20,4 @@ PageAdded=Page '%s' added ViewSiteInNewTab=View site in new tab ViewPageInNewTab=View page in new tab SetAsHomePage=Set as Home page -RealURL=Real URL \ No newline at end of file +RealURL=Real URL diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang index 1b282432a16..54b3de3915b 100644 --- a/htdocs/langs/en_US/withdrawals.lang +++ b/htdocs/langs/en_US/withdrawals.lang @@ -1,24 +1,16 @@ # 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=Latest %s withdrawal receipts -WithdrawedBills=Withdrawal 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 @@ -32,7 +24,6 @@ WithdrawRejectStatistics=Withdraw reject's statistics LastWithdrawalReceipt=Latest %s withdrawal 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? @@ -48,7 +39,6 @@ RefusedReason=Reason for rejection RefusedInvoicing=Billing the rejection NoInvoiceRefused=Do not charge the rejection InvoiceRefused=Invoice refused (Charge the rejection to customer) -StatusUnknown=Unknown StatusWaiting=Waiting StatusTrans=Sent StatusCredited=Credited @@ -67,10 +57,8 @@ 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 @@ -95,7 +83,6 @@ InfoCreditMessage=The standing order %s has been paid by the bank
Data of pay InfoTransSubject=Transmission of standing order %s to bank InfoTransMessage=The standing order %s has been sent to bank by %s %s.

InfoTransData=Amount: %s
Method: %s
Date: %s -InfoFoot=This is an automated message sent by Dolibarr InfoRejectSubject=Standing order refused InfoRejectMessage=Hello,

the standing order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.

--
%s ModeWarning=Option for real mode was not set, we stop after this simulation