conf
YouCanSubmitFile=Als alternatief kunt u het module .zip-bestandspakket uploaden:
LastStableVersion=Nieuwste stabiele versie
GenericMaskCodes2={cccc} de clientcode van n tekens
{cccc000} de klantcode op n tekens wordt gevolgd door een teller voor de klant. Deze teller die aan de klant is toegewezen, wordt tegelijkertijd opnieuw ingesteld als de globale teller.
{tttt} De code van het type van een derde partij op n tekens (zie menu Home - Instellingen - Woordenboek - Typen derde partijen). Als u deze tag toevoegt, verschilt de teller voor elk type derde partij.
+GenericMaskCodes4a=Voorbeeld op de 99e %s van de derde partij TheCompany, met datum 31-01-2007:
+GenericMaskCodes5=ABC {jj} {mm} - {000000} geeft ABC0701-000099
{0000 + 100 @ 1} -ZZZ / {dd} / XXX geeft 0199-ZZZ / 31 / XXX
IN {jj} {mm} - {0000} - {t} geeft IN0701-0099-A als het type bedrijf 'Responsable Inscripto' is met code voor het type dat 'A_RI' is
+DisableLinkToHelp=Link naar online help "%s" verbergen
+AddCRIfTooLong=Er is geen automatische tekst terugloop, tekst die te lang is, wordt niet weergegeven op documenten. Voeg indien nodig regeleinden in het tekstgebied toe.
+ConfirmPurge=Weet u zeker dat u deze zuivering wilt uitvoeren?
Hiermee worden al uw gegevensbestanden permanent verwijderd zonder dat u ze kunt herstellen (ECM-bestanden, bijgevoegde bestanden ...).
+LanguageFile=Bestandstaal
+ListOfDirectoriesForModelGenODT=Lijst met mappen die sjablonenbestanden met OpenDocument-indeling bevatten.
Plaats hier het volledige pad van mappen.
Voeg een regelterugloop toe tussen elke directory.
Voeg hier een map van de GED-module toe DOL_DATA_ROOT/ecm/yourdirectoryname .
Bestanden in die mappen moeten eindigen op .odt of .ods.
+NumberOfModelFilesFound=Aantal ODT / ODS-sjabloonbestanden gevonden in deze mappen
+DescWeather=De volgende afbeeldingen worden op het dashboard weergegeven wanneer het aantal late acties de volgende waarden bereikt:
+ConnectionTimeout=Time-out verbinding
+ModuleMustBeEnabledFirst=Module %s moet eerst worden ingeschakeld als u deze functie nodig hebt.
+NoSmsEngine=Geen SMS-afzenderbeheerder beschikbaar. Een SMS-afzenderbeheer is niet geïnstalleerd met de standaarddistributie omdat deze afhankelijk zijn van een externe leverancier, maar u kunt er enkele vinden op %s
+PDFDesc=Wereldwijde opties voor het genereren van PDF's.
+PDFAddressForging=Regels voor adresvakken
+HideAnyVATInformationOnPDF=Verberg alle informatie met betrekking tot omzetbelasting / btw
+PDFRulesForSalesTax=Regels voor omzetbelasting / btw
+HideLocalTaxOnPDF=Tarief %s verbergen in de kolom Belastinguitverkoop
+HideDescOnPDF=Productbeschrijving verbergen
+HideRefOnPDF=Verberg ref. producten
+HideDetailsOnPDF=Verberg details van productlijnen
+PlaceCustomerAddressToIsoLocation=Gebruik de Franse standaardpositie (La Poste) voor de positie van het klantadres
+ButtonHideUnauthorized=Knoppen verbergen voor niet-beheerders voor ongeautoriseerde acties in plaats van grijze uitgeschakelde knoppen te tonen
+MassConvert=Start bulkconversie
+Boolean=Boolean (één selectievakje)
+ExtrafieldUrl =url
+ExtrafieldSeparator=Separator (geen veld)
ExtrafieldPassword=Paswoord
+ExtrafieldRadio=Radioknoppen (slechts één keuze)
+ExtrafieldCheckBox=checkboxes
+ExtrafieldCheckBoxFromList=Selectievakjes uit tabel
+ComputedFormulaDesc=U kunt hier een formule invoeren met andere eigenschappen van het object of een willekeurige PHP-codering om een dynamische berekende waarde te krijgen. U kunt alle PHP-compatibele formules gebruiken, inclusief de "?" voorwaarde-operator en het volgende globale object: $db, $conf, $langs, $mysoc, $user, $object .
WAARSCHUWING: Mogelijk zijn slechts enkele eigenschappen van $ object beschikbaar. Als u eigenschappen nodig hebt die niet zijn geladen, haalt u het object gewoon in uw formule op zoals in het tweede voorbeeld.
Als u een berekend veld gebruikt, kunt u geen waarde invoeren via de interface. Als er een syntaxisfout is, kan de formule ook niets retourneren.
Voorbeeld van formule:
$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)
Voorbeeld om een object opnieuw te laden
(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'
Ander voorbeeld van een formule om de belasting van het object en het bovenliggende object te forceren:
(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
LibraryToBuildPDF=Bibliotheek om PDF bestanden te genereren.
+SetAsDefault=Instellen als standaard
+NoDetails=Geen aanvullende details in voettekst
+DisplayCompanyInfo=Bedrijfsadres weergeven
+DisplayCompanyManagers=Namen van beheerders weergeven
+DisplayCompanyInfoAndManagers=Bedrijfsadres en namen van managers weergeven
+ModuleCompanyCodePanicum=Retourneer een lege boekhoudcode.
Module40Name=Verkoper
Module1780Name=Labels/Categorien
Module1780Desc=Label/categorie maken (producten, klanten, leveranciers, contacten of leden)
@@ -137,3 +173,6 @@ MailToSendProposal=Klant voorstellen
MailToSendInvoice=Klantfacturen
AddBoxes=Widgets toevoegen
OperationParamDesc=Define values to use for action, or how to extract values. For example:
objproperty1=SET:abc
objproperty1=SET:a value with replacement of __objproperty1__
objproperty3=SETIFEMPTY:abc
objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)
options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)
object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)
Use a ; char as separator to extract or set several properties.
+GeneralOptions=Algemene opties
+ExportSetup=Installatie van module Exporteren
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/nl_BE/bills.lang b/htdocs/langs/nl_BE/bills.lang
index 65b4e272aaf..342d138fb72 100644
--- a/htdocs/langs/nl_BE/bills.lang
+++ b/htdocs/langs/nl_BE/bills.lang
@@ -10,6 +10,7 @@ DoPaymentBack=Doe een terugbetaling
StatusOfGeneratedInvoices=Lijst van genereerde facturen
BillStatusDraft=Conceptfactuur (moet worden gevalideerd)
BillShortStatusClosedUnpaid=Afgesloten
+ErrorVATIntraNotConfigured=Intracommunautair btw-nummer nog niet gedefinieerd
LastCustomersBills=Laatste %s klantfacturen
AmountOfBillsByMonthHT=Factuurbedrag per maand (ex BTW)
ShowInvoiceSituation=Toon situatie factuur
diff --git a/htdocs/langs/nl_BE/companies.lang b/htdocs/langs/nl_BE/companies.lang
index d8554b469d8..2cb3ef0e33b 100644
--- a/htdocs/langs/nl_BE/companies.lang
+++ b/htdocs/langs/nl_BE/companies.lang
@@ -47,12 +47,17 @@ ProfId2TN=Prof. id 2 (Fiscale inschrijving)
ProfId2DZ=Kunst.
VATReturn=BTW teruggave
SupplierRelativeDiscount=Relatieve leverancierskorting
+HasRelativeDiscountFromSupplier=U heeft een standaardkorting van %s%% van deze verkoper
HasNoRelativeDiscountFromSupplier=U heeft standaard geen relatieve korting van deze leverancier
CompanyHasCreditNote=Deze afnemer heeft nog creditnota's of eerdere stortingen voor %s %s
+HasDownPaymentOrCommercialDiscountFromSupplier=U hebt kortingen beschikbaar (commercieel, aanbetalingen) voor %s %s van deze verkoper
+HasCreditNoteFromSupplier=U hebt creditnota's voor %s %s van deze verkoper
CustomerAbsoluteDiscountAllUsers=Absolute klantkortingen (toegekend door alle gebruikers)
CustomerAbsoluteDiscountMy=Absolute klantkortingen (door uzelf verleend)
SupplierAbsoluteDiscountAllUsers=Absolute leverancierskortingen (ingevoerd door alle gebruikers)
SupplierAbsoluteDiscountMy=Absolute verkopers-kortingen (zelf ingevoerd)
+Vendor=Verkoper
+Supplier=Verkoper
AccountancyCode=Boekhouder account
CustomerCode=Klantcode
SupplierCode=Leverancierscode
@@ -68,7 +73,6 @@ ContactForContracts=Contactpersoon contracten
ContactForInvoices=Contactpersoon facturen
NoContactForAnyOrderOrShipments=Dit contact is geen contact voor een bestelling of verzending
NewContactAddress=Nieuw contact / adres
-ThisUserIsNot=Deze gebruiker is geen prospect, klant of verkoper
VATIntraManualCheck=U kunt ook handmatig controleren op de website van de Europese Commissie %s
ErrorVATCheckMS_UNAVAILABLE=Controle niet mogelijk. Controledienst wordt niet verleend door lidstaat (%s).
ContactOthers=Ander
@@ -99,3 +103,5 @@ SaleRepresentativeFirstname=Voornaam van de verkoopsverantwoordelijke
SaleRepresentativeLastname=Familienaam van de verkoopsverantwoordelijke
ErrorThirdpartiesMerge=Er is een fout opgetreden bij het verwijderen van de derde partijen. Controleer het logboek. Wijzigingen zijn teruggedraaid.
NewCustomerSupplierCodeProposed=Klant- of leverancierscode die al is gebruikt, wordt een nieuwe code voorgesteld
+PaymentTermsSupplier=Betalingstermijn - Verkoper
+PaymentTypeBoth=Betalingswijze - Klant en verkoper
diff --git a/htdocs/langs/nl_BE/main.lang b/htdocs/langs/nl_BE/main.lang
index e7fbbcfae2e..1baa044da70 100644
--- a/htdocs/langs/nl_BE/main.lang
+++ b/htdocs/langs/nl_BE/main.lang
@@ -20,19 +20,55 @@ FormatDateHourSecShort=%d/%m/%Y %I:%M:%S %p
FormatDateHourTextShort=%d %b %Y %H:%M
FormatDateHourText=%d %B %Y %H:%M
NoRecordFound=Geen record gevonden
+ErrorCanNotCreateDir=Kan dir %s niet maken
+ErrorCanNotReadDir=Kan dir %s niet lezen
+ErrorGoToGlobalSetup=Ga naar 'Bedrijf/Organisatie' om dit te verhelpen
ErrorFileNotUploaded=Bestand is niet geüpload. Controleer of de grootte niet meer is dan maximaal toegestaan, of er vrije ruimte beschikbaar is op de schijf en of er niet al een bestand met dezelfde naam in deze map bestaat.
ErrorWrongHostParameter=Verkeerde host instelling
+ErrorRecordIsUsedByChild=Kan dit record niet verwijderen. Dit record wordt gebruikt door ten minste één child-record.
+ErrorServiceUnavailableTryLater=Dienst momenteel niet beschikbaar. Probeer het later nog eens.
+ErrorCannotAddThisParentWarehouse=U probeert een bovenliggend magazijn toe te voegen dat al een 'child' van een bestaand magazijn is
NotAuthorized=U bent niet toegelaten om dat te doen.
+FileRenamed=Het bestand is succesvol hernoemd
+FileGenerated=Het bestand is succesvol gegenereerd
FileWasNotUploaded=Een bestand is geselecteerd als bijlage, maar is nog niet geupload. Klik hiervoor op "Bevestig dit bestand".
+GoToWikiHelpPage=Online Help lezen (internettoegang vereist)
GoToHelpPage=Contacteer helpdesk
RecordSaved=Tabelregel opgeslagen
RecordDeleted=Record verwijderd
+DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr-authenticatiemodus is ingesteld op %s in configuratiebestand conf.php.
Dit betekent dat de wachtwoorddatabase extern is van Dolibarr, dus het wijzigen van dit veld heeft mogelijk geen effect.
+LastConnexion=Laatste login
+AuthenticationMode=Verificatiemodus
+RequestedUrl=Gevraagde URL
+RequestLastAccessInError=Laatste database toegangsaanvraag fout
+LineID=Regel ID
+Resiliate=Beëindigen
+Hide=Verbergen
+NewObject=Nieuwe %s
+Model=Doc-sjabloon
+DefaultModel=Standaard doc-sjabloon
DateToday=Datum van vandaag
DateReference=Referentie datum
DateStart=Start datum
DateEnd=Eind datum
DateCreationShort=Aanmaak datum
DateApprove2=Goedkeurings datum (tweede goedkeuring)
+UserCreation=Creatie gebruiker
+UserModification=Modificatie gebruiker
+UserCreationShort=Creat. gebruiker
+UserModificationShort=Modif. gebruiker
+UserValidationShort=Geldig. gebruiker
+CurrencyRate=Wisselkoers van valuta
+UserModif=Gebruiker van laatste update
+PriceUHTCurrency=UP (valuta)
+AmountHT=Bedrag (excl. BTW)
+MulticurrencyRemainderToPay=Blijf betalen, oorspronkelijke valuta
+MulticurrencyPaymentAmount=Betalingsbedrag, oorspronkelijke valuta
+MulticurrencyAmountHT=Bedrag (excl. Btw), oorspronkelijke valuta
+MulticurrencyAmountTTC=Bedrag (incl. Btw), oorspronkelijke valuta
+MulticurrencyAmountVAT=Bedragsbelasting, oorspronkelijke valuta
+PriceQtyMinHT=Prijs hoeveelheid min. (excl. BTW)
+PriceQtyMinHTCurrency=Prijs hoeveelheid min. (excl. BTW) (valuta)
ActionRunningShort=Bezig
Running=Bezig
Categories=Tags / categorieën
@@ -53,4 +89,3 @@ SearchIntoProductsOrServices=Producten of diensten
SearchIntoCustomerInvoices=Klant facturen
SearchIntoCustomerProposals=Klant voorstellen
SearchIntoExpenseReports=Uitgaven rapporten
-ContactDefault_order_supplier=Supplier Order
diff --git a/htdocs/langs/nl_BE/orders.lang b/htdocs/langs/nl_BE/orders.lang
index 96bf6f289a6..29099451dfa 100644
--- a/htdocs/langs/nl_BE/orders.lang
+++ b/htdocs/langs/nl_BE/orders.lang
@@ -7,5 +7,10 @@ StatusOrderSentShort=In uitvoering
StatusOrderDelivered=Geleverd
StatusOrderDeliveredShort=Geleverd
UnvalidateOrder=Maak validatie bestelling ongedaan
-OrderReopened=Bestelling %s heropend
SecondApprovalAlreadyDone=Tweede controle reeds uitgevoerd
+StatusSupplierOrderSentShort=In uitvoering
+StatusSupplierOrderDelivered=Geleverd
+StatusSupplierOrderDeliveredShort=Geleverd
+StatusSupplierOrderToBillShort=Geleverd
+StatusSupplierOrderDraft=Conceptfactuur (moet worden gevalideerd)
+StatusSupplierOrderToBill=Geleverd
diff --git a/htdocs/langs/nl_BE/projects.lang b/htdocs/langs/nl_BE/projects.lang
index a6538578348..bad8b15e9d1 100644
--- a/htdocs/langs/nl_BE/projects.lang
+++ b/htdocs/langs/nl_BE/projects.lang
@@ -1,4 +1,18 @@
# Dolibarr language file - Source file is en_US - projects
ProjectsArea=Project Omgeving
+AllAllowedProjects=Alle projecten die ik kan lezen (mijn + openbaar)
+MyProjectsDesc=Deze weergave is beperkt tot projecten waarvoor u een contactpersoon bent
+TasksOnProjectsPublicDesc=Deze weergave geeft alle taken weer van projecten die u mag lezen.
+TasksOnProjectsDesc=In deze weergave worden alle taken voor alle projecten weergegeven (uw gebruikersrechten geven u toestemming om alles te bekijken).
+ImportDatasetTasks=Taken van projecten
+ProjectCategories=Project tags / categorieën
OpenedProjects=Open projecten
+OpportunitiesStatusForOpenedProjects=Aantal open projecten van leads op status
+OpportunitiesStatusForProjects=Aantal projecten van leads op status
+BillTime=Factureer de tijd besteed
+AddTimeSpent=Maak de tijd besteed
+AddHereTimeSpentForDay=Voeg hier de besteedde tijd voor deze dag / taak toe
+MyProjectsArea=Mijn projectengebied
+CurentlyOpenedTasks=Actueel openstaande taken
+WhichIamLinkedToProject=waaraan ik ben gekoppeld aan het project
ProjectModifiedInDolibarr=Project %s gewijzigd
diff --git a/htdocs/langs/nl_BE/propal.lang b/htdocs/langs/nl_BE/propal.lang
index 4426dfc72cf..972cbd72625 100644
--- a/htdocs/langs/nl_BE/propal.lang
+++ b/htdocs/langs/nl_BE/propal.lang
@@ -3,7 +3,6 @@ ProposalsOpened=Openstaande offertes
ConfirmValidateProp=Weet u zeker dat u deze offerte met naam %s wilt valideren?
LastModifiedProposals=Laatste %s gewijzigde offertes
NoProposal=Geen offerte
-PropalStatusValidated=Gevalideerd (offerte staat open)
CloseAs=Zet de status op
SetAcceptedRefused=Zet op goedgekeurd/geweigerd
CreateEmptyPropal=Creëer een lege commerciële offerte uit de lijst van producten / diensten
diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang
index 5f48bfc7a98..e1b73d6f1ad 100644
--- a/htdocs/langs/nl_NL/accountancy.lang
+++ b/htdocs/langs/nl_NL/accountancy.lang
@@ -3,7 +3,7 @@ Accountancy=Boekhouden
Accounting=Boekhouding
ACCOUNTING_EXPORT_SEPARATORCSV=Kolom separator voor export bestand
ACCOUNTING_EXPORT_DATE=Datumnotatie voor exportbestand
-ACCOUNTING_EXPORT_PIECE=Export the number of piece
+ACCOUNTING_EXPORT_PIECE=Exporteer het aantal stuks
ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
ACCOUNTING_EXPORT_LABEL=Export label
ACCOUNTING_EXPORT_AMOUNT=Export bedrag
@@ -224,6 +224,7 @@ ListAccounts=List of the accounting accounts
UnknownAccountForThirdparty=Onbekende relatie-rekening. Gebruikt wordt 1%s
UnknownAccountForThirdpartyBlocking=Blokkeringsfout. Onbekende relatierekening.
ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Derdenaccount niet gedefinieerd of derde partij onbekend. We zullen %s gebruiken
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Onbekende relatie en sub-administrator niet gedefinieerd op de betaling. Er zal geen waarde worden weggeschreven in de sub-administratierekening.
ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Tegenrekening relatie niet gedefinieerd of relatie onbekend. Blokkeringsfout.
UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Onbekend account van derden en wachtaccount niet gedefinieerd. Blokkeerfout
PaymentsNotLinkedToProduct=Betaling niet gekoppeld aan een product / dienst
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index f9c11733b3c..0ac0071e824 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -519,7 +519,7 @@ Module25Desc=Verkooporder beheer
Module30Name=Facturen
Module30Desc=Beheer van facturen en creditnota's voor klanten. Beheer van facturen en creditnota's voor leveranciers
Module40Name=Leveranciers
-Module40Desc=Leveranciers en inkoopbeheer (inkooporders en facturering)
+Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
Module42Name=Debug logs
Module42Desc=Mogelijkheden voor een log (file,syslog, ...). Deze log-files zijn voor technische/debug ondersteuning.
Module49Name=Editors
@@ -561,9 +561,9 @@ Module200Desc=LDAP-directorysynchronisatie
Module210Name=PostNuke
Module210Desc='PostNuke'-integratie
Module240Name=Uitvoer gegevens (exporteren)
-Module240Desc=Gereedschap om Dolibarr data te exporteren (met hulp)
+Module240Desc=Tool om Dolibarr-gegevens te exporteren (met hulp)
Module250Name=Invoer gegevens (importeren)
-Module250Desc=Hulpmiddel om gegevens in Dolibarr te importeren (met assistenten)
+Module250Desc=Tool om gegevens in Dolibarr te importeren (met hulp)
Module310Name=Leden
Module310Desc=Ledenbeheer (van een vereniging)
Module320Name=RSS-feeds
@@ -878,7 +878,7 @@ Permission1251=Voer massale invoer van externe gegevens in de database uit (data
Permission1321=Exporteer afnemersfacturen, attributen en betalingen
Permission1322=Open een betaalde factuur
Permission1421=Verkooporders en attributen exporteren
-Permission2401=Lees acties (evenementen of taken) gekoppeld aan zijn gebruikersaccount (indien eigenaar van evenement)
+Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
Permission2402=Acties (evenementen of taken) maken / wijzigen die zijn gekoppeld aan zijn gebruikersaccount (als eigenaar van een evenement)
Permission2403=Acties (evenementen of taken) verwijderen die zijn gekoppeld aan zijn gebruikersaccount (indien eigenaar van evenement)
Permission2411=Inzien van acties (gebeurtenissen of taken) van anderen
@@ -1156,7 +1156,7 @@ NoEventOrNoAuditSetup=Er is geen beveiligingsgebeurtenis vastgelegd. Dit is norm
NoEventFoundWithCriteria=Er zijn geen beveiligingsgebeurtenissen gevonden voor deze zoekcriteria.
SeeLocalSendMailSetup=Controleer de instellingen van uw lokale "sendmail"-programma
BackupDesc=Een complete back-up van een Dolibarr-installatie vereist twee stappen.
-BackupDesc2=Maak een back-up van de inhoud van de map "Documenten" ( %s ) met alle geüploade en gegenereerde bestanden. Dit omvat ook alle dumpbestanden die in stap 1 zijn gegenereerd.
+BackupDesc2=Maak een back-up van de inhoud van de map "documenten" ( %s ) met alle geüploade en gegenereerde bestanden. Dit omvat ook alle dumpbestanden die in stap 1 zijn gegenereerd. Deze bewerking kan enkele minuten duren.
BackupDesc3=Maak een back-up van de structuur en inhoud van uw database ( %s ) in een dumpbestand. Hiervoor kunt u de volgende assistent gebruiken.
BackupDescX=De gearchiveerde map moet op een veilige plaats worden opgeslagen.
BackupDescY=De gemaakte dump bestand moet op een veilige plaats worden opgeslagen.
@@ -1167,6 +1167,7 @@ RestoreDesc3=Herstel de databasestructuur en gegevens van een back-up dumpbestan
RestoreMySQL=MySQL import
ForcedToByAModule= Geforceerd tot %s door een geactiveerde module
PreviousDumpFiles=Bestaande back-upbestanden
+PreviousArchiveFiles=Bestaande archiefbestanden
WeekStartOnDay=Eerste dag van de week
RunningUpdateProcessMayBeRequired=Het uitvoeren van het upgradeproces lijkt vereist (programmaversie %s verschilt van databaseversie %s)
YouMustRunCommandFromCommandLineAfterLoginToUser=U dient dit commando vanaf de opdrachtregel uit te voeren, na ingelogd te zijn als gebruiker %s. Of u dient het commando uit te breiden door de -W optie mee te geven zodat u het wachtwoord kunt opgeven.
@@ -1248,6 +1249,7 @@ AskForPreferredShippingMethod=Vraag de gewenste verzendmethode voor derden.
FieldEdition=Wijziging van het veld %s
FillThisOnlyIfRequired=Voorbeeld: +2 (alleen invullen als tijdzone offset problemen worden ervaren)
GetBarCode=Haal barcode
+NumberingModules=Nummeringsmodellen
##### Module password generation
PasswordGenerationStandard=Geeft een wachtwoord terug dat gegenereerd is volgens het interne Dolibarr algoritme: 8 karakters met gedeelde nummers en tekens in kleine letters.
PasswordGenerationNone=Stel geen gegenereerd wachtwoord voor. Wachtwoord moet handmatig worden ingevoerd.
@@ -1711,8 +1713,9 @@ ChequeReceiptsNumberingModule=Controleer ontvangstnummeringsmodule
MultiCompanySetup=Multi-Bedrijfmoduleinstellingen
##### Suppliers #####
SuppliersSetup=Installatie van leveranciersmodule
-SuppliersCommandModel=Volledige sjabloon van bestelling (logo ...)
-SuppliersInvoiceModel=Volledige sjabloon van leveranciersfactuur (logo ...)
+SuppliersCommandModel=Complete template of Purchase Order
+SuppliersCommandModelMuscadet=Complete template of Purchase Order
+SuppliersInvoiceModel=Complete template of Vendor Invoice
SuppliersInvoiceNumberingModel=Nummeringsmodellen voor leveranciersfacturen
IfSetToYesDontForgetPermission=Als deze is ingesteld op een niet-nulwaarde, vergeet dan niet om machtigingen te verstrekken aan groepen of gebruikers die zijn toegestaan voor de tweede goedkeuring
##### GeoIPMaxmind #####
@@ -1762,9 +1765,10 @@ ListOfNotificationsPerUser=Lijst met automatische meldingen per gebruiker *
ListOfNotificationsPerUserOrContact=Lijst met mogelijke automatische meldingen (bij zakelijk evenement) beschikbaar per gebruiker * of per contact **
ListOfFixedNotifications=Lijst met automatische vaste meldingen
GoOntoUserCardToAddMore=Ga naar het tabblad "Meldingen" van een gebruiker om meldingen voor gebruikers toe te voegen of te verwijderen
-GoOntoContactCardToAddMore=Ga naar het tabblad "Meldingen" bij een relatie om meldingen voor contacten/adressen toe te voegen of te verwijderen
+GoOntoContactCardToAddMore=Ga naar het tabblad "Meldingen" van een relatie om meldingen voor contacten/adressen toe te voegen of te verwijderen
Threshold=Drempel
-BackupDumpWizard=Wizard om het back-upbestand te bouwen
+BackupDumpWizard=Wizard om een database-dumpbestand aan te maken
+BackupZipWizard=Wizard om een archief met documentenmap te maken
SomethingMakeInstallFromWebNotPossible=Installatie van externe module is niet mogelijk via de webinterface om de volgende reden:
SomethingMakeInstallFromWebNotPossible2=Om deze reden is het hier beschreven upgradeproces een handmatig proces dat alleen een bevoorrechte gebruiker mag uitvoeren.
InstallModuleFromWebHasBeenDisabledByFile=Installeren van externe module van toepassing is uitgeschakeld door uw beheerder. Je moet hem vragen om het bestand %s te verwijderen om deze functie mogelijk te maken.
@@ -1953,6 +1957,8 @@ SmallerThan=Kleiner dan
LargerThan=Groter dan
IfTrackingIDFoundEventWillBeLinked=Houd er rekening mee dat als een tracking-ID wordt gevonden in inkomende e-mail, de gebeurtenis automatisch wordt gekoppeld aan de gerelateerde objecten.
WithGMailYouCanCreateADedicatedPassword=Als u bij een GMail-account de validatie in 2 stappen hebt ingeschakeld, wordt aanbevolen om een speciaal tweede wachtwoord voor de toepassing te maken in plaats van uw eigen wachtwoord van https://myaccount.google.com/.
+EmailCollectorTargetDir=Het kan een wenselijk zijn om de e-mail naar een andere markeer/map te verplaatsen wanneer deze met succes is verwerkt. Stel hier een waarde in om deze functie te gebruiken. Let op: u moet ook een lees/schrijf-inlogaccount gebruiken.
+EmailCollectorLoadThirdPartyHelp=U kunt deze actie gebruiken om de e-mailinhoud te gebruiken om een bestaande relatie in uw database te zoeken en te laden. De gevonden (of gecreëerde) relatie zal worden gebruikt voor het volgen van acties die het nodig hebben. In het parameterveld kunt u bijvoorbeeld 'EXTRACT: BODY: Name: \\ s ([^ \\ s] *)' gebruiken als u de naam van de relatie wilt extraheren uit een string 'Name: name to find' gevonden in de bron.
EndPointFor=Eindpunt voor %s: %s
DeleteEmailCollector=E-mailverzamelaar verwijderen
ConfirmDeleteEmailCollector=Weet je zeker dat je deze e-mailverzamelaar wilt verwijderen?
diff --git a/htdocs/langs/nl_NL/agenda.lang b/htdocs/langs/nl_NL/agenda.lang
index 7ca2a37ecf3..7ef9ca0fba9 100644
--- a/htdocs/langs/nl_NL/agenda.lang
+++ b/htdocs/langs/nl_NL/agenda.lang
@@ -60,7 +60,7 @@ MemberSubscriptionModifiedInDolibarr=Abonnement %s voor lid %s gewijzigd
MemberSubscriptionDeletedInDolibarr=Abonnement %s voor lid %s verwijderd
ShipmentValidatedInDolibarr=Verzending %s gevalideerd
ShipmentClassifyClosedInDolibarr=Verzending %s geclassificeerd als gefactureerd
-ShipmentUnClassifyCloseddInDolibarr=Verzending %s geclassificeerd als heropend
+ShipmentUnClassifyCloseddInDolibarr=Zending %s geclassificeerd, opnieuw openen
ShipmentBackToDraftInDolibarr=Zending %s ga terug naar conceptstatus
ShipmentDeletedInDolibarr=Verzending %s verwijderd
OrderCreatedInDolibarr=Bestelling %s aangemaakt
diff --git a/htdocs/langs/nl_NL/banks.lang b/htdocs/langs/nl_NL/banks.lang
index 26cb6760b6c..c2cb9275a4f 100644
--- a/htdocs/langs/nl_NL/banks.lang
+++ b/htdocs/langs/nl_NL/banks.lang
@@ -154,7 +154,7 @@ RejectCheck=Teruggekeerde cheque
ConfirmRejectCheck=Weet u zeker dat u deze controle wilt markeren als afgewezen?
RejectCheckDate=Teruggave datum cheque
CheckRejected=Teruggekeerde cheque
-CheckRejectedAndInvoicesReopened=Cheque teruggekeerd en facturen heropend
+CheckRejectedAndInvoicesReopened=Cheque geretourneerd en facturen worden opnieuw geopend
BankAccountModelModule=Documentsjablonen voor bankrekeningen
DocumentModelSepaMandate=Sjabloon van SEPA-mandaat. Alleen bruikbaar voor Europese landen in de Europese Unie.
DocumentModelBan=Sjabloon om een pagina met BAN-informatie af te drukken.
diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang
index 05362fad4f9..1ce183cfcd4 100644
--- a/htdocs/langs/nl_NL/bills.lang
+++ b/htdocs/langs/nl_NL/bills.lang
@@ -416,7 +416,7 @@ PaymentConditionShort14D=14 dagen
PaymentCondition14D=14 dagen
PaymentConditionShort14DENDMONTH=Einde maand over 14 dagen
PaymentCondition14DENDMONTH=Binnen 14 dagen na het einde van de maand
-FixAmount=Vast bedrag
+FixAmount=Vast bedrag - 1 regel met label '%s'
VarAmount=Variabel bedrag (%% tot.)
VarAmountOneLine=Variabel aantal (%% tot.) - 1 regel met label '%s'
# PaymentType
@@ -512,7 +512,7 @@ RevenueStamp=Taxzegel
YouMustCreateInvoiceFromThird=Deze optie is alleen beschikbaar wanneer u een factuur maakt op het tabblad "Klant" van een relatie
YouMustCreateInvoiceFromSupplierThird=Deze optie is alleen beschikbaar bij het maken van een factuur op het tabblad "Leverancier" bij relatie
YouMustCreateStandardInvoiceFirstDesc=Maak eerst een standaard factuur en converteer naar een sjabloon om deze als sjabloon te gebruiken
-PDFCrabeDescription=Model van complete factuur (Beheert de mogelijkheid van de BTW-heffingsbelasting, de keuze van de regels display, logo, etc)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template
PDFSpongeDescription=Factuur PDF-sjabloon Sponge. Een complete sjabloon voor een factuur
PDFCrevetteDescription=Factuur PDF-sjabloon 'Crevette'. Een compleet sjabloon voor facturen
TerreNumRefModelDesc1=Geeft een getal in de vorm van %syymm-nnnn voor standaard facturen en %syymm-nnnn voor creditnota's, met yy voor jaar, mm voor maand en nnnn als opeenvolgende getallenreeks die niet terug op 0 komt
diff --git a/htdocs/langs/nl_NL/categories.lang b/htdocs/langs/nl_NL/categories.lang
index 308b801c94b..d75a200d41a 100644
--- a/htdocs/langs/nl_NL/categories.lang
+++ b/htdocs/langs/nl_NL/categories.lang
@@ -90,4 +90,5 @@ ShowCategory=Toon label/categorie
ByDefaultInList=Standaard in de lijst
ChooseCategory=Kies categorie
StocksCategoriesArea=Magazijnen Categorieën
+ActionCommCategoriesArea=Gebeurtenissen categorieën omgeving
UseOrOperatorForCategories=Gebruik of operator voor categorieën
diff --git a/htdocs/langs/nl_NL/companies.lang b/htdocs/langs/nl_NL/companies.lang
index 6fdbdb3fac1..8b94a7f7749 100644
--- a/htdocs/langs/nl_NL/companies.lang
+++ b/htdocs/langs/nl_NL/companies.lang
@@ -83,8 +83,8 @@ VATIsUsed=Gebruikte BTW
VATIsUsedWhenSelling=Dit bepaalt of deze derde een verkoopbelasting omvat of niet wanneer hij een factuur aan zijn eigen klanten maakt
VATIsNotUsed=BTW wordt niet gebruikt
CopyAddressFromSoc=Adres kopiëren van gegevens van relatie
-ThirdpartyNotCustomerNotSupplierSoNoRef=Relatie is noch klant, noch verkoper, geen beschikbare verwijzende objecten
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Relatie is noch klant, noch verkoper, kortingen zijn niet beschikbaar
+ThirdpartyNotCustomerNotSupplierSoNoRef=Relatie is noch klant, noch leverancier, geen beschikbare verwijzende objecten
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Relatie is noch klant, noch leverancier, kortingen zijn niet beschikbaar
PaymentBankAccount=Bank voor te ontvangen betaling
OverAllProposals=Zakelijke voorstellen / Offertes
OverAllOrders=Orders
@@ -247,6 +247,12 @@ ProfId3US=-
ProfId4US=-
ProfId5US=-
ProfId6US=-
+ProfId1RO=Prof Id 1 (CUI)
+ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
+ProfId3RO=Prof Id 3 (CAEN)
+ProfId4RO=-
+ProfId5RO=Prof Id 5 (EUID)
+ProfId6RO=-
ProfId1RU=Prof Id 1 (OGRN)
ProfId2RU=Prof Id 2 (INN)
ProfId3RU=Prof Id 3 (KPP)
@@ -271,23 +277,23 @@ CustomerRelativeDiscountShort=Kortingspercentage
CustomerAbsoluteDiscountShort=Kortingsbedrag
CompanyHasRelativeDiscount=Voor deze afnemer geldt een kortingspercentage van %s%%
CompanyHasNoRelativeDiscount=Voor deze afnemer geldt geen kortingspercentage
-HasRelativeDiscountFromSupplier=U heeft een standaardkorting van %s%% van deze verkoper
+HasRelativeDiscountFromSupplier=U heeft een standaardkorting van %s%% van deze leverancier
HasNoRelativeDiscountFromSupplier=U heeft geen standaard relatieve korting van deze leverancier
CompanyHasAbsoluteDiscount=Deze klant heeft kortingen beschikbaar ( tegoedbonnen of aanbetalingen) voor %s %s
CompanyHasDownPaymentOrCommercialDiscount=Deze klant heeft kortingen beschikbaar (commercieel, aanbetalingen) voor %s %s
CompanyHasCreditNote=Deze afnemer heeft nog creditnota's of eerder stortingen voor %s %s
HasNoAbsoluteDiscountFromSupplier=U heeft geen kortingstegoed van deze leverancier
-HasAbsoluteDiscountFromSupplier=U hebt kortingen beschikbaar ( tegoedbonnen of aanbetalingen) voor %s %s van deze verkoper
-HasDownPaymentOrCommercialDiscountFromSupplier=U hebt kortingen beschikbaar (commercieel, aanbetalingen) voor %s %s van deze verkoper
-HasCreditNoteFromSupplier=U hebt creditnota's voor %s %s van deze verkoper
+HasAbsoluteDiscountFromSupplier=U hebt kortingen beschikbaar ( tegoedbonnen of aanbetalingen) voor %s %s van deze leverancier
+HasDownPaymentOrCommercialDiscountFromSupplier=U hebt kortingen beschikbaar (commercieel, aanbetalingen) voor %s %s van deze leverancier
+HasCreditNoteFromSupplier=U hebt creditnota's voor %s %s van deze leverancier
CompanyHasNoAbsoluteDiscount=Voor deze afnemer is geen kortingsbedrag ingesteld
CustomerAbsoluteDiscountAllUsers=Vastgelegde klant kortingen (toegekend door alle gebruikers)
CustomerAbsoluteDiscountMy=Vastgelegde klant kortingen (toegekend door uzelf)
SupplierAbsoluteDiscountAllUsers=Vastgelegde leverancier kortingen (toegekend door alle gebruikers)
SupplierAbsoluteDiscountMy=Vastgelegde klant kortingen (toegekend door uzelf)
DiscountNone=Geen
-Vendor=Verkoper
-Supplier=Verkoper
+Vendor=Leverancier
+Supplier=Leverancier
AddContact=Nieuwe contactpersoon
AddContactAddress=Nieuw contact/adres
EditContact=Bewerk contact / adres
@@ -339,7 +345,7 @@ MyContacts=Mijn contacten
Capital=Kapitaal
CapitalOf=Kapitaal van %s
EditCompany=Bedrijf bewerken
-ThisUserIsNot=Deze gebruiker is geen prospect, klant of leverancier.
+ThisUserIsNot=Deze gebruiker is geen prospect, klant of leverancier
VATIntraCheck=Controleren
VATIntraCheckDesc=Het btw-nummer moet het landnummer bevatten. De link %s maakt gebruik van de European VAT checker service (VIES) die internettoegang vanaf de Dolibarr-server vereist.
VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -406,6 +412,13 @@ AllocateCommercial=Toegekend aan vertegenwoordiger
Organization=Organisatie
FiscalYearInformation=Fiscaal jaar
FiscalMonthStart=Startmaand van het fiscale jaar
+SocialNetworksInformation=Sociale netwerken
+SocialNetworksFacebookURL=Facebook URL
+SocialNetworksTwitterURL=Twitter URL
+SocialNetworksLinkedinURL=Linkedin URL
+SocialNetworksInstagramURL=Instagram URL
+SocialNetworksYoutubeURL=YouTube URL
+SocialNetworksGithubURL=Github URL
YouMustAssignUserMailFirst=U moet een e-mail voor deze gebruiker maken voordat u een e-mailmelding kunt toevoegen.
YouMustCreateContactFirst=U moet eerst een e-mail voor deze contactpersoon aanmaken om e-mail meldingen voor deze te kunnen toevoegen.
ListSuppliersShort=Leverancierslijst
@@ -438,7 +451,7 @@ NewCustomerSupplierCodeProposed=Klant- of leverancierscode die al wordt gebruikt
PaymentTypeCustomer=Betalingswijze - Klant
PaymentTermsCustomer=Betalingsvoorwaarden - Klant
PaymentTypeSupplier=Type betaling - Leverancier
-PaymentTermsSupplier=Betalingstermijn - Verkoper
-PaymentTypeBoth=Betalingswijze - Klant en verkoper
+PaymentTermsSupplier=Betalingstermijn - Leverancier
+PaymentTypeBoth=Betalingswijze - Klant en leverancier
MulticurrencyUsed=Gebruik meerdere valuta
MulticurrencyCurrency=Valuta
diff --git a/htdocs/langs/nl_NL/compta.lang b/htdocs/langs/nl_NL/compta.lang
index 4508b8a9304..52f8a29e7ff 100644
--- a/htdocs/langs/nl_NL/compta.lang
+++ b/htdocs/langs/nl_NL/compta.lang
@@ -254,3 +254,4 @@ ByVatRate=Per verkoop belastingtarief
TurnoverbyVatrate=Omzet gefactureerd per omzetbelasting-tarief
TurnoverCollectedbyVatrate=Omzet per BTW tarief
PurchasebyVatrate=Aankoop bij verkoop belastingtarief
+LabelToShow=Kort label
diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang
index 5efaea3accf..69f9f30c8e4 100644
--- a/htdocs/langs/nl_NL/errors.lang
+++ b/htdocs/langs/nl_NL/errors.lang
@@ -117,7 +117,8 @@ ErrorLoginDoesNotExists=Gebruiker met gebruikersnaam %s kon niet worden g
ErrorLoginHasNoEmail=Deze gebruiker heeft geen e-mail adres. Proces afgebroken.
ErrorBadValueForCode=Onjuist waardetypen voor code. Probeer het opnieuw met een nieuwe waarde
ErrorBothFieldCantBeNegative=Velden %s %s en kan niet beide negatief
-ErrorFieldCantBeNegativeOnInvoice=Veld %s kan niet negatief zijn voor dit type factuur. Als u een kortingsregel wilt toevoegen, maakt u eerst de korting met koppeling %s op het scherm en past u deze toe op de factuur. Je kunt ook je beheerder vragen om optie FACTURE_ENABLE_NEGATIVE_LINES op 1 in te stellen om het oude gedrag toe te staan.
+ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
ErrorQtyForCustomerInvoiceCantBeNegative=Aantal voor regel in klantfacturen kan niet negatief zijn
ErrorWebServerUserHasNotPermission=User account %s gebruikt om web-server uit te voeren heeft geen toestemming voor die
ErrorNoActivatedBarcode=Geen geactiveerde barcode soort
@@ -224,6 +225,8 @@ ErrorObjectMustHaveStatusActiveToBeDisabled=Objecten moeten de status 'Actie
ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objecten moeten de status 'Concept' of 'Uitgeschakeld' hebben om te worden ingeschakeld
ErrorNoFieldWithAttributeShowoncombobox=Geen velden hebben eigenschap 'showoncombobox' in de definitie van object '%s'. Geen manier om de combolist te laten zien.
ErrorFieldRequiredForProduct=Veld '1%s' is vereist voor product 1%s
+ProblemIsInSetupOfTerminal=Probleem is bij het instellen van terminal %s.
+ErrorAddAtLeastOneLineFirst=Voeg eerst minimaal één regel toe
# Warnings
WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Uw PHP-parameter upload_max_filesize (%s) is hoger dan PHP-parameter post_max_size (%s). Dit is geen consistente opstelling.
WarningPasswordSetWithNoAccount=Er is een wachtwoord ingesteld voor dit lid. Er is echter geen gebruikersaccount gemaakt. Dus dit wachtwoord is opgeslagen maar kan niet worden gebruikt om in te loggen bij Dolibarr. Het kan worden gebruikt door een externe module / interface, maar als u geen gebruikersnaam of wachtwoord voor een lid hoeft aan te maken, kunt u de optie "Beheer een login voor elk lid" in de module-setup van Member uitschakelen. Als u een login moet beheren maar geen wachtwoord nodig heeft, kunt u dit veld leeg houden om deze waarschuwing te voorkomen. Opmerking: e-mail kan ook worden gebruikt als login als het lid aan een gebruiker is gekoppeld.
diff --git a/htdocs/langs/nl_NL/holiday.lang b/htdocs/langs/nl_NL/holiday.lang
index b2064935585..ef20014ca2b 100644
--- a/htdocs/langs/nl_NL/holiday.lang
+++ b/htdocs/langs/nl_NL/holiday.lang
@@ -39,8 +39,10 @@ TypeOfLeaveId=Type verlof-ID
TypeOfLeaveCode=Type verlofcode
TypeOfLeaveLabel=Soort verloflabel
NbUseDaysCP=Aantal verbruikte verlofdagen
+NbUseDaysCPHelp=De berekening houdt rekening met de niet-werkdagen en de feestdagen gedefinieerd in het woordenboek.
NbUseDaysCPShort=Dagen verbruikt
NbUseDaysCPShortInMonth=Dagen verbruikt in maand
+DayIsANonWorkingDay=%s is een niet-werkdag
DateStartInMonth=Startdatum in maand
DateEndInMonth=Einddatum in maand
EditCP=Bewerken
diff --git a/htdocs/langs/nl_NL/install.lang b/htdocs/langs/nl_NL/install.lang
index fbd0bdd62eb..9a97e1b19b1 100644
--- a/htdocs/langs/nl_NL/install.lang
+++ b/htdocs/langs/nl_NL/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=Deze PHP ondersteunt Curl.
PHPSupportCalendar=Deze PHP ondersteunt kalendersextensies.
PHPSupportUTF8=Deze PHP ondersteunt UTF8-functies.
PHPSupportIntl=Deze PHP ondersteunt Intl-functies.
+PHPSupport=Deze PHP ondersteunt %s-functies.
PHPMemoryOK=Het maximale sessiegeheugen van deze PHP installatie is ingesteld op %s. Dit zou genoeg moeten zijn.
PHPMemoryTooLow=Uw PHP max sessie-geheugen is ingesteld op %s bytes. Dit is te laag. Wijzig uw php.ini om de parameter memory_limit in te stellen op ten minste %s bytes.
Recheck=Klik hier voor een meer gedetailleerde test
@@ -25,6 +26,7 @@ ErrorPHPDoesNotSupportCurl=Uw PHP versie ondersteunt geen Curl.
ErrorPHPDoesNotSupportCalendar=Uw PHP-installatie ondersteunt geen php-agenda-extensies.
ErrorPHPDoesNotSupportUTF8=Uw PHP-installatie ondersteunt geen UTF8-functies. Dolibarr kan niet correct werken. Los dit op voordat u Dolibarr installeert.
ErrorPHPDoesNotSupportIntl=Uw PHP-installatie ondersteunt geen Intl-functies.
+ErrorPHPDoesNotSupport=Uw PHP-installatie ondersteunt geen %s-functies.
ErrorDirDoesNotExists=De map %s bestaat niet.
ErrorGoBackAndCorrectParameters=Ga terug en controleer / corrigeer de parameters.
ErrorWrongValueForParameter=U heeft de parameter '%s' mogelijk verkeerd ingesteld.
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index 5895378fac7..06f763a4e08 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -471,7 +471,7 @@ TotalDuration=Totale duur
Summary=Samenvatting
DolibarrStateBoard=Database statistieken
DolibarrWorkBoard=Open voorwerpen
-NoOpenedElementToProcess=Geen geopend element om te verwerken
+NoOpenedElementToProcess=Geen open element om te verwerken
Available=Beschikbaar
NotYetAvailable=Nog niet beschikbaar
NotAvailable=Niet beschikbaar
@@ -1005,7 +1005,7 @@ ContactDefault_contrat=Contract
ContactDefault_facture=Factuur
ContactDefault_fichinter=Interventie
ContactDefault_invoice_supplier=Leveranciersfactuur
-ContactDefault_order_supplier=Bestelling leverancier
+ContactDefault_order_supplier=Bestelling
ContactDefault_project=Project
ContactDefault_project_task=Taak
ContactDefault_propal=Offerte
@@ -1013,3 +1013,6 @@ ContactDefault_supplier_proposal=Voorstel van leverancier
ContactDefault_ticketsup=Ticket
ContactAddedAutomatically=Contact toegevoegd vanuit contactpersonen
More=Meer
+ShowDetails=Toon details
+CustomReports=Custom reports
+SelectYourGraphOptionsFirst=Select your graph options to build a graph
diff --git a/htdocs/langs/nl_NL/modulebuilder.lang b/htdocs/langs/nl_NL/modulebuilder.lang
index 741e5c3869b..a71d676f238 100644
--- a/htdocs/langs/nl_NL/modulebuilder.lang
+++ b/htdocs/langs/nl_NL/modulebuilder.lang
@@ -83,7 +83,7 @@ ListOfDictionariesEntries=Lijst met woordenboekingangen
ListOfPermissionsDefined=Lijst met gedefinieerde machtigingen
SeeExamples=Zie hier voorbeelden
EnabledDesc=Voorwaarde om dit veld actief te hebben (voorbeelden: 1 of $ conf-> global-> MYMODULE_MYOPTION)
-VisibleDesc=Is het veld zichtbaar? (Voorbeelden: 0 = Nooit zichtbaar, 1 = Zichtbaar op lijst en formulieren maken / bijwerken / bekijken, 2 = Alleen zichtbaar op lijst, 3 = Zichtbaar op alleen formulier maken / bijwerken / bekijken (niet lijst), 4 = Zichtbaar op lijst en update / weergave alleen formulier (niet aanmaken). Het gebruik van een negatieve waarde betekent dat het veld niet standaard in de lijst wordt weergegeven, maar kan worden geselecteerd om te bekijken). Het kan een uitdrukking zijn, bijvoorbeeld:
preg_match ('/ public /', $ _SERVER ['PHP_SELF'])? 0: 1
($ user-> rights-> holiday-> define_holiday? 1: 0)
+VisibleDesc=Is het veld zichtbaar? (Voorbeelden: 0 = Nooit zichtbaar, 1 = Zichtbaar op lijst en formulieren maken / bijwerken / bekijken, 2 = Alleen zichtbaar op lijst, 3 = Zichtbaar op alleen formulier maken / bijwerken / bekijken (niet lijst), 4 = Zichtbaar op lijst en update / weergave alleen formulier (niet aanmaken), 5 = Alleen zichtbaar op lijst eindweergave formulier (niet maken, niet bijwerken) Het gebruik van een negatief waarde betekent dat veld niet standaard wordt weergegeven in de lijst, maar kan worden geselecteerd voor weergave). Het kan een uitdrukking zijn, bijvoorbeeld:
preg_match ('/ public /', $ _SERVER ['PHP_SELF'])? 0: 1
($ user-> rights-> holiday-> define_holiday? 1: 0)
IsAMeasureDesc=Kan de waarde van het veld worden gecumuleerd om een totaal in de lijst te krijgen? (Voorbeelden: 1 of 0)
SearchAllDesc=Wordt het veld gebruikt om een zoekopdracht uit het snelzoekprogramma te doen? (Voorbeelden: 1 of 0)
SpecDefDesc=Voer hier alle documentatie in die u met uw module wilt verstrekken die nog niet door andere tabbladen is gedefinieerd. U kunt .md of beter gebruiken, de rijke .asciidoc-syntaxis.
@@ -135,3 +135,5 @@ CSSClass=CSS-klasse
NotEditable=Niet bewerkbaar
ForeignKey=Vreemde sleutel
TypeOfFieldsHelp=Type velden:
varchar (99), dubbel (24,8), real, tekst, html, datetime, timestamp, integer, integer: ClassName: relativepath / to / classfile.class.php [: 1 [: filter]] ('1' betekent we voegen een + -knop toe na de combo om het record te maken, 'filter' kan 'status = 1 EN fk_user = __USER_ID EN entiteit IN (bijvoorbeeld __SHARED_ENTITIES__)' zijn)
+AsciiToHtmlConverter=Ascii naar HTML converter
+AsciiToPdfConverter=Ascii naar PDF converter
diff --git a/htdocs/langs/nl_NL/mrp.lang b/htdocs/langs/nl_NL/mrp.lang
index e26c678d6c8..fb0de8ef6c2 100644
--- a/htdocs/langs/nl_NL/mrp.lang
+++ b/htdocs/langs/nl_NL/mrp.lang
@@ -54,12 +54,15 @@ ToConsume=Consumeren
ToProduce=Produceren
QtyAlreadyConsumed=Aantal al verbruikt
QtyAlreadyProduced=Aantal al geproduceerd
+ConsumeOrProduce=Consumeren of produceren
ConsumeAndProduceAll=Alles consumeren en produceren
Manufactured=geproduceerd
TheProductXIsAlreadyTheProductToProduce=Het toe te voegen product is al het te produceren product.
ForAQuantityOf1=Voor een te produceren hoeveelheid van 1
ConfirmValidateMo=Weet u zeker dat u deze productieorder wilt valideren?
ConfirmProductionDesc=Door op '1%s' te klikken, valideert u het verbruik en / of de productie voor de ingestelde hoeveelheden. Hiermee worden ook de voorraad- en recordbewegingen bijgewerkt.
-ProductionForRefAndDate=Productie 1%s - 1%s
+ProductionForRef=Productie van %s
AutoCloseMO=Sluit de productie order automatisch als hoeveelheid en hoeveelheid te produceren is bereikt
NoStockChangeOnServices=Geen voorraad aanpassing op deze service
+ProductQtyToConsumeByMO=Product quantity still to consume by open MO
+ProductQtyToProduceByMO=Product quentity still to produce by open MO
diff --git a/htdocs/langs/nl_NL/orders.lang b/htdocs/langs/nl_NL/orders.lang
index 8700d98d2a4..5ea64e26c9c 100644
--- a/htdocs/langs/nl_NL/orders.lang
+++ b/htdocs/langs/nl_NL/orders.lang
@@ -69,7 +69,7 @@ ValidateOrder=Valideer opdracht
UnvalidateOrder=Unvalidate order
DeleteOrder=Verwijder opdracht
CancelOrder=Annuleer opdracht
-OrderReopened= Order %s opnieuw geopend
+OrderReopened= Order %s opnieuw openen
AddOrder=Nieuwe bestelling
AddPurchaseOrder=Maak inkooporder
AddToDraftOrders=Voeg toe aan order in aanmaak
@@ -141,10 +141,10 @@ OrderByEMail=Email
OrderByWWW=Online
OrderByPhone=Telefoon
# Documents models
-PDFEinsteinDescription=Een compleet opdrachtenmodel (incl. logo, etc)
-PDFEratostheneDescription=Een compleet opdrachtenmodel (incl. logo, etc)
+PDFEinsteinDescription=A complete order model
+PDFEratostheneDescription=A complete order model
PDFEdisonDescription=Een eenvoudig opdrachtenmodel
-PDFProformaDescription=Een volledige pro forma factuur (logo...)
+PDFProformaDescription=A complete Proforma invoice template
CreateInvoiceForThisCustomer=Factureer orders
NoOrdersToInvoice=Geen te factureren orders
CloseProcessedOrdersAutomatically=Alle geselecteerde orders zijn afgehandeld
diff --git a/htdocs/langs/nl_NL/other.lang b/htdocs/langs/nl_NL/other.lang
index 4edd48427b5..27f94dfc9e8 100644
--- a/htdocs/langs/nl_NL/other.lang
+++ b/htdocs/langs/nl_NL/other.lang
@@ -24,7 +24,7 @@ MessageOK=Bericht op de retourpagina voor een gevalideerde betaling
MessageKO=Bericht op de retourpagina voor een geannuleerde betaling
ContentOfDirectoryIsNotEmpty=De inhoud van deze map is niet leeg.
DeleteAlsoContentRecursively=Vink aan om alle inhoud recursief te verwijderen
-
+PoweredBy=Powered by
YearOfInvoice=Jaar van factuurdatum
PreviousYearOfInvoice=Voorgaand jaar van factuurdatum
NextYearOfInvoice=Volgend jaar van factuurdatum
@@ -104,7 +104,8 @@ DemoFundation=Ledenbeheer van een stichting
DemoFundation2=Beheer van de leden en de bankrekening van een stichting
DemoCompanyServiceOnly=Bedrijf of freelance verkoopservice alleen
DemoCompanyShopWithCashDesk=Beheren van een winkel met een kassa
-DemoCompanyProductAndStocks=Bedrijf dat producten verkoopt met een winkel
+DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
+DemoCompanyManufacturing=Company manufacturing products
DemoCompanyAll=Bedrijf met meerdere activiteiten (alle hoofdmodules)
CreatedBy=Gecreëerd door %s
ModifiedBy=Gewijzigd door %s
@@ -267,7 +268,7 @@ WEBSITE_PAGEURL=URL van pagina
WEBSITE_TITLE=Titel
WEBSITE_DESCRIPTION=Omschrijving
WEBSITE_IMAGE=Beeld
-WEBSITE_IMAGEDesc=Relatief pad van de beeldmedia. Je kunt dit leeg laten, omdat dit zelden wordt gebruikt (het kan door dynamische inhoud worden gebruikt om een voorbeeld van een lijst met blogberichten weer te geven).
+WEBSITE_IMAGEDesc=Relatief pad van de beeldmedia. Je kunt dit leeg laten, omdat dit zelden wordt gebruikt (het kan door dynamische inhoud worden gebruikt om een miniatuur in een lijst met blogberichten weer te geven). Gebruik __WEBSITEKEY__ in het pad als pad afhankelijk is van de naam van de website.
WEBSITE_KEYWORDS=Sleutelwoorden
LinesToImport=Regels om te importeren
diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang
index 920c501e950..28de65e7da8 100644
--- a/htdocs/langs/nl_NL/projects.lang
+++ b/htdocs/langs/nl_NL/projects.lang
@@ -77,7 +77,7 @@ MyProjectsArea=Mijn projecten omgeving
DurationEffective=Effectieve duur
ProgressDeclared=Ingegeven voorgang
TaskProgressSummary=Taakvoortgang
-CurentlyOpenedTasks=Actueel geopende taken
+CurentlyOpenedTasks=Momenteel openstaande taken
TheReportedProgressIsLessThanTheCalculatedProgressionByX=De aangegeven voortgang is minder %s dan de berekende voortgang
TheReportedProgressIsMoreThanTheCalculatedProgressionByX=De aangegeven voortgang is meer %s dan de berekende voortgang
ProgressCalculated=Berekende voorgang
@@ -249,9 +249,13 @@ TimeSpentForInvoice=Bestede tijd
OneLinePerUser=Eén regel per gebruiker
ServiceToUseOnLines=Service voor gebruik op lijnen
InvoiceGeneratedFromTimeSpent=Factuur %s is gegenereerd op basis van de tijd besteed aan het project
-ProjectBillTimeDescription=Controleer of u urenregistratie invoert voor taken van het project EN u van plan bent factuur (en) te genereren vanuit de urenstaat om de klant van het project te factureren (controleer niet of u een factuur wilt maken die niet is gebaseerd op ingevoerde urenstaten).
+ProjectBillTimeDescription=Controleer of u urenstaat invoert voor taken van het project EN u van plan bent om facturen uit de urenstaat te genereren om de klant van het project te factureren (controleer niet of u een factuur wilt creëren die niet is gebaseerd op ingevoerde urenstaten). Opmerking: Om de factuur te genereren, gaat u naar het tabblad 'Bestede tijd' van het project en selecteert u de regels die u wilt opnemen.
ProjectFollowOpportunity=Volg gelegenheid
ProjectFollowTasks=Taken volgen
UsageOpportunity=Gebruik: Kans
UsageTasks=Gebruik: Taken
UsageBillTimeShort=Gebruik: Factuurtijd
+InvoiceToUse=Te gebruiken factuur
+NewInvoice=Nieuwe factuur
+OneLinePerTask=Eén regel per taak
+OneLinePerPeriod=Eén regel per periode
diff --git a/htdocs/langs/nl_NL/propal.lang b/htdocs/langs/nl_NL/propal.lang
index 703017bab65..607503cd0f5 100644
--- a/htdocs/langs/nl_NL/propal.lang
+++ b/htdocs/langs/nl_NL/propal.lang
@@ -28,7 +28,7 @@ ShowPropal=Toon offerte
PropalsDraft=Concepten
PropalsOpened=Open
PropalStatusDraft=Concept (moet worden gevalideerd)
-PropalStatusValidated=Goedgekeurd (offerte is geopend)
+PropalStatusValidated=Gevalideerd (Offerte staat open)
PropalStatusSigned=Ondertekend (te factureren)
PropalStatusNotSigned=Niet ondertekend (gesloten)
PropalStatusBilled=Gefactureerd
@@ -76,8 +76,8 @@ TypeContact_propal_external_BILLING=Afnemersfactuurcontactpersoon
TypeContact_propal_external_CUSTOMER=Afnemerscontactpersoon follow-up voorstel
TypeContact_propal_external_SHIPPING=Klant contact voor levering
# Document models
-DocModelAzurDescription=Een compleet offertemodel (logo, etc)
-DocModelCyanDescription=Een compleet offertemodel (logo, etc)
+DocModelAzurDescription=A complete proposal model
+DocModelCyanDescription=A complete proposal model
DefaultModelPropalCreate=Standaard model aanmaken
DefaultModelPropalToBill=Standaard sjabloon bij het sluiten van een zakelijk voorstel (te factureren)
DefaultModelPropalClosed=Standaard sjabloon bij het sluiten van een zakelijk voorstel (nog te factureren)
diff --git a/htdocs/langs/nl_NL/stocks.lang b/htdocs/langs/nl_NL/stocks.lang
index ad1081f216b..ae5dd2271f3 100644
--- a/htdocs/langs/nl_NL/stocks.lang
+++ b/htdocs/langs/nl_NL/stocks.lang
@@ -143,6 +143,7 @@ InventoryCode=Verplaatsing of inventaris code
IsInPackage=Vervat in pakket
WarehouseAllowNegativeTransfer=Negatieve voorraad is mogelijk
qtyToTranferIsNotEnough=Er is onvoldoende voorraad in uw magazijn en uw instellingen staan geen negatieve voorraad toe.
+qtyToTranferLotIsNotEnough=U hebt niet genoeg voorraad, voor dit partijnummer uit uw bronmagazijn. Uw installatie staat geen negatieve voorraden toe (aantal voor product '%s' met partij '%s' is %s in magazijn '%s').
ShowWarehouse=Toon magazijn
MovementCorrectStock=Voorraad correctie product %s
MovementTransferStock=Voorraad overdracht van het product %s in een ander magazijn
@@ -192,6 +193,7 @@ TheoricalQty=Theoretisch aantal
TheoricalValue=Theoretisch aantal
LastPA=Laatste BP
CurrentPA=Curent BP
+RecordedQty=Recorded Qty
RealQty=Echte aantal
RealValue=Werkelijke waarde
RegulatedQty=Gereguleerde aantal
diff --git a/htdocs/langs/nl_NL/ticket.lang b/htdocs/langs/nl_NL/ticket.lang
index 20faa029087..8c047d0b5f4 100644
--- a/htdocs/langs/nl_NL/ticket.lang
+++ b/htdocs/langs/nl_NL/ticket.lang
@@ -197,7 +197,7 @@ TicketGoIntoContactTab=Ga naar het tabblad "Contacten" om ze te selecteren
TicketMessageMailIntro=Introductie
TicketMessageMailIntroHelp=Deze tekst wordt alleen aan het begin van de e-mail toegevoegd en zal niet worden opgeslagen.
TicketMessageMailIntroLabelAdmin=Inleiding tot het bericht bij het verzenden van e-mail
-TicketMessageMailIntroText=Hallo,
Er is een nieuw antwoord verzonden op een ticket waarmee u contact hebt. Dit is het bericht:
+TicketMessageMailIntroText=Hallo,
Er is een nieuw antwoord verzonden op een ticket. Dit is het bericht:
TicketMessageMailIntroHelpAdmin=Deze tekst wordt ingevoegd vóór de tekst van het antwoord op een ticket.
TicketMessageMailSignature=Handtekening
TicketMessageMailSignatureHelp=Deze tekst wordt alleen aan het einde van de e-mail toegevoegd en wordt niet opgeslagen.
diff --git a/htdocs/langs/nl_NL/website.lang b/htdocs/langs/nl_NL/website.lang
index 0eb903d6c14..db088f76de5 100644
--- a/htdocs/langs/nl_NL/website.lang
+++ b/htdocs/langs/nl_NL/website.lang
@@ -56,7 +56,7 @@ NoPageYet=Nog geen pagina's
YouCanCreatePageOrImportTemplate=U kunt een nieuwe pagina maken of een volledige websitesjabloon importeren
SyntaxHelp=Help bij specifieke syntax-tips
YouCanEditHtmlSourceckeditor=U kunt HTML-broncode bewerken met de knop "Bron" in de editor.
-YouCanEditHtmlSource=
U kunt PHP-code in deze bron opnemen met behulp van tags <? Php?> . De volgende globale variabelen zijn beschikbaar: $ conf, $ db, $ mysoc, $ user, $ website, $ websitepage, $ weblangs.
U kunt ook inhoud van een andere pagina / container met de volgende syntaxis opnemen:
<? php includeContainer ('alias_of_container_to_include'); ?>
U kunt een omleiding maken naar een andere pagina / container met de volgende syntaxis (Opmerking: voer geen inhoud uit vóór een omleiding):
<? php redirectToContainer ('alias_of_container_to_redirect_to'); ?>
Gebruik de syntaxis om een link naar een andere pagina toe te voegen:
<a href="alias_of_page_to_link_to.php"> mylink <a>
Gebruik de document.php wrapper om een link op te nemen om een bestand te downloaden dat is opgeslagen in de documentenmap :
Voor een bestand in documenten / ecm (moet worden vastgelegd) is de syntaxis:
<a href="/document.php?modulepart=ecm&file= cialisrelative_dir/Buchfilename.ext">
Voor een bestand in documenten / media (map openen voor openbare toegang) is syntaxis:
<a href="/document.php?modulepart=medias&file= cialisrelative_dir/Buchfilename.ext">
Voor een bestand dat wordt gedeeld met een deellink (open toegang met de gedeelde hash-sleutel van het bestand), is de syntaxis:
<a href="/document.php?hashp=publicsharekeyoffile">
Gebruik de viewimage.php wrapper om een afbeelding op te nemen die is opgeslagen in de documentenmap :
Voor een afbeelding in documenten / media (open directory voor openbare toegang) is de syntaxis:
<img src = "/ viewimage.php? modulepart = medias & file = [relative_dir /] bestandsnaam.ext">
Meer voorbeelden van HTML of dynamische code beschikbaar in de wikidocumentatie
.
+YouCanEditHtmlSource=
U kunt PHP-code in deze bron opnemen met behulp van tags <? Php?> . De volgende globale variabelen zijn beschikbaar: $ conf, $ db, $ mysoc, $ user, $ website, $ websitepage, $ weblangs.
U kunt ook inhoud van een andere pagina / container met de volgende syntaxis opnemen:
<? php includeContainer ('alias_of_container_to_include'); ?>
U kunt een omleiding maken naar een andere pagina / container met de volgende syntaxis (Opmerking: voer geen inhoud uit vóór een omleiding):
<? php redirectToContainer ('alias_of_container_to_redirect_to'); ?>
Gebruik de syntaxis om een link naar een andere pagina toe te voegen:
<a href="alias_of_page_to_link_to.php"> mylink <a>
Gebruik de document.php wrapper om een link op te nemen om een bestand te downloaden dat is opgeslagen in de documentenmap :
Voor een bestand in documenten / ecm (moet worden vastgelegd) is de syntaxis:
<a href="/document.php?modulepart=ecm&file= cialisrelative_dir/Buchfilename.ext">
Voor een bestand in documenten / media (map openen voor openbare toegang) is syntaxis:
<a href="/document.php?modulepart=medias&file= cialisrelative_dir/Buchfilename.ext">
Voor een bestand dat wordt gedeeld met een deellink (open toegang met de gedeelde hash-sleutel van het bestand), is de syntaxis:
<a href="/document.php?hashp=publicsharekeyoffile">
Gebruik de viewimage.php wrapper om een afbeelding op te nemen die is opgeslagen in de documentenmap :
Voor een afbeelding in documenten / media (open directory voor openbare toegang) is de syntaxis:
<img src = ";/ viewimage.php? modulepart = medias & file = [relative_dir /] bestandsnaam.ext">
Meer voorbeelden van HTML of dynamische code beschikbaar in de wikidocumentatie
.
ClonePage=Kloon pagina/container
CloneSite=Klonen site
SiteAdded=Website toegevoegd
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index ab8bc48a898..ceb6fa560de 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -519,7 +519,7 @@ Module25Desc=Sales order management
Module30Name=Faktury
Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
Module40Name=Dostawcy
-Module40Desc=Vendors and purchase management (purchase orders and billing)
+Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
Module42Name=Debug Logs
Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
Module49Name=Edytory
@@ -561,9 +561,9 @@ Module200Desc=LDAP directory synchronization
Module210Name=PostNuke
Module210Desc=Integracja PostNuke
Module240Name=Eksport danych
-Module240Desc=Narzędzie do eksportu danych w Dolibarr (z asystentami)
+Module240Desc=Tool to export Dolibarr data (with assistance)
Module250Name=Import danych
-Module250Desc=Tool to import data into Dolibarr (with assistants)
+Module250Desc=Tool to import data into Dolibarr (with assistance)
Module310Name=Członkowie
Module310Desc=Zarządzanie członkami fundacji
Module320Name=RSS Feed
@@ -878,7 +878,7 @@ Permission1251=Uruchom masowy import danych zewnętrznych do bazy danych (wgrywa
Permission1321=Eksport faktur klienta, atrybutów oraz płatności
Permission1322=Reopen a paid bill
Permission1421=Export sales orders and attributes
-Permission2401=Read actions (events or tasks) linked to his user account (if owner of event)
+Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
Permission2411=Czytaj działania (zdarzenia lub zadania) innych osób
@@ -1156,7 +1156,7 @@ NoEventOrNoAuditSetup=No security event has been logged. This is normal if Audit
NoEventFoundWithCriteria=No security event has been found for this search criteria.
SeeLocalSendMailSetup=Zobacz lokalnej konfiguracji sendmaila
BackupDesc=A complete backup of a Dolibarr installation requires two steps.
-BackupDesc2=Backup the contents of the "documents" directory (%s) containing all uploaded and generated files. This will also include all the dump files generated in Step 1.
+BackupDesc2=Backup the contents of the "documents" directory (%s) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
BackupDesc3=Backup the structure and contents of your database (%s) into a dump file. For this, you can use the following assistant.
BackupDescX=The archived directory should be stored in a secure place.
BackupDescY=Wygenerowany plik zrzutu powinny być przechowywane w bezpiecznym miejscu.
@@ -1167,6 +1167,7 @@ RestoreDesc3=Restore the database structure and data from a backup dump file int
RestoreMySQL=Import MySQL
ForcedToByAModule= Ta zasada jest zmuszona do %s przez aktywowany modułu
PreviousDumpFiles=Existing backup files
+PreviousArchiveFiles=Existing archive files
WeekStartOnDay=First day of the week
RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
YouMustRunCommandFromCommandLineAfterLoginToUser=Należy uruchomić to polecenie z wiersza polecenia po zalogowaniu się do powłoki z %s użytkownika.
@@ -1248,6 +1249,7 @@ AskForPreferredShippingMethod=Ask for preferred shipping method for Third Partie
FieldEdition=Edycja pola% s
FillThisOnlyIfRequired=Przykład: +2 (wypełnić tylko w przypadku strefy czasowej w stosunku problemy są doświadczeni)
GetBarCode=Pobierz kod kreskowy
+NumberingModules=Numbering models
##### Module password generation
PasswordGenerationStandard=Wróć hasło generowane zgodnie z wewnętrznym Dolibarr algorytmu: 8 znaków zawierających cyfry i znaki udostępniony w małe.
PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
@@ -1711,8 +1713,9 @@ ChequeReceiptsNumberingModule=Check Receipts Numbering Module
MultiCompanySetup=Firma Multi-Moduł konfiguracji
##### Suppliers #####
SuppliersSetup=Vendor module setup
-SuppliersCommandModel=Complete template of purchase order (logo...)
-SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
+SuppliersCommandModel=Complete template of Purchase Order
+SuppliersCommandModelMuscadet=Complete template of Purchase Order
+SuppliersInvoiceModel=Complete template of Vendor Invoice
SuppliersInvoiceNumberingModel=Vendor invoices numbering models
IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
##### GeoIPMaxmind #####
@@ -1762,9 +1765,10 @@ ListOfNotificationsPerUser=List of automatic notifications per user*
ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
ListOfFixedNotifications=List of automatic fixed notifications
GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
Threshold=Próg
-BackupDumpWizard=Wizard to build the backup file
+BackupDumpWizard=Wizard to build the database dump file
+BackupZipWizard=Wizard to build the archive of documents directory
SomethingMakeInstallFromWebNotPossible=Instalacja zewnętrznych modułów za pomocą interfejsu sieciowego nie jest możliwa z powodu następujących przyczyn:
SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
InstallModuleFromWebHasBeenDisabledByFile=Instalacja zewnętrznych modułów z poziomu aplikacji została wyłączona przez administratora. Musisz poprosić go o usunięcie pliku %s aby włączyć odpowiednią funkcję.
@@ -1953,6 +1957,8 @@ SmallerThan=Smaller than
LargerThan=Larger than
IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
+EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set a value here to use this feature. Note that you must also use a read/write login account.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
EndPointFor=End point for %s : %s
DeleteEmailCollector=Delete email collector
ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang
index f14428434d3..10f4e993dc2 100644
--- a/htdocs/langs/pl_PL/bills.lang
+++ b/htdocs/langs/pl_PL/bills.lang
@@ -416,7 +416,7 @@ PaymentConditionShort14D=14 dni
PaymentCondition14D=14 dni
PaymentConditionShort14DENDMONTH=14 days of month-end
PaymentCondition14DENDMONTH=Within 14 days following the end of the month
-FixAmount=Fixed amount
+FixAmount=Fixed amount - 1 line with label '%s'
VarAmount=Zmienna ilość (%% tot.)
VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
# PaymentType
@@ -512,7 +512,7 @@ RevenueStamp=Znaczek skarbowy
YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Faktura Crabe modelu. Pełna faktura modelu (VAT Wsparcie opcji, rabaty, warunki płatności, logo, itp. ..)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template
PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
TerreNumRefModelDesc1=Zwróć numer w formacie %srrmm-nnnn dla standardowych faktur i %srrmm-nnnn dla not kredytowych, gdzie rr oznacza rok, mm to miesiąc, a nnnn to kolejny niepowtarzalny numer rozpoczynający się od 0
diff --git a/htdocs/langs/pl_PL/categories.lang b/htdocs/langs/pl_PL/categories.lang
index 10df5723d37..af879e299c5 100644
--- a/htdocs/langs/pl_PL/categories.lang
+++ b/htdocs/langs/pl_PL/categories.lang
@@ -62,6 +62,7 @@ ContactCategoriesShort=Kontakt tagów / kategorii
AccountsCategoriesShort=Tagi / kategorie kont
ProjectsCategoriesShort=Tagi / kategorie projektów
UsersCategoriesShort=Znaczniki/kategorie użytkowników
+StockCategoriesShort=Warehouse tags/categories
ThisCategoryHasNoProduct=Ta kategoria nie zawiera żadnych produktów.
ThisCategoryHasNoSupplier=This category does not contain any vendor.
ThisCategoryHasNoCustomer=Ta kategoria nie zawiera żadnych klientów.
@@ -88,3 +89,6 @@ AddProductServiceIntoCategory=Dodaj następujący produkt / usługę
ShowCategory=Pokaż tag / kategoria
ByDefaultInList=Domyśłnie na liście
ChooseCategory=Wybrane kategorie
+StocksCategoriesArea=Warehouses Categories Area
+ActionCommCategoriesArea=Events Categories Area
+UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/pl_PL/companies.lang b/htdocs/langs/pl_PL/companies.lang
index 759f8d9c260..68d0f5cdc9c 100644
--- a/htdocs/langs/pl_PL/companies.lang
+++ b/htdocs/langs/pl_PL/companies.lang
@@ -247,6 +247,12 @@ ProfId3US=-
ProfId4US=-
ProfId5US=-
ProfId6US=-
+ProfId1RO=Prof Id 1 (CUI)
+ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
+ProfId3RO=Prof Id 3 (CAEN)
+ProfId4RO=-
+ProfId5RO=Prof Id 5 (EUID)
+ProfId6RO=-
ProfId1RU=Prof Id 1 (OGRN)
ProfId2RU=Prof Id 2 (INN)
ProfId3RU=Prof Id 3 (KPP)
@@ -339,7 +345,7 @@ MyContacts=Moje kontakty
Capital=Kapitał
CapitalOf=Kapitał %s
EditCompany=Edycja firmy
-ThisUserIsNot=This user is not a prospect, customer nor vendor
+ThisUserIsNot=This user is not a prospect, customer or vendor
VATIntraCheck=Sprawdź
VATIntraCheckDesc=The VAT ID must include the country prefix. The link %s uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do?locale=pl
@@ -406,6 +412,13 @@ AllocateCommercial=Przypisać do przedstawiciela
Organization=Organizacja
FiscalYearInformation=Fiscal Year
FiscalMonthStart=Pierwszy miesiąc roku podatkowego
+SocialNetworksInformation=Social networks
+SocialNetworksFacebookURL=Facebook URL
+SocialNetworksTwitterURL=Twitter URL
+SocialNetworksLinkedinURL=Linkedin URL
+SocialNetworksInstagramURL=Instagram URL
+SocialNetworksYoutubeURL=Youtube URL
+SocialNetworksGithubURL=Github URL
YouMustAssignUserMailFirst=You must create an email for this user prior to being able to add an email notification.
YouMustCreateContactFirst=Żeby dodać powiadomienia email, najpierw musisz określić kontakty z ważnymi adresami email dla kontrahentów
ListSuppliersShort=List of Vendors
diff --git a/htdocs/langs/pl_PL/compta.lang b/htdocs/langs/pl_PL/compta.lang
index c32699a8a16..601a0312dd6 100644
--- a/htdocs/langs/pl_PL/compta.lang
+++ b/htdocs/langs/pl_PL/compta.lang
@@ -63,7 +63,7 @@ LT2SupplierES=Zakupy IRPF
LT2CustomerIN=SGST sales
LT2SupplierIN=SGST purchases
VATCollected=VAT zebrane
-ToPay=Do zapłaty
+StatusToPay=Do zapłaty
SpecialExpensesArea=Obszar dla wszystkich specjalnych płatności
SocialContribution=Opłata ZUS lub podatek
SocialContributions=Opłaty ZUS lub podatki
@@ -112,7 +112,7 @@ ShowVatPayment=Pokaż płatności za podatek VAT
TotalToPay=Razem do zapłaty
BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=vendor accounting code
+SupplierAccountancyCode=Vendor accounting code
CustomerAccountancyCodeShort=Kod księg. klienta
SupplierAccountancyCodeShort=Kod rach. dost.
AccountNumber=Numer konta
@@ -254,3 +254,4 @@ ByVatRate=By sale tax rate
TurnoverbyVatrate=Turnover invoiced by sale tax rate
TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
PurchasebyVatrate=Purchase by sale tax rate
+LabelToShow=Krótka etykieta
diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
index 51ae27ae3bd..767680e0d8a 100644
--- a/htdocs/langs/pl_PL/errors.lang
+++ b/htdocs/langs/pl_PL/errors.lang
@@ -117,7 +117,8 @@ ErrorLoginDoesNotExists=Użytkownik %s nie został znaleziony.
ErrorLoginHasNoEmail=Ten użytkownik nie ma adresu e-mail. Proces przerwany.
ErrorBadValueForCode=Zła wartość kody zabezpieczeń. Wprowadź nową wartość...
ErrorBothFieldCantBeNegative=Pola %s i %s nie może być zarówno negatywny
-ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you want to add a discount line, just create the discount first with link %s on screen and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
+ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
ErrorQtyForCustomerInvoiceCantBeNegative=Ilość linii do faktur dla klientów nie może być ujemna
ErrorWebServerUserHasNotPermission=Konto użytkownika %s wykorzystywane do wykonywania serwer WWW nie ma zgody na który
ErrorNoActivatedBarcode=Nie Typ aktywny kodów kreskowych
@@ -224,6 +225,8 @@ ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to
ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
ErrorFieldRequiredForProduct=Field '%s' is required for product %s
+ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
+ErrorAddAtLeastOneLineFirst=Add at least one line first
# Warnings
WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
WarningPasswordSetWithNoAccount=Hasło zostało ustawione dla tego użytkownika. Jednakże nie Konto użytkownika zostało utworzone. Więc to hasło jest przechowywane, ale nie mogą być używane do logowania do Dolibarr. Może być stosowany przez zewnętrzny moduł / interfejsu, ale jeśli nie trzeba definiować dowolną logowania ani hasła do członka, można wyłączyć opcję "Zarządzaj login dla każdego członka" od konfiguracji modułu użytkownika. Jeśli potrzebujesz zarządzać logowanie, ale nie wymagają hasła, możesz zachować to pole puste, aby uniknąć tego ostrzeżenia. Uwaga: E może być również stosowany jako login, jeśli element jest połączony do użytkownika.
diff --git a/htdocs/langs/pl_PL/holiday.lang b/htdocs/langs/pl_PL/holiday.lang
index 3542e94b28a..92e616a4a2f 100644
--- a/htdocs/langs/pl_PL/holiday.lang
+++ b/htdocs/langs/pl_PL/holiday.lang
@@ -39,8 +39,10 @@ TypeOfLeaveId=Type of leave ID
TypeOfLeaveCode=Type of leave code
TypeOfLeaveLabel=Type of leave label
NbUseDaysCP=Liczba dni urlopu spożywane
+NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary.
NbUseDaysCPShort=Days consumed
NbUseDaysCPShortInMonth=Days consumed in month
+DayIsANonWorkingDay=%s is a non working day
DateStartInMonth=Start date in month
DateEndInMonth=End date in month
EditCP=Edytuj
diff --git a/htdocs/langs/pl_PL/install.lang b/htdocs/langs/pl_PL/install.lang
index 1b469247c9e..5c0903b8d43 100644
--- a/htdocs/langs/pl_PL/install.lang
+++ b/htdocs/langs/pl_PL/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
PHPSupportCalendar=This PHP supports calendars extensions.
PHPSupportUTF8=This PHP supports UTF8 functions.
PHPSupportIntl=This PHP supports Intl functions.
+PHPSupport=This PHP supports %s functions.
PHPMemoryOK=Maksymalna ilość pamięci sesji PHP ustawiona jest na %s. Powinno wystarczyć.
PHPMemoryTooLow=Your PHP max session memory is set to %s bytes. This is too low. Change your php.ini to set memory_limit parameter to at least %s bytes.
Recheck=Click here for a more detailed test
@@ -25,6 +26,7 @@ ErrorPHPDoesNotSupportCurl=Twoja instalacja PHP nie wspiera Curl.
ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
+ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
ErrorDirDoesNotExists=Katalog %s nie istnieje.
ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
ErrorWrongValueForParameter=Możliwe, że wprowadzono nieprawidłową wartość dla parametru '%s'.
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index edfbca7236e..976b074852d 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -471,7 +471,7 @@ TotalDuration=Łączny czas trwania
Summary=Podsumowanie
DolibarrStateBoard=Database Statistics
DolibarrWorkBoard=Open Items
-NoOpenedElementToProcess=Brak otwartego elementu do przetwarzania
+NoOpenedElementToProcess=No open element to process
Available=Dostępny
NotYetAvailable=Nie są jeszcze dostępne
NotAvailable=Niedostępne
@@ -878,7 +878,7 @@ BulkActions=Masowe działania
ClickToShowHelp=Kliknij, aby wyświetlić etykietę pomocy
WebSite=Website
WebSites=Strony internetowe
-WebSiteAccounts=Website accounts
+WebSiteAccounts=Konta witryny
ExpenseReport=Raport kosztów
ExpenseReports=Raporty kosztów
HR=Dział personalny
@@ -1005,7 +1005,7 @@ ContactDefault_contrat=Kontrakt
ContactDefault_facture=Faktura
ContactDefault_fichinter=Interwencja
ContactDefault_invoice_supplier=Supplier Invoice
-ContactDefault_order_supplier=Supplier Order
+ContactDefault_order_supplier=Purchase Order
ContactDefault_project=Projekt
ContactDefault_project_task=Zadanie
ContactDefault_propal=Oferta
@@ -1013,3 +1013,6 @@ ContactDefault_supplier_proposal=Supplier Proposal
ContactDefault_ticketsup=Ticket
ContactAddedAutomatically=Contact added from contact thirdparty roles
More=More
+ShowDetails=Show details
+CustomReports=Custom reports
+SelectYourGraphOptionsFirst=Select your graph options to build a graph
diff --git a/htdocs/langs/pl_PL/modulebuilder.lang b/htdocs/langs/pl_PL/modulebuilder.lang
index 2f1ee7f9fd9..b975ccc4484 100644
--- a/htdocs/langs/pl_PL/modulebuilder.lang
+++ b/htdocs/langs/pl_PL/modulebuilder.lang
@@ -83,7 +83,7 @@ ListOfDictionariesEntries=List of dictionaries entries
ListOfPermissionsDefined=List of defined permissions
SeeExamples=See examples here
EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:
preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
($user->rights->holiday->define_holiday ? 1 : 0)
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:
preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
($user->rights->holiday->define_holiday ? 1 : 0)
IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
@@ -135,3 +135,5 @@ CSSClass=CSS Class
NotEditable=Not editable
ForeignKey=Foreign key
TypeOfFieldsHelp=Type of fields:
varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
+AsciiToHtmlConverter=Ascii to HTML converter
+AsciiToPdfConverter=Ascii to PDF converter
diff --git a/htdocs/langs/pl_PL/mrp.lang b/htdocs/langs/pl_PL/mrp.lang
index ad612115268..11c6915a25c 100644
--- a/htdocs/langs/pl_PL/mrp.lang
+++ b/htdocs/langs/pl_PL/mrp.lang
@@ -54,12 +54,15 @@ ToConsume=To consume
ToProduce=To produce
QtyAlreadyConsumed=Qty already consumed
QtyAlreadyProduced=Qty already produced
+ConsumeOrProduce=Consume or Produce
ConsumeAndProduceAll=Consume and Produce All
Manufactured=Manufactured
TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
ForAQuantityOf1=For a quantity to produce of 1
ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
-ProductionForRefAndDate=Production %s - %s
+ProductionForRef=Production of %s
AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
NoStockChangeOnServices=No stock change on services
+ProductQtyToConsumeByMO=Product quantity still to consume by open MO
+ProductQtyToProduceByMO=Product quentity still to produce by open MO
diff --git a/htdocs/langs/pl_PL/orders.lang b/htdocs/langs/pl_PL/orders.lang
index 26a288b0943..4705c1b057c 100644
--- a/htdocs/langs/pl_PL/orders.lang
+++ b/htdocs/langs/pl_PL/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Data zamówienia
OrderDateShort=Data zamówienia
OrderToProcess=Zamówienia do przetworzenia
NewOrder=Nowe zamówienie
+NewOrderSupplier=New Purchase Order
ToOrder=Stwórz zamówienie
MakeOrder=Stwórz zamówienie
SupplierOrder=Zamówienie
@@ -25,6 +26,8 @@ OrdersToBill=Sales orders delivered
OrdersInProcess=Sales orders in process
OrdersToProcess=Sales orders to process
SuppliersOrdersToProcess=Zamówienia do przetworzenia
+SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
+AwaitingReception=Awaiting reception
StatusOrderCanceledShort=Anulowano
StatusOrderDraftShort=Szkic
StatusOrderValidatedShort=Zatwierdzone
@@ -37,7 +40,6 @@ StatusOrderDeliveredShort=Dostarczone
StatusOrderToBillShort=Dostarczone
StatusOrderApprovedShort=Zatwierdzone
StatusOrderRefusedShort=Odmowa
-StatusOrderBilledShort=Rozliczone
StatusOrderToProcessShort=Do przetworzenia
StatusOrderReceivedPartiallyShort=Częściowo otrzymano
StatusOrderReceivedAllShort=Produkty otrzymane
@@ -50,7 +52,6 @@ StatusOrderProcessed=Przetworzone
StatusOrderToBill=Dostarczone
StatusOrderApproved=Przyjęto
StatusOrderRefused=Odrzucono
-StatusOrderBilled=Rozliczone
StatusOrderReceivedPartially=Częściowo otrzymano
StatusOrderReceivedAll=Wszystkie produkty otrzymane
ShippingExist=Przesyłka istnieje
@@ -68,8 +69,9 @@ ValidateOrder=Zatwierdź zamówienie
UnvalidateOrder=Niezatwierdzone zamówienie
DeleteOrder=Usuń zamówienie
CancelOrder=Anuluj zamówienie
-OrderReopened= Zamówienie %s ponownie otwarte
+OrderReopened= Order %s re-open
AddOrder=Stwórz zamówienie
+AddPurchaseOrder=Create purchase order
AddToDraftOrders=Dodaj do szkicu zamówienia
ShowOrder=Pokaż zamówienie
OrdersOpened=Zamówienia do przygotowania
@@ -139,10 +141,10 @@ OrderByEMail=Adres e-mail
OrderByWWW=Online
OrderByPhone=Telefon
# Documents models
-PDFEinsteinDescription=Pełna kolejność modelu (logo. ..)
-PDFEratostheneDescription=Pełna kolejność modelu (logo. ..)
+PDFEinsteinDescription=A complete order model
+PDFEratostheneDescription=A complete order model
PDFEdisonDescription=Prosty model celu
-PDFProformaDescription=Pełna faktura proforma (logo ...)
+PDFProformaDescription=A complete Proforma invoice template
CreateInvoiceForThisCustomer=Zamówienia na banknoty
NoOrdersToInvoice=Brak zleceń rozliczanych
CloseProcessedOrdersAutomatically=Sklasyfikować "przetwarzane" wszystkie wybrane zamówienia.
@@ -152,7 +154,35 @@ OrderCreated=Twoje zamówienia zostały utworzone
OrderFail=Podczas tworzenia zamówienia wystąpił błąd
CreateOrders=Tworzenie zamówień
ToBillSeveralOrderSelectCustomer=Aby utworzyć fakturę za kilka rzędów, kliknij pierwszy na klienta, a następnie wybrać "% s".
-OptionToSetOrderBilledNotEnabled=Option (from module Workflow) to set order to 'Billed' automatically when invoice is validated is off, so you will have to set status of order to 'Billed' manually.
+OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
-CloseReceivedSupplierOrdersAutomatically=Zamknij zamówienie do "%s" automatycznie jeżeli wszystkie produkty są odebrane
+CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
SetShippingMode=Set shipping mode
+WithReceptionFinished=With reception finished
+#### supplier orders status
+StatusSupplierOrderCanceledShort=Anulowany
+StatusSupplierOrderDraftShort=Projekt
+StatusSupplierOrderValidatedShort=Zatwierdzony
+StatusSupplierOrderSentShort=W przygotowaniu
+StatusSupplierOrderSent=Wysyłka w trakcie
+StatusSupplierOrderOnProcessShort=Zamówione
+StatusSupplierOrderProcessedShort=Przetwarzany
+StatusSupplierOrderDelivered=Dostarczone
+StatusSupplierOrderDeliveredShort=Dostarczone
+StatusSupplierOrderToBillShort=Dostarczone
+StatusSupplierOrderApprovedShort=Przyjęto
+StatusSupplierOrderRefusedShort=Odrzucony
+StatusSupplierOrderToProcessShort=Do przetworzenia
+StatusSupplierOrderReceivedPartiallyShort=Częściowo otrzymano
+StatusSupplierOrderReceivedAllShort=Produkty otrzymane
+StatusSupplierOrderCanceled=Anulowany
+StatusSupplierOrderDraft=Projekt (do zatwierdzonia)
+StatusSupplierOrderValidated=Zatwierdzony
+StatusSupplierOrderOnProcess=Zamówione - odbiór czuwania
+StatusSupplierOrderOnProcessWithValidation=Zamówione - odbiór lub walidacji czuwania
+StatusSupplierOrderProcessed=Przetwarzany
+StatusSupplierOrderToBill=Dostarczone
+StatusSupplierOrderApproved=Przyjęto
+StatusSupplierOrderRefused=Odrzucony
+StatusSupplierOrderReceivedPartially=Częściowo otrzymano
+StatusSupplierOrderReceivedAll=Wszystkie produkty otrzymane
diff --git a/htdocs/langs/pl_PL/other.lang b/htdocs/langs/pl_PL/other.lang
index 7fb0992c56a..02d2189d638 100644
--- a/htdocs/langs/pl_PL/other.lang
+++ b/htdocs/langs/pl_PL/other.lang
@@ -24,7 +24,7 @@ MessageOK=Message on the return page for a validated payment
MessageKO=Message on the return page for a canceled payment
ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
DeleteAlsoContentRecursively=Check to delete all content recursively
-
+PoweredBy=Powered by
YearOfInvoice=Year of invoice date
PreviousYearOfInvoice=Previous year of invoice date
NextYearOfInvoice=Following year of invoice date
@@ -104,7 +104,8 @@ DemoFundation=Zarządzanie członkami fundacji
DemoFundation2=Zarządzanie członkami i kontami bankowymi fundacji
DemoCompanyServiceOnly=Firma lub freelancer sprzedający tylko swoje usługi
DemoCompanyShopWithCashDesk=Zarządzanie sklepem z kasy
-DemoCompanyProductAndStocks=Firma sprzedająca produkty w sklepie
+DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
+DemoCompanyManufacturing=Company manufacturing products
DemoCompanyAll=Firma z kilkoma aktywnościami (wszystkie główne moduły)
CreatedBy=Utworzone przez %s
ModifiedBy=Zmodyfikowane przez %s
@@ -267,7 +268,7 @@ WEBSITE_PAGEURL=Link strony
WEBSITE_TITLE=Tytuł
WEBSITE_DESCRIPTION=Opis
WEBSITE_IMAGE=Image
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITEKEY__ in the path if path depends on website name.
WEBSITE_KEYWORDS=Słowa kluczowe
LinesToImport=Lines to import
diff --git a/htdocs/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang
index 2f4c5d0fc20..aab0b604482 100644
--- a/htdocs/langs/pl_PL/projects.lang
+++ b/htdocs/langs/pl_PL/projects.lang
@@ -77,7 +77,7 @@ MyProjectsArea=Obszar moich projektów
DurationEffective=Efektywny czas trwania
ProgressDeclared=Deklarowany postęp
TaskProgressSummary=Task progress
-CurentlyOpenedTasks=Curently opened tasks
+CurentlyOpenedTasks=Curently open tasks
TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
ProgressCalculated=Obliczony postęp
@@ -249,9 +249,13 @@ TimeSpentForInvoice=Czas spędzony
OneLinePerUser=One line per user
ServiceToUseOnLines=Service to use on lines
InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets).
+ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
ProjectFollowOpportunity=Follow opportunity
ProjectFollowTasks=Follow tasks
UsageOpportunity=Usage: Opportunity
UsageTasks=Usage: Tasks
UsageBillTimeShort=Usage: Bill time
+InvoiceToUse=Draft invoice to use
+NewInvoice=Nowa faktura
+OneLinePerTask=One line per task
+OneLinePerPeriod=One line per period
diff --git a/htdocs/langs/pl_PL/propal.lang b/htdocs/langs/pl_PL/propal.lang
index 08d5ab40b6b..980ae30bf5f 100644
--- a/htdocs/langs/pl_PL/propal.lang
+++ b/htdocs/langs/pl_PL/propal.lang
@@ -28,7 +28,7 @@ ShowPropal=Pokaż oferty
PropalsDraft=Szkice
PropalsOpened=Otwarte
PropalStatusDraft=Szkic (musi zostać zatwierdzony)
-PropalStatusValidated=Validated (proposal is opened)
+PropalStatusValidated=Zatwierdzona (oferta jest otwarta)
PropalStatusSigned=Podpisano (do rachunku)
PropalStatusNotSigned=Nie podpisały (zamknięte)
PropalStatusBilled=zapowiadane
@@ -76,10 +76,11 @@ TypeContact_propal_external_BILLING=Kontakt do klienta w sprawie faktury
TypeContact_propal_external_CUSTOMER=kontakt klienta w ślad za wniosek
TypeContact_propal_external_SHIPPING=Customer contact for delivery
# Document models
-DocModelAzurDescription=Kompletny wniosek modelu (logo. ..)
-DocModelCyanDescription=Kompletny wniosek modelu (logo. ..)
+DocModelAzurDescription=A complete proposal model
+DocModelCyanDescription=A complete proposal model
DefaultModelPropalCreate=Domyślny model kreacji.
DefaultModelPropalToBill=Domyślny szablon po zamknięciu wniosku biznesowego ( do zafakturowania)
DefaultModelPropalClosed=Domyślny szablon po zamknięciu projektu biznesowego ( weryfikowane )
ProposalCustomerSignature=Wpisany akceptacji i pieczęć firmy, data i podpis
ProposalsStatisticsSuppliers=Vendor proposals statistics
+CaseFollowedBy=Case followed by
diff --git a/htdocs/langs/pl_PL/stocks.lang b/htdocs/langs/pl_PL/stocks.lang
index 2f2d1a43ce5..98db8675c53 100644
--- a/htdocs/langs/pl_PL/stocks.lang
+++ b/htdocs/langs/pl_PL/stocks.lang
@@ -143,6 +143,7 @@ InventoryCode=Ruch lub kod inwentaryzacji
IsInPackage=Zawarte w pakiecie
WarehouseAllowNegativeTransfer=Zapas może być ujemny
qtyToTranferIsNotEnough=Nie masz wystarczającego zapasu w magazynie źródłowym i twoje ustawienie nie pozwala na zapas ujemny.
+qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
ShowWarehouse=Pokaż magazyn
MovementCorrectStock=Korekta zapasu dla artykułu %s
MovementTransferStock=Transferuj zapas artykułu %s do innego magazynu
@@ -192,6 +193,7 @@ TheoricalQty=Theorique qty
TheoricalValue=Theorique qty
LastPA=Last BP
CurrentPA=Curent BP
+RecordedQty=Recorded Qty
RealQty=Real Qty
RealValue=Real Value
RegulatedQty=Regulated Qty
diff --git a/htdocs/langs/pl_PL/website.lang b/htdocs/langs/pl_PL/website.lang
index 7cc6329e2e4..aa68c53a50c 100644
--- a/htdocs/langs/pl_PL/website.lang
+++ b/htdocs/langs/pl_PL/website.lang
@@ -1,123 +1,123 @@
# Dolibarr language file - Source file is en_US - website
Shortname=Kod
-WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Tu utwórz witryny, które chcesz użyć. Następnie, przejdź do menu Witryny, aby je edytować.
DeleteWebsite=Skasuj stronę
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
-WEBSITE_TYPE_CONTAINER=Type of page/container
-WEBSITE_PAGE_EXAMPLE=Web page to use as example
+ConfirmDeleteWebsite=Czy na pewno zamierzasz usunąć tę witrynę? Wszystkie jej strony i zawartość również zostaną usunięte. Pozostawione zostaną wszelkie pliki dosłane (np. do katalogu mediów, moduł ECM, ...).
+WEBSITE_TYPE_CONTAINER=Typ strony/pojemnika
+WEBSITE_PAGE_EXAMPLE=Strona internetowa do użycia jako przykład
WEBSITE_PAGENAME=Nazwa strony
-WEBSITE_ALIASALT=Alternative page names/aliases
-WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:
alternativename1, alternativename2, ...
+WEBSITE_ALIASALT=Alternatywne nazwy/aliasy strony
+WEBSITE_ALIASALTDesc=Użyj tutaj listy innych nazw/aliasów, aby uzyskać dostęp do web strony za pomocą tych innych nazw/aliasów (na przykład: po zmianie nazwy/aliasu dostęp do web strony po starej nazwie/aliasie byłby niemożliwy. Taka lista temu zapobiega). Składnia jest następująca:
innanazwa1, innanazwa2, ...
WEBSITE_CSS_URL=URL zewnętrznego pliku CSS
-WEBSITE_CSS_INLINE=CSS file content (common to all pages)
-WEBSITE_JS_INLINE=Javascript file content (common to all pages)
-WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
-WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Website .htaccess file
-WEBSITE_MANIFEST_JSON=Website manifest.json file
-WEBSITE_README=README.md file
-EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
-HtmlHeaderPage=HTML header (specific to this page only)
-PageNameAliasHelp=Name or alias of the page.
This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias.
-EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
+WEBSITE_CSS_INLINE=Zawartość pliku CSS (wspólna dla wszystkich stron)
+WEBSITE_JS_INLINE=Zawartość pliku JavaScript (wspólna dla wszystkich stron)
+WEBSITE_HTML_HEADER=Dodanie nagłówka HTML u dołu (wspólne dla wszystkich stron)
+WEBSITE_ROBOT=Plik robota (robots.txt)
+WEBSITE_HTACCESS=Plik .htaccess witryny
+WEBSITE_MANIFEST_JSON=Plik manifest.json witryny
+WEBSITE_README=Plik README.md
+EnterHereLicenseInformation=Tu wprowadź metadane lub informacje licencyjne, które wypełnią plik README.md. Przy rozprowadzaniu Twej witryny jako szablonu, plik ten zostanie dołączony do pakietu tego szablonu.
+HtmlHeaderPage=Nagłówek HTML (tylko dla tej strony)
+PageNameAliasHelp=Nazwa lub alias strony.
Ten alias służy również do tworzenia adresu URL wspierającego SEO, gdy witrynę obsługuje web serwer (taki jak Apacke, Nginx, ...). Użyj przycisku „%s”, aby edytować ten alias.
+EditTheWebSiteForACommonHeader=Uwaga: Jeśli chcesz zdefiniować nagłówek dla wszystkich stron, edytuj nagłówek na poziomie witryny zamiast na poziomie strony/pojemnika.
MediaFiles=Biblioteka mediów
-EditCss=Edit website properties
+EditCss=Edytuj właściwości witryny
EditMenu=Edytuj Menu
-EditMedias=Edit medias
-EditPageMeta=Edit page/container properties
-EditInLine=Edit inline
-AddWebsite=Add website
-Webpage=Web page/container
+EditMedias=Edytuj media
+EditPageMeta=Edytuj właściwości strony/pojemnika
+EditInLine=Edytuj w linii
+AddWebsite=Dodaj witrynę
+Webpage=Strona/pojemnik
AddPage=Dodaj stronę
HomePage=Strona główna
-PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'.
-RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
-SiteDeleted=Web site '%s' deleted
-PageContent=Page/Contenair
-PageDeleted=Page/Contenair '%s' of website %s deleted
-PageAdded=Page/Contenair '%s' added
+PageContainer=Strona/pojemnik
+PreviewOfSiteNotYetAvailable=Podgląd Twej witryny %s nie jest jeszcze dostępny. Użyj wpierw 'Załaduj szablon witryny' lub 'Dodaj stronę/pojemnik'.
+RequestedPageHasNoContentYet=Żądana strona o identyfikatorze %s nie ma jeszcze treści lub plik pamięci podręcznej .tpl.php został usunięty. Edytuj zawartość strony, aby to rozwiązać.
+SiteDeleted=Witryna '%s' usunięta
+PageContent=Strona/pojemnik
+PageDeleted=Strona/Pojemnik '%s' witryny %s usunięta/-y
+PageAdded=Strona/pojemnik '%s' dodana/-y
ViewSiteInNewTab=Zobacz stronę w nowej zakładce
ViewPageInNewTab=Zobacz stronę w nowej zakładce
SetAsHomePage=Ustaw jako stronę domową
-RealURL=Prawdziwy link
+RealURL=Prawdziwy adres URL
ViewWebsiteInProduction=Zobacz stronę używając linków ze strony głównej
-SetHereVirtualHost=Use with Apache/NGinx/...
If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on
%s
then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
-YouCanAlsoTestWithPHPS=Use with PHP embedded server
On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running
php -S 0.0.0.0:8080 -t %s
-YouCanAlsoDeployToAnotherWHP=Run your web site with another Dolibarr Hosting provider
If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on https://saas.dolibarr.org
-CheckVirtualHostPerms=Check also that virtual host has permission %s on files into
%s
-ReadPerm=Czytać
-WritePerm=Write
-TestDeployOnWeb=Test/deploy on web
-PreviewSiteServedByWebServer=Preview %s in a new tab.
The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:
%s
URL served by external server:
%s
-PreviewSiteServedByDolibarr=Preview %s in a new tab.
The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.
The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.
URL served by Dolibarr:
%s
To use your own external web server to serve this web site, create a virtual host on your web server that point on directory
%s
then enter the name of this virtual server and click on the other preview button.
-VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
+SetHereVirtualHost=Gdy Twój rzeczywisty web serwer to Apache/NGinx/...
Jeśli na Twym rzeczywistym web serwerze masz uprawnienia do tworzenia wirtualnego web serwera (Virtual Host), to utwórz go i odpowiednio skonfiguruj - np. włącz obsługę PHP, wskaż katalog Root na
%s
, ustaw kontrolę dostępu. Następnie, jego URL podaj w Dolibarr jako wartość właściwości Virtualhost witryny, przez co podgląd witryny będzie możliwy również poprzez ten dedykowany web serwerze, a nie tylko przez wewnętrzny web serwer w Dolibarr.
+YouCanAlsoTestWithPHPS= Używaj z wbudowanym serwerem PHP
Gdy w środowisku rozwojowym preferujesz testowanie web strony z web serwerem wbudowanym w PHP (wymagane PHP 5.5 lub nowsze), to uruchamiaj
php -S 0.0.0.0:8080 -t %s
+YouCanAlsoDeployToAnotherWHP=Uruchom swoją witrynę u innego dostawcy wystąpień Dolibarr
Jeśli nie masz dostępnego w internecie web serwera, takiego jak Apache lub NGinx, to możesz eksportować i importować swoją witrynę do innego wystąpienia Dolibarr u kogoś oferującego wystąpienia Dolibarr mające moduł Website w pełni zintegrowany z web serwerem. Listę niektórych dostawców wystąpień Dolibarr znajdziesz w https://saas.dolibarr.org
+CheckVirtualHostPerms=Sprawdź także, czy host wirtualny ma uprawnienia %s do plików
%s
+ReadPerm=Czytanie
+WritePerm=Zapis
+TestDeployOnWeb=Testuj/wdróż na web serwerze
+PreviewSiteServedByWebServer=Podgląd %s w nowej zakładce.
%s będzie obsługiwana przez zewnętrzny web serwer (np. Apache, Nginx, IIS). Musisz zainstalować i skonfigurować taki web serwer, zanim wskazanie do katalogu:
%s
URL obsługiwany przez zewnętrzny web serwer:
%s
+PreviewSiteServedByDolibarr=Podgląd %s w nowej zakładce.
%s będzie obsługiwany przez wewnętrzny - zawarty w Dolibarr - web serwer, przez co żaden dodatkowy web serwer nie musi być instalowany/używany.
Niedogodnością takiego rozwiązania są adresy URL stron web, które wtedy rozpoczynając się od ścieżki Twego wystąpienia Dolibarr są przez to nieprzyjazne użytkownikowi.
Adres URL obsługiwany przez Dolibarr:
%s
By do obsługi tej web witryny używać zewnętrznego - wobec Twego wystąpienia Dolibarr, ale jednak na tym samym komputerze - web serwera, to musi on działać i być skonfigurowany do obsługi katalogu
%s
jako swego katalogu głównego. Zatem, w swym lokalnym rzeczywistym web serwerze (jak Apache, Nginx, IIS) dla każdej swej web witryny utwórz i skonfiguruj wirtualny web serwer, po czym podaj jego nazwę i kliknij na inny przycisk do podglądu.
+VirtualHostUrlNotDefined=Adres URL wirtualnego hosta obsługiwanego przez zewnętrzny web serwer nie został zdefiniowany
NoPageYet=Brak stron
-YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
-SyntaxHelp=Help on specific syntax tips
-YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=
You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.
You can also include content of another Page/Container with the following syntax:
<?php includeContainer('alias_of_container_to_include'); ?>
You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):
<?php redirectToContainer('alias_of_container_to_redirect_to'); ?>
To add a link to another page, use the syntax:
<a href="alias_of_page_to_link_to.php">mylink<a>
To include a link to download a file stored into the documents directory, use the document.php wrapper:
Example, for a file into documents/ecm (need to be logged), syntax is:
<a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
For a file into documents/medias (open directory for public access), syntax is:
<a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
For a file shared with a share link (open access using the sharing hash key of file), syntax is:
<a href="/document.php?hashp=publicsharekeyoffile">
To include an image stored into the documents directory, use the viewimage.php wrapper:
Example, for an image into documents/medias (open directory for public access), syntax is:
<img src="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
More examples of HTML or dynamic code available on the wiki documentation
.
-ClonePage=Clone page/container
+YouCanCreatePageOrImportTemplate=Możesz utworzyć nową stronę albo załadować pełny szablon witryny
+SyntaxHelp=Pomoc na temat określonych wskazówek dotyczących składni
+YouCanEditHtmlSourceckeditor=Możesz edytować kod źródłowy HTML używając przycisku „Źródło” w edytorze.
+YouCanEditHtmlSource=
Możesz dołączyć kod PHP do tego źródła używając znaczników <?php ?>. Dostępne są następujące zmienne globalne: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.
Możesz także dołączyć zawartość innej web strony/pojemnika o następującej składni:
<?php includeContainer('alias_of_container_to_include'); ?>
Można zrobić przekierowanie do innej web strony/pojemnika z następującą składnią (Uwaga: nie wyprowadzaj jakiejkolwiek zawartości przed przekierowaniem):
<?php redirectToContainer('alias_of_container_to_redirect_to'); ?>
Aby dodać link do innej web strony użyj składni:
<a href="alias_of_page_to_link_to.php">mylink<a>
Aby umieścić odsyłacz do pobrania pliku przechowywanego w katalogu documents, użyj funkcji opakowującej document.php :
Na przykład, dla pliku w documents/ecm składnia to:
<a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
Dla pliku w documents/medias (katalog otwarty na dostęp publiczny) składnia to:
<a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
For a file shared with a share link (open access using the sharing hash key of file), syntax is:
<a href="/document.php?hashp=publicsharekeyoffile">
By dołączyć obraz przechowywany w katalogu documents użyj funkcji opakowującej viewimage.php:
Na przykład, dla obrazu w documents/medias (katalog otwarty na dostęp publiczny) składnia to:
<img src="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
Więcej przykładów HTML lub kodu dynamicznego dostępnych jest wdokumentacji typu wiki
.
+ClonePage=Powiel stronę/pojemnik
CloneSite=Duplikuj stronę
-SiteAdded=Website added
-ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
-PageIsANewTranslation=The new page is a translation of the current page ?
-LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
-ParentPageId=Parent page ID
-WebsiteId=Website ID
-CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create page from scratch or from a page template...
-FetchAndCreate=Fetch and Create
-ExportSite=Export website
-ImportSite=Import website template
-IDOfPage=Id of page
-Banner=Banner
-BlogPost=Blog post
-WebsiteAccount=Website account
-WebsiteAccounts=Website accounts
-AddWebsiteAccount=Create web site account
-BackToListOfThirdParty=Back to list for Third Party
-DisableSiteFirst=Disable website first
-MyContainerTitle=My web site title
-AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
-SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
-YouMustDefineTheHomePage=You must first define the default Home page
+SiteAdded=Dodano witrynę
+ConfirmClonePage=Proszę wskazać kod/alias nowej web strony i czy jest to tłumaczenie powielonej web strony.
+PageIsANewTranslation=Nowa strona jest tłumaczeniem bieżącej strony?
+LanguageMustNotBeSameThanClonedPage=Powielasz stronę jako tłumaczenie. Język nowej strony musi być inny niż język strony źródłowej.
+ParentPageId=ID strony nadrzędnej
+WebsiteId=ID witryny
+CreateByFetchingExternalPage=Utwórz stronę/pojemnik pobierając stronę z zewnętrznego adresu URL ...
+OrEnterPageInfoManually=Lub utwórz stronę od zera lub z szablonu strony...
+FetchAndCreate=Pobierz i utwórz
+ExportSite=Eksportuj witrynę
+ImportSite=Załaduj szablon witryny
+IDOfPage=ID strony
+Banner=Transparent
+BlogPost=Post na blogu
+WebsiteAccount=Konto witryny
+WebsiteAccounts=Konta witryny
+AddWebsiteAccount=Utwórz konto witryny
+BackToListOfThirdParty=Wróć do listy Stron Trzecich
+DisableSiteFirst=Najpierw wyłącz witrynę
+MyContainerTitle=Tytuł mojej witryny
+AnotherContainer=W ten sposób można dołączyć zawartość innej web strony/pojemnika (może pojawić się błąd, gdy włączysz obsługę kodu dynamicznego a wbudowany podrzędny pojemnik nie istnieje)
+SorryWebsiteIsCurrentlyOffLine=Przepraszamy, ta witryna jest obecnie niedostępna. Proszę wrócić później...
+WEBSITE_USE_WEBSITE_ACCOUNTS=Włącz tabelę kont witryny
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Włącz tabelę kont witryny (login/hasło) dla każdej witryny/strony trzeciej
+YouMustDefineTheHomePage=Najpierw musisz zdefiniować domyślną stronę główną
OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting javascript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.
Note also that edits of HTML source will be possible when page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
-OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
-GrabImagesInto=Grab also images found into css and page.
-ImagesShouldBeSavedInto=Images should be saved into directory
-WebsiteRootOfImages=Root directory for website images
-SubdirOfPage=Sub-directory dedicated to page
-AliasPageAlreadyExists=Alias page %s already exists
-CorporateHomePage=Corporate Home page
-EmptyPage=Empty page
-ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
-ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
-InternalURLOfPage=Internal URL of page
-ThisPageIsTranslationOf=This page/container is a translation of
-ThisPageHasTranslationPages=This page/container has translation
-NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
-GoTo=Go to
-DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '%s' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
-NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
-ReplaceWebsiteContent=Search or Replace website content
-DeleteAlsoJs=Delete also all javascript files specific to this website?
-DeleteAlsoMedias=Delete also all medias files specific to this website?
-MyWebsitePages=My website pages
-SearchReplaceInto=Search | Replace into
-ReplaceString=New string
-CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:
#mycssselector, input.myclass:hover { ... }
must be
.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }
Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+OnlyEditionOfSourceForGrabbedContent=Po zaciągnięciu zawartości z zewnętrznej web witryny możliwa jest jedynie edycja kodu źródłowego HTML
+GrabImagesInto=Przechwyć także obrazy znalezione w CSS i na stronie.
+ImagesShouldBeSavedInto=Obrazy powinny być zapisane w katalogu
+WebsiteRootOfImages=Katalog główny dla obrazów witryny
+SubdirOfPage=Podkatalog przeznaczony stronie
+AliasPageAlreadyExists=Alias strony %s już istnieje
+CorporateHomePage=Strona główna firmy
+EmptyPage=Pusta strona
+ExternalURLMustStartWithHttp=Zewnętrzny adres URL musi zaczynać się od http:// lub https://
+ZipOfWebsitePackageToImport=Prześlij plik Zip pakietu szablonu witryny
+ZipOfWebsitePackageToLoad=lub Wybierz jakiś dostępny wbudowany pakiet szablonu web witryny
+ShowSubcontainers=Uwzględnij zawartość dynamiczną
+InternalURLOfPage=Wewnętrzny adres URL strony
+ThisPageIsTranslationOf=Ta strona/pojemnik to tłumaczenie
+ThisPageHasTranslationPages=Ta strona/pojemnik ma tłumaczenie
+NoWebSiteCreateOneFirst=Nie utworzono jeszcze żadnej witryny. Utwórz pierwszą.
+GoTo=Idź do
+DynamicPHPCodeContainsAForbiddenInstruction=Dodajesz dynamiczny kod PHP zawierający instrukcję PHP '%s' co jest domyślnie zabronione (podejrzyj ukryte opcje WEBSITE_PHP_ALLOW_xxx w celu powiększenia listy dozwolonych poleceń).
+NotAllowedToAddDynamicContent=Nie masz uprawnień do dodawania/edytowania kodu PHP w witrynie. Uzyskaj uprawnienia lub po prostu nie zmieniaj kodu PHP.
+ReplaceWebsiteContent=Wyszukaj lub Zamień zawartość witryny
+DeleteAlsoJs=Czy usunąć też wszelkie pliki JavaScript tej witryny?
+DeleteAlsoMedias=Czy usunąć też wszelkie pliki mediów tej witryny?
+MyWebsitePages=Strony mej witryny
+SearchReplaceInto=Szukaj | Zamień na
+ReplaceString=Nowy łańcuch
+CSSContentTooltipHelp=Tu wprowadź kod CSS. W celu uniknięcia konfliktu tego kodu z kodem CSS aplikacji, każdą wprowadzoną tu deklarację poprzedź prefiksem .bodywebsite. Na przykład:
#mycssselector, input.myclass:hover { ... }
zamień na
.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }
Uwaga: Jeżeli masz duży plik z deklaracjami bez tego prefiksu, to możesz użyć 'lessc' do ich konwersji na nowe, poprzedzone prefiksem.
LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
-Dynamiccontent=Sample of a page with dynamic content
-ImportSite=Import website template
-EditInLineOnOff=Mode 'Edit inline' is %s
-ShowSubContainersOnOff=Mode to execute 'dynamic content' is %s
-GlobalCSSorJS=Global CSS/JS/Header file of web site
-BackToHomePage=Back to home page...
-TranslationLinks=Translation links
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not a website page
-UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 characters
+Dynamiccontent=Próbka web strony z dynamiczną zawartością
+ImportSite=Załaduj szablon witryny
+EditInLineOnOff=Tryb „Edytuj w linii” jest %s
+ShowSubContainersOnOff=Tryb wykonywania „zawartości dynamicznej” jest %s
+GlobalCSSorJS=Globalny plik CSS/JS/Header witryny
+BackToHomePage=Powrót do strony głównej...
+TranslationLinks=Linki do tłumaczeń
+YouTryToAccessToAFileThatIsNotAWebsitePage=Próbujesz uzyskać dostęp do strony, która nie jest stroną witryny
+UseTextBetween5And70Chars=Aby uzyskać dobre praktyki SEO, użyj tekstu od 5 do 70 znaków
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index 616767ea17d..1b3276ebd8d 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -352,6 +352,7 @@ DisplayCompanyManagers=Exibir nomes dos gerentes
DisplayCompanyInfoAndManagers=Exibir o endereço da empresa e os nomes dos gerentes
ModuleCompanyCodeSupplierAquarium=%s seguido pelo código do fornecedor para um código de contabilidade do fornecedor
ModuleCompanyCodePanicum=Retornar um código contábil vazio
+ModuleCompanyCodeDigitaria=Retorna um código contábil composto de acordo com nome de terceiros. O código consiste em um prefixo que pode ser definido na primeira posição, seguido pelo número de caracteres definidos no código de terceiros.
Use3StepsApproval=Por padrão, os Pedidos de Compra necessitam ser criados e aprovados por 2 usuários diferentes (uma etapa para a criação e a outra etapa para a aprovação. Note que se o usuário possui ambas permissões para criar e aprovar, uma única etapa por usuário será suficiente). Você pode pedir, com esta opção, para introduzir uma terceira etapa para aprovação por outro usuário, se o montante for superior a um determinado valor (assim 3 etapas serão necessárias : 1=validação, 2=primeira aprovação e 3=segunda aprovação se o montante for suficiente).
Defina como vazio se uma aprovação (2 etapas) é suficiente, defina com um valor muito baixo (0.1) se uma segunda aprovação (3 etapas) é sempre exigida.
UseDoubleApproval=Usar uma aprovação de 3 etapas quando o valor (sem taxa) é maior do que ...
WarningPHPMail=AVISO: Muitas vezes, é melhor configurar e-mails enviados para usar o servidor de e-mail do seu provedor, em vez da configuração padrão. Alguns provedores de e-mail (como o Yahoo) não permitem que você envie um e-mail de outro servidor além do seu próprio servidor. Sua configuração atual usa o servidor do aplicativo para enviar e-mail e não o servidor do seu provedor de e-mail, então alguns destinatários (aquele compatível com o protocolo restritivo do DMARC) perguntarão ao seu provedor de e-mail se eles podem aceitar seu e-mail e alguns provedores de e-mail (como o Yahoo) pode responder "não" porque o servidor não é deles, portanto poucos dos seus e-mails enviados podem não ser aceitos (tome cuidado também com a cota de envio do seu provedor de e-mail).
Se o seu provedor de e-mail (como o Yahoo) tiver essa restrição, você deve alterar a configuração de e-mail para escolher o outro método "servidor SMTP" e inserir o servidor SMTP e as credenciais fornecidas pelo seu provedor de e-mail.
@@ -387,7 +388,6 @@ Module23Desc=Monitoramento de Consumo de Energia
Module25Name=Ordens de venda
Module25Desc=Gerenciamento de pedidos de vendas
Module40Name=Vendedores
-Module40Desc=Fornecedores e gerenciamento de compras (pedidos e faturamento)
Module42Name=Notas de depuração
Module42Desc=Recursos de registro (arquivo, syslog, ...). Tais registros são para propósitos técnicos/debug.
Module49Desc=Gestor de Editores
@@ -418,9 +418,9 @@ Module105Name=Carteiro e SPIP
Module105Desc=Carteiro ou Interface SPIP para Módulo MembroMailman or SPIP interface for member module
Module200Desc=Sincronização de diretório LDAP
Module240Name=Exportações de Dados
-Module240Desc=Ferramenta para exportar dados do Dolibarr (com assistentes)
+Module240Desc=Ferramenta para exportar dados Dolibarr (com assistência)
Module250Name=Importação de Dados
-Module250Desc=Ferramenta para importar dados para o Dolibarr (com assistentes)
+Module250Desc=Ferramenta para importar dados para Dolibarr (com assistência)
Module310Desc=Gestor de Associação de Membros
Module320Desc=Adicionar um feed RSS às páginas do Dolibarr
Module330Name=Marcadores e atalhos
@@ -687,6 +687,8 @@ Permission1251=Rodar(run) Importações Massivas de Dados Externos para o Banco
Permission1321=Exportar Faturas de Clientes, Atributos e Pagamentos
Permission1322=Reabrir uma nota paga
Permission1421=Exportar ordens de venda e atributos
+Permission2402=Criar / modificar ações (eventos ou tarefas) vinculadas à sua conta de usuário (se for proprietário do evento)
+Permission2403=Excluir ações (eventos ou tarefas) vinculadas à sua conta de usuário (se for proprietário do evento)
Permission2411=Ler Ações (eventos ou tarefas) dos Outros
Permission2412=Criar/Modificar Ações (eventos ou tarefas) dos Outros
Permission2413=Excluir ações (eventos ou tarefas) dos outros
@@ -724,6 +726,10 @@ Permission50401=Vincular produtos e faturas com contas contábeis
Permission50411=Ler operações no livro de registros
Permission50412=Gravar/ edirar operações no livro de registros
Permission50414=Excluir operações no livro de registros
+Permission50415=Excluir todas as operações por ano e livro razão
+Permission50418=Operações de exportação do livro razão
+Permission50420=Relatórios e relatórios para exportação (rotatividade, saldo, diários, livro razão)
+Permission50430=Definir períodos fiscais. Validar transações e fechar períodos fiscais.
Permission50440=Gerenciar plano de contas, configuração da contabilidade
Permission51001=Ler ativos
Permission51002=Criar / atualizar ativos
@@ -834,6 +840,7 @@ CompanyTown=Município
IDCountry=ID do país
LogoDesc=Logotipo principal da empresa. Será usado em documentos gerados (PDF, ...)
LogoSquarred=Logotipo (quadrado)
+LogoSquarredDesc=Deve ser um ícone quadrado (largura = altura). Este logotipo será usado como o ícone favorito ou outra necessidade da barra de menus superior (se não estiver desativado na configuração do monitor).
NoActiveBankAccountDefined=Nenhuma conta bancária ativa está definida
BankModuleNotActive=O módulo de contas bancárias não está habilitado
ShowBugTrackLink=Mostrar link "%s"
@@ -884,6 +891,7 @@ TriggerAlwaysActive=Triggers neste arquivo está sempre ativo, não importando o
TriggerActiveAsModuleActive=Triggers neste arquivo são ativos quando módulo %s está ativado.
GeneratedPasswordDesc=Escolha o método a ser usado para senhas geradas automaticamente.
DictionaryDesc=Inserir todos os dados de referência. Você pode adicionar seus valores ao padrão.
+ConstDesc=Esta página permite editar (substituir) parâmetros não disponíveis em outras páginas. Estes são parâmetros reservados principalmente para desenvolvedores / solução de problemas avançados.
MiscellaneousDesc=Todos os outros parâmetros relacionados com a segurança são definidos aqui.
LimitsSetup=Configurações de Limites/Precisões
MAIN_MAX_DECIMALS_UNIT=Max. decimais para preços unitários
@@ -896,7 +904,6 @@ ParameterActiveForNextInputOnly=Parâmetro efetivo somente para a próxima entra
NoEventOrNoAuditSetup=Nenhum evento de segurança foi registrado. Isso é normal se a Auditoria não tiver sido ativada na página "Configuração - Segurança - Eventos".
SeeLocalSendMailSetup=Ver sua configuração local de envio de correspondência
BackupDesc=Um backup completo de uma instalação do Dolibarr requer duas etapas.
-BackupDesc2=Faça backup do conteúdo do diretório "documents" ( %s ) contendo todos os arquivos carregados e gerados. Isso também incluirá todos os arquivos de despejo gerados na Etapa 1.
BackupDesc3=Faça backup da estrutura e do conteúdo do banco de dados ( %s ) em um arquivo de despejo. Para isso, você pode usar o assistente a seguir.
BackupDescX=O diretório arquivado deve ser armazenado em um local seguro.
BackupDescY=O arquivo de despeja gerado deverá ser armazenado em um local seguro.
@@ -906,6 +913,7 @@ RestoreDesc3=Restaure a estrutura do banco de dados e os dados de um arquivo de
RestoreMySQL=Importar MySQL
ForcedToByAModule=Essa Regra é forçada para %s by um módulo ativado
PreviousDumpFiles=Arquivos de backup existentes
+PreviousArchiveFiles=Arquivos existentes
WeekStartOnDay=Primeiro dia da semana
RunningUpdateProcessMayBeRequired=A execução do processo de atualização parece ser necessária (a versão do programa %s é diferente da versão do banco de dados %s)
YouMustRunCommandFromCommandLineAfterLoginToUser=Você deve rodar esse comando na linha de comando (CLI) depois de logar no shell com o usuário %s ou você deve adicionar a opção -W no final da linha de comando para fornecer a senha %s.
@@ -960,6 +968,7 @@ PreloadOPCode=O OPCode pré-carregado está em uso
AddRefInList=Mostrar ref. Cliente / fornecedor lista de informações (lista de seleção ou caixa de combinação) e a maior parte do hiperlink.
Terceiros aparecerão com um formato de nome "CC12345 - SC45678 - Empresa X." em vez de "Empresa X.".
AddAdressInList=Exibir lista de informações de endereço do cliente / fornecedor (lista de seleção ou caixa de combinação)
Terceiros aparecerão com um formato de nome de "Empresa X. - Rua tal, n°:21, sala: 123456, Cidade/Estado - Brasil" em vez de "Empresa X".
FillThisOnlyIfRequired=Exemplo: +2 (Preencha somente se compensar o problema do timezone é experiente)
+NumberingModules=Modelos de numeração
PasswordGenerationStandard=Retorna uma senha gerara de acordo com o algorítimo interno do Dolibarr: 8 caracteres contendo números e letras em letras minusculas.
PasswordGenerationPerso=Retornar uma senha de acordo com a configuração definida para a sua personalidade.
PasswordPatternDesc=Descrição do padrão de senha
@@ -1217,6 +1226,7 @@ FCKeditorForProductDetails=WYSIWIG criação / edição de produtos detalha linh
FCKeditorForMailing=Criação/edição do WYSIWIG nos E-Mails massivos (ferramentas->emailing)
FCKeditorForUserSignature=criação/edição do WYSIWIG nas assinaturas de usuários
FCKeditorForMail=Criação/Edição WYSIWIG para todos os e-mails (exceto Ferramentas->eMailing)
+FCKeditorForTicket=Criação / edição WYSIWIG para tickets
StockSetup=Configuração do módulo de estoque
MenuDeleted=Menu Deletado
NotTopTreeMenuPersonalized=Menus personalizados não conectados à uma entrada do menu superior
@@ -1293,6 +1303,7 @@ ChequeReceiptsNumberingModule=Verificar módulo de numeração de recibos
MultiCompanySetup=Configurações do módulo multi-empresas
SuppliersSetup=Configuração do módulo de fornecedor
SuppliersInvoiceNumberingModel=Modelos de numeração de faturas de fornecedores
+IfSetToYesDontForgetPermission=Se definido como um valor não nulo, não se esqueça de fornecer permissões a grupos ou usuários com permissão para a segunda aprovação
GeoIPMaxmindSetup=Configurações do módulo GeoIP Maxmind
NoteOnPathLocation=Nota que seu ip para o arquivo de dados do país deve estar dentro do diretório do seu PHP que possa ser lido (Verifique a configuração do seu PHP open_basedir e o sistema de permissões).
YouCanDownloadFreeDatFileTo=Você pode baixar uma Versão demo do arquivo Maxmind GeoIP do seu país no %s.
@@ -1326,9 +1337,11 @@ ExpenseReportNumberingModules=Módulo de numeração dos relatórios de despesas
NoModueToManageStockIncrease=Nenhum módulo disponível foi ativado para gerenciar o aumento automático do estoque. O aumento do estoque será feito apenas de forma manual.
YouMayFindNotificationsFeaturesIntoModuleNotification=Você pode encontrar opções para notificações por e-mail ativando e configurando o módulo "Notificação"
ListOfNotificationsPerUser=Lista de notificações automáticas por usuário
+ListOfNotificationsPerUserOrContact=Lista de possíveis notificações automáticas (no evento de negócios) disponíveis por usuário * ou por contato **
ListOfFixedNotifications=Lista de notificações fixas automáticas
-GoOntoContactCardToAddMore=Ir para a aba "Notificações" de um terceiro para adicionar ou remover as notificações para contatos/endereços
-BackupDumpWizard=Assistente para criar o arquivo de backup
+GoOntoContactCardToAddMore=Vá para guia "Notificações" de terceiros para adicionar ou remover notificações de contatos / endereços
+BackupDumpWizard=Assistente para criar arquivo de backup do banco de dados
+BackupZipWizard=Assistente para criar arquivo do diretório de documentos
SomethingMakeInstallFromWebNotPossible=A instalação do módulo externo não é possível a partir da interface web pelo seguinte motivo:
SomethingMakeInstallFromWebNotPossible2=Por esse motivo, o processo de atualização descrito aqui é um processo manual que somente um usuário privilegiado pode executar.
InstallModuleFromWebHasBeenDisabledByFile=A instalação do módulo externo do aplicativo foi desabilitada pelo seu Administrador. Você deve pedir que ele remova o arquivo %s para permitir esta funcionalidade.
@@ -1401,6 +1414,7 @@ NothingToSetup=Não há configuração específica necessária para este módulo
SetToYesIfGroupIsComputationOfOtherGroups=Defina isto como yes se este grupo for um cálculo de outros grupos
SeveralLangugeVariatFound=Várias variantes de idioma encontradas
RemoveSpecialChars=Remover caracteres especiais
+COMPANY_DIGITARIA_CLEAN_REGEX=Filtro Regex para valor limpo (COMPANY_DIGITARIA_CLEAN_REGEX)
COMPANY_DIGITARIA_UNIQUE_CODE=Duplicação não permitida
GDPRContactDesc=Se você armazenar dados sobre empresas / cidadãos europeus, poderá nomear o contato responsável pelo regulamento geral de proteção de dados aqui
HelpOnTooltipDesc=Coloque texto ou uma chave de conversão aqui para o texto ser exibido em uma dica de ferramenta quando esse campo aparecer em um formulário
@@ -1464,10 +1478,16 @@ SmallerThan=Menor que
LargerThan=Maior que
IfTrackingIDFoundEventWillBeLinked=Observe que, se um ID de rastreamento for encontrado no e-mail recebido, o evento será automaticamente vinculado aos objetos relacionados.
WithGMailYouCanCreateADedicatedPassword=Com uma conta do GMail, se você ativou a validação de 2 etapas, é recomendável criar uma segunda senha dedicada para o aplicativo, em vez de usar sua própria senha da conta em https://myaccount.google.com/.
+EmailCollectorTargetDir=Pode ser um comportamento desejado mover o e-mail para outra tag / diretório quando o mesmo foi processado com êxito. Basta definir um valor aqui para usar este recurso. Observe que você também deve usar uma conta de logon de leitura / gravação.
+EndPointFor=Ponto final para %s : %s
DeleteEmailCollector=Excluir coletor de e-mail
ConfirmDeleteEmailCollector=Tem certeza de que deseja excluir este coletor de e-mail?
RecipientEmailsWillBeReplacedWithThisValue=Os e-mails dos destinatários sempre serão substituídos por este valor
AtLeastOneDefaultBankAccountMandatory=Pelo menos uma (01) conta bancária padrão deve ser definida
+RESTRICT_API_ON_IP=Permitir APIs disponíveis apenas para algum IP do host (curinga não permitido, use espaço entre valores). Vazio significa que todos os hosts podem usar as APIs disponíveis.
+RESTRICT_ON_IP=Permitir acesso apenas a alguns IPs do host (curinga não permitido, use espaço entre valores). Vazio significa que todos os hosts podem acessar.
BaseOnSabeDavVersion=Com base na versão da biblioteca SabreDAV
NotAPublicIp=Não é um IP público
+MakeAnonymousPing=Faça um ping anônimo '+1' no servidor de base Dolibarr (feito apenas uma vez após a instalação) para permitir que a base conte o número de instalações do Dolibarr.
+FeatureNotAvailableWithReceptionModule=Recurso não disponível quando a recepção do módulo está ativada
EmailTemplate=Modelo para e-mail
diff --git a/htdocs/langs/pt_BR/agenda.lang b/htdocs/langs/pt_BR/agenda.lang
index d1b41d9e6e1..9eb2efd346c 100644
--- a/htdocs/langs/pt_BR/agenda.lang
+++ b/htdocs/langs/pt_BR/agenda.lang
@@ -41,7 +41,7 @@ MemberSubscriptionModifiedInDolibarr=Modificada %s inscrição para %smembro
MemberSubscriptionDeletedInDolibarr=Deletada inscrição %spara membro %s
ShipmentValidatedInDolibarr=Envio %s validado
ShipmentClassifyClosedInDolibarr=Expedição%s classificado(s) e faturado(s)
-ShipmentUnClassifyCloseddInDolibarr=Expedição%s classificado(s) reaberto(s)
+ShipmentUnClassifyCloseddInDolibarr=Remessa %s classificada como reaberta
ShipmentBackToDraftInDolibarr=Embarque %s voltou à situação rascunho
ShipmentDeletedInDolibarr=Envio %s cancelado
OrderCreatedInDolibarr=Pedido %s criado
diff --git a/htdocs/langs/pt_BR/bills.lang b/htdocs/langs/pt_BR/bills.lang
index 22441867a2b..41d6530f8a9 100644
--- a/htdocs/langs/pt_BR/bills.lang
+++ b/htdocs/langs/pt_BR/bills.lang
@@ -279,7 +279,6 @@ PaymentCondition60DENDMONTH=Dentro de 60 dias após o fim do mês
PaymentConditionShortPT_DELIVERY=Na entrega
PaymentConditionPT_ORDER=No pedido
PaymentConditionPT_5050=50%% adiantado e 50%% na entrega
-FixAmount=Quantia fixa
VarAmount=Variavel valor (%% total)
PaymentTypePRE=Pedido com pagamento em Débito direto
PaymentTypeShortPRE=Pedido com pagamento por débito
@@ -346,7 +345,6 @@ RevenueStamp=Selo de receita
YouMustCreateInvoiceFromThird=Esta opção só está disponível ao criar uma fatura na guia "Cliente" de terceiros
YouMustCreateInvoiceFromSupplierThird=Essa opção só está disponível ao criar uma fatura na guia "Fornecedor" de terceiros
YouMustCreateStandardInvoiceFirstDesc=Você deve criar antes uma fatura padrão e convertê-la em um "tema" para criar um novo tema de fatura
-PDFCrabeDescription=Template PDF de fatura Caranguejo. Um completo template de fatura (template recomendado)
PDFCrevetteDescription=Tema Crevette para fatura em PDF. Um tema completo para a situação das faturas
TerreNumRefModelDesc1=Retorna número com formato %syymm-nnnn para padrão de faturas e %syymm-nnnn para notas de crédito onde yy é ano, mm é mês e nnnn é uma sequência numérica sem quebra e sem retorno para 0
MarsNumRefModelDesc1=Número de retorno com o formato %syymm-nnnn para faturas padrão, %syymm-nnnn para faturas de substituição, %syymm-nnnn para faturas de adiantamento e %syymm-nnnn para notas de crédito onde yy é ano, mm é mês e nnnn é uma seqüência sem interrupção e não retornar para 0
diff --git a/htdocs/langs/pt_BR/boxes.lang b/htdocs/langs/pt_BR/boxes.lang
index a3fe792caa0..6d8c6cb4ea8 100644
--- a/htdocs/langs/pt_BR/boxes.lang
+++ b/htdocs/langs/pt_BR/boxes.lang
@@ -75,7 +75,10 @@ BoxTitleUserBirthdaysOfMonth=Aniversários deste mês (usuários)
BoxLastManualEntries=Últimas entradas manuais em contabilidade
BoxTitleLastManualEntries=%s últimas entradas manuais
NoRecordedManualEntries=Nenhuma entrada manual registrada na contabilidade
+BoxSuspenseAccount=Operação de contabilidade com conta suspensa
BoxTitleSuspenseAccount=Número de linhas não alocadas
+NumberOfLinesInSuspenseAccount=Número de linha na conta suspensa
SuspenseAccountNotDefined=A conta suspensa não está definida
BoxLastCustomerShipments=Últimos envios de clientes
+BoxTitleLastCustomerShipments=%s remessas de clientes mais recentes
NoRecordedShipments=Nenhuma remessa de cliente registrada
diff --git a/htdocs/langs/pt_BR/cashdesk.lang b/htdocs/langs/pt_BR/cashdesk.lang
index 1108dbc3aa5..7af01359574 100644
--- a/htdocs/langs/pt_BR/cashdesk.lang
+++ b/htdocs/langs/pt_BR/cashdesk.lang
@@ -53,3 +53,5 @@ InvoiceIsAlreadyValidated=A fatura já está validada
NoLinesToBill=Nenhuma linha para cobrança
CustomReceipt=Recibo personalizado
ReceiptName=Nome do recibo
+ProductSupplements=Suplementos ao produto
+SupplementCategory=Categoria de suplemento
diff --git a/htdocs/langs/pt_BR/categories.lang b/htdocs/langs/pt_BR/categories.lang
index 3ef0b06e498..4d6beb8961b 100644
--- a/htdocs/langs/pt_BR/categories.lang
+++ b/htdocs/langs/pt_BR/categories.lang
@@ -57,6 +57,7 @@ ContactCategoriesShort=Contatos tags / categorias
AccountsCategoriesShort=Tags/categorias Contas
ProjectsCategoriesShort=Projetos tags/categorias
UsersCategoriesShort=Tags / categorias de usuários
+StockCategoriesShort=Tags / categorias de armazém
ThisCategoryHasNoProduct=Esta categoria não contém nenhum produto.
ThisCategoryHasNoSupplier=Esta categoria não contém nenhum fornecedor
ThisCategoryHasNoCustomer=Esta categoria não contém a nenhum cliente.
@@ -80,3 +81,5 @@ CategorieRecursivHelp=Se a opção estiver ativada, quando você adicionar um pr
AddProductServiceIntoCategory=Adicione o seguinte produto / serviço
ShowCategory=Mostrar tag / categoria
ChooseCategory=Escolher categoria
+StocksCategoriesArea=Área categorias de armazéns
+UseOrOperatorForCategories=Use operador para categorias
diff --git a/htdocs/langs/pt_BR/companies.lang b/htdocs/langs/pt_BR/companies.lang
index f481d34b7e1..e60767cde2c 100644
--- a/htdocs/langs/pt_BR/companies.lang
+++ b/htdocs/langs/pt_BR/companies.lang
@@ -179,7 +179,7 @@ NewContactAddress=Novo contato / endereço
MyContacts=Meus contatos
CapitalOf=Capital de %s
EditCompany=Editar empresa
-ThisUserIsNot=O usuário não é um possível cliente, cliente, nem fornecedor
+ThisUserIsNot=Este usuário não é um cliente em potencial, cliente ou fornecedor
VATIntraCheckDesc=O ID do IVA deve incluir o prefixo do país. O link %s usa o serviço europeu de verificação de IVA (VIES), que requer acesso à Internet do servidor Dolibarr.
VATIntraCheckableOnEUSite=Verifique o ID do IVA intracomunitário no site da Comissão Europeia
ErrorVATCheckMS_UNAVAILABLE=Verificação não é possível. Verifique o serviço não é necessário por um membro de estado (%s).
diff --git a/htdocs/langs/pt_BR/errors.lang b/htdocs/langs/pt_BR/errors.lang
index 55dde5f8a7c..b3188611618 100644
--- a/htdocs/langs/pt_BR/errors.lang
+++ b/htdocs/langs/pt_BR/errors.lang
@@ -93,7 +93,6 @@ ErrorLoginDoesNotExists=Não existe um usuário com login %s.
ErrorLoginHasNoEmail=Este usuário não tem endereço de e-mail. Processo abortado.
ErrorBadValueForCode=Valor inadequado para código de segurança. Tente novamente com um novo valor...
ErrorBothFieldCantBeNegative=Os campos %s e %s não podem ser ambos negativos
-ErrorFieldCantBeNegativeOnInvoice=O campo %s não pode ser negativo neste tipo de fatura. Se você quiser adicionar uma linha de desconto, basta criar o desconto primeiro com o link %s na tela e aplicá-lo à fatura. Você também pode solicitar que seu administrador defina a opção FACTURE_ENABLE_NEGATIVE_LINES como 1 para permitir o comportamento antigo.
ErrorQtyForCustomerInvoiceCantBeNegative=A quantidade nas linhas das notas de clientes não pode ser negativa
ErrorWebServerUserHasNotPermission=A conta de usuário %s usada para executar o servidor web não possui permissão para isto
ErrorNoActivatedBarcode=Nenhum tipo de código de barras foi ativado
@@ -142,6 +141,13 @@ ErrorBadSyntaxForParamKeyForContent=Má sintaxe para o parâmetro keyforcontent
ErrorVariableKeyForContentMustBeSet=Erro, a constante com nome %s (com conteúdo de texto para mostrar) ou %s (com URL externo para mostrar) deve ser definida.
ErrorURLMustStartWithHttp=O URL %s deve começar com http:// ou https://
ErrorNewRefIsAlreadyUsed=Erro, a nova referência já está sendo usada
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Erro, não é possível excluir o pagamento vinculado a uma fatura fechada.
+ErrorSearchCriteriaTooSmall=Critérios de pesquisa muito pequenos.
+ErrorObjectMustHaveStatusActiveToBeDisabled=Os objetos devem ter o status 'Ativo' para serem desativados
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Os objetos devem ter o status 'Rascunho' ou 'Desativado' para serem ativados
+ErrorFieldRequiredForProduct=O campo '%s' é obrigatório para o produto %s
+ProblemIsInSetupOfTerminal=Problema na configuração do terminal %s.
+ErrorAddAtLeastOneLineFirst=Adicione pelo menos uma linha primeiro
WarningPasswordSetWithNoAccount=A senha foi definida para esse membro. No entanto, nenhuma conta de usuário foi criada. Portanto, esta senha é armazenada, mas não pode ser usado para acessar Dolibarr. Ele pode ser usado por um módulo / interface externa, mas se você não precisa definir qualquer login nem palavra-passe para um membro, você pode desabilitar a opção "Gerenciar um login para cada membro" da configuração do módulo-Membro. Se você precisa para gerenciar um login, mas não precisa de qualquer senha, você pode manter este campo em branco para evitar este aviso. Nota: E-mail pode também ser utilizado como uma entre o membro se está ligado a um utilizador.
WarningMandatorySetupNotComplete=Clique aqui para configurar os parâmetros obrigatórios
WarningEnableYourModulesApplications=Clique aqui para ativar seus módulos e aplicativos
@@ -160,3 +166,4 @@ WarningTooManyDataPleaseUseMoreFilters=Dados em demasia (mais de %s linhas). Por
WarningSomeLinesWithNullHourlyRate=Algumas vezes foram registrados por alguns usuários enquanto sua taxa por hora não foi definida. Um valor de 0 %s por hora foi usado, mas isto pode resultar em uma valoração errada do tempo gasto.
WarningYourLoginWasModifiedPleaseLogin=O seu login foi modificado. Por questões de segurança, você terá de autenticar-se com o seu novo login antes da próxima ação.
WarningProjectClosed=O projeto está fechado. Você deve reabri-lo primeiro.
+WarningSomeBankTransactionByChequeWereRemovedAfter=Algumas transações bancárias foram removidas após geração do recebimento, incluindo elas. Portanto, o número de cheques e o total de recebimento podem diferir do número e do total na lista.
diff --git a/htdocs/langs/pt_BR/exports.lang b/htdocs/langs/pt_BR/exports.lang
index 672030f9aa2..4b838bbd606 100644
--- a/htdocs/langs/pt_BR/exports.lang
+++ b/htdocs/langs/pt_BR/exports.lang
@@ -3,6 +3,7 @@ ImportableDatas=Conjunto de dados que podem ser importados
SelectExportDataSet=Escolha um conjunto predefinido de dados que deseja exportar...
SelectImportDataSet=Escolha um conjunto predefinido de dados que deseja importar...
NotImportedFields=Os campos de arquivo de origem não importado
+ExportModelSaved=Exportar perfil salvo como %s .
ImportModelName=Nome do perfil de importação
DatasetToImport=Conjunto de dados a importar
FormatedImportDesc1=Este módulo permite atualizar dados existentes ou adicionar novos objetos ao banco de dados a partir de um arquivo sem conhecimento técnico, usando um assistente.
@@ -54,7 +55,7 @@ ExportStringFilter=Permite substituir um ou mais caracteres no texto
ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filtra por um ano/mês/dia
YYYY + YYYY, YYYYMM + YYYYMM, YYYYMMDD + YYYYMMDD: filtros ao longo de um intervalo de anos/meses/dias
> YYYY, > YYYYMM, > YYYYMMDD: filtros em todos os anos / meses / dias seguintes
< YYYY, < YYYYMM, < YYYYMMDD: filtros em todos os anos / meses / dias anteriores
ExportNumericFilter=filtros NNNNN por um valor
filtros NNNNN+NNNNN acima de uma faixa de valores
< filtros NNNNN por valores mais baixos
> filtros NNNNN por valores mais elevados
ImportFromLine=Importar iniciando da linha número
-ImportFromToLine=Limite de alcance (De - Para) por exemplo. omitir linha(s) de cabeçalho
+ImportFromToLine=Intervalo de limite (de - até). Por exemplo. omitir linhas de cabeçalho.
SetThisValueTo2ToExcludeFirstLine=Por exemplo, defina esse valor como 3 para excluir as 2 primeiras linhas.
Se as linhas de cabeçalho NÃO forem omitidas, isso resultará em vários erros na simulação de importação.
KeepEmptyToGoToEndOfFile=Mantenha este campo vazio para processar todas as linhas até o final do arquivo.
SelectPrimaryColumnsForUpdateAttempt=Selecione coluna(s) para usar como chave primária para uma importação de UPDATE
diff --git a/htdocs/langs/pt_BR/holiday.lang b/htdocs/langs/pt_BR/holiday.lang
index c48d8072ce1..d5f49deb0a9 100644
--- a/htdocs/langs/pt_BR/holiday.lang
+++ b/htdocs/langs/pt_BR/holiday.lang
@@ -25,6 +25,8 @@ TitreRequestCP=Solicitação de licença
TypeOfLeaveCode=Tipo de licença
TypeOfLeaveLabel=Tipo de etiqueta de licença
NbUseDaysCP=Número de dias de folga consumidos
+NbUseDaysCPHelp=O cálculo leva em consideração os dias não úteis e os feriados definidos no dicionário.
+DayIsANonWorkingDay=%s é um dia não útil
DeleteCP=Excluir
TitleDeleteCP=Excluir a solicitação de licença
ConfirmDeleteCP=Confirmar a eliminação da solicitação de licença?
diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang
index e2ed7524db1..9449e674725 100644
--- a/htdocs/langs/pt_BR/main.lang
+++ b/htdocs/langs/pt_BR/main.lang
@@ -270,6 +270,7 @@ RemoveFilter=Eliminar filtro
GeneratedOn=Gerado a %s
DolibarrStateBoard=Estatísticas do banco de dados
DolibarrWorkBoard=Itens abertos
+NoOpenedElementToProcess=Nenhum elemento aberto para processar
Available=Disponivel
NotYetAvailable=Ainda não disponível
NotAvailable=Não disponível
@@ -363,6 +364,7 @@ FieldsWithIsForPublic=Os campos com %s b> são exibidos na lista pública
AccordingToGeoIPDatabase=(de acordo com a conversão GeoIP)
NotSupported=Não suportado
RequiredField=Campo obrigatorio
+ValidateBefore=O item deve ser validado antes de usar este recurso
Totalizable=Totalizável
TotalizableDesc=Este campo é totalizável na lista
Hidden=Escondido
@@ -522,7 +524,8 @@ NoArticlesFoundForTheCategory=Sem artigos encontrados para a categoria
ToAcceptRefuse=Para Aceitar | Recusar
ContactDefault_commande=Pedido
ContactDefault_invoice_supplier=Fatura do Fornecedor
-ContactDefault_order_supplier=Pedido do Fornecedor
+ContactDefault_order_supplier=Ordem de Compra
ContactDefault_propal=Proposta
ContactDefault_supplier_proposal=Proposta do Fornecedor
ContactAddedAutomatically=Contato adicionado a partir de informações de terceiros
+More=Mais
diff --git a/htdocs/langs/pt_BR/mrp.lang b/htdocs/langs/pt_BR/mrp.lang
index 409923e39c1..3e9b85900cd 100644
--- a/htdocs/langs/pt_BR/mrp.lang
+++ b/htdocs/langs/pt_BR/mrp.lang
@@ -6,6 +6,7 @@ MRPArea=Area MRP
MrpSetupPage=Configuração do módulo MRP
MenuBOM=Lista de materiais
LatestBOMModified=Última BOM modificada %s
+LatestMOModified=%s pedidos de manufatura mais recentes modificados
Bom=Contas de material
BillOfMaterials=Lista de materiais
BOMsSetup=Configuração do módulo BOM
@@ -30,11 +31,31 @@ NewMO=Nova ordem de fabricação
QtyToProduce=Qtd. para produzir
DateStartPlannedMo=Data início planejada
DateEndPlannedMo=Data final planejada
+KeepEmptyForAsap=Vazio significa "o mais breve possível"
EstimatedDuration=Duração estimada
EstimatedDurationDesc=Duração estimada para fabricar este produto usando esta lista técnica
+ConfirmCloseBom=Tem certeza de que deseja cancelar esta lista técnica (você não poderá mais usá-la para criar novas ordens de fabricação)?
+ConfirmReopenBom=Tem certeza de que deseja reabrir esta lista técnica (você poderá usá-la para criar novas ordens de fabricação)
StatusMOProduced=Produzido
QtyFrozen=Qtd. congelada
QuantityFrozen=Quantidade congelada
+QuantityConsumedInvariable=Quando esse sinalizador é definido, a quantidade consumida é sempre o valor definido e não é relativa à quantidade produzida.
+DisableStockChange=Alteração de estoque desativada
+DisableStockChangeHelp=Quando esse sinalizador é definido, não há alteração de estoque neste produto, seja qual for a quantidade consumida
+BomAndBomLines=Listas de materiais e linhas
+BOMLine=Linha de BOM
WarehouseForProduction=Armazém para fabricação
CreateMO=Criar MO
+ToConsume=Consumir
+ToProduce=Produzir
+QtyAlreadyConsumed=Quant. consumida
+QtyAlreadyProduced=Quant. produzida
+ConsumeOrProduce=Consumir ou Produzir
+ConsumeAndProduceAll=Consumir e produzir todos
+Manufactured=Fabricado
TheProductXIsAlreadyTheProductToProduce=O produto a ser adicionado já é o produto a ser produzido.
+ConfirmValidateMo=Tem certeza de que deseja validar esta ordem de fabricação?
+ConfirmProductionDesc=Ao clicar em '%s', você validará o consumo e / ou produção para as quantidades definidas. Isso também atualizará o estoque e registrará movimentos de estoque.
+ProductionForRef=Produção de %s
+AutoCloseMO=Fechar automaticamente a ordem de fabricação se forem atingidas quantidades para consumir e produzir
+NoStockChangeOnServices=Nenhuma alteração de estoque em serviços
diff --git a/htdocs/langs/pt_BR/orders.lang b/htdocs/langs/pt_BR/orders.lang
index 104d03282c7..83771107fae 100644
--- a/htdocs/langs/pt_BR/orders.lang
+++ b/htdocs/langs/pt_BR/orders.lang
@@ -10,6 +10,7 @@ OrderLine=Linha de Comando
OrderDateShort=Data do pedido
OrderToProcess=Pedido a processar
NewOrder=Novo Pedido
+NewOrderSupplier=Novo Pedido de Compra
ToOrder=Realizar Pedido
MakeOrder=Realizar Pedido
SuppliersOrdersRunning=Pedidos de compra atuais
@@ -22,6 +23,8 @@ OrdersToBill=Ordens de vendas entregues
OrdersInProcess=Pedidos de venda em andamento
OrdersToProcess=Ordens de vendas para processar
SuppliersOrdersToProcess=Pedidos de compra para processar
+SuppliersOrdersAwaitingReception=Ordens de compra aguardando recepção
+AwaitingReception=Aguardando recepção
StatusOrderSent=Entrega encaminhada
StatusOrderOnProcessShort=Pedido
StatusOrderToProcessShort=A processar
@@ -48,8 +51,9 @@ ValidateOrder=Confirmar o Pedido
UnvalidateOrder=Desaprovar pedido
DeleteOrder=Eliminar o pedido
CancelOrder=Anular o Pedido
-OrderReopened=Pedido %s Reaberto
+OrderReopened=Pedido %s reaberto
AddOrder=Criar ordem
+AddPurchaseOrder=Criar pedido
AddToDraftOrders=Adicionar a projeto de pedido
ShowOrder=Mostrar Pedido
OrdersOpened=Pedidos a processar
@@ -107,10 +111,7 @@ TypeContact_order_supplier_external_SHIPPING=Contato de remessa do fornecedor
TypeContact_order_supplier_external_CUSTOMER=Ordem de acompanhamento de contato do fornecedor
Error_OrderNotChecked=Nenhum pedido seleçionado para se faturar
OrderByEMail=E-mail
-PDFEinsteinDescription=Modelo de pedido completo (logo...)
-PDFEratostheneDescription=Modelo de pedido completo (logo...)
PDFEdisonDescription=O modelo simplificado do pedido
-PDFProformaDescription=A proforma fatura completa (logomarca...)
CreateInvoiceForThisCustomer=Faturar pedidos
NoOrdersToInvoice=Nenhum pedido faturavel
CloseProcessedOrdersAutomatically=Classificar como "processados" todos os pedidos selecionados.
@@ -120,5 +121,21 @@ OrderCreated=Seus pedidos foram criados
OrderFail=Um erro ocorreu durante a criação de seus pedidos
CreateOrders=Criar pedidos
ToBillSeveralOrderSelectCustomer=Para criar uma nota fiscal para várias encomendas, clique primeiro no cliente, em seguida, escolha "%s".
+OptionToSetOrderBilledNotEnabled=A opção do módulo "Fluxo de Trabalho", para definir pedido como 'Faturado' automaticamente quando a fatura é validada, não está ativada; Portanto, defina o status dos pedidos para 'Faturado' manualmente após geração da fatura.
IfValidateInvoiceIsNoOrderStayUnbilled=Se a validação da fatura for 'Não', a ordem permanecerá no status 'Não faturado' até que a fatura seja validada.
+CloseReceivedSupplierOrdersAutomatically=Feche o pedido para o status "%s" automaticamente se todos os produtos forem recebidos.
SetShippingMode=Definir modo de envio
+WithReceptionFinished=Com recepção finalizada
+StatusSupplierOrderCanceledShort=Cancelada
+StatusSupplierOrderDraftShort=Minuta
+StatusSupplierOrderSentShort=Em andamento
+StatusSupplierOrderSent=Entrega encaminhada
+StatusSupplierOrderOnProcessShort=Pedido
+StatusSupplierOrderToProcessShort=A processar
+StatusSupplierOrderReceivedPartiallyShort=Recebido Parcialmente
+StatusSupplierOrderCanceled=Cancelada
+StatusSupplierOrderDraft=Minuta (requer confirmação)
+StatusSupplierOrderOnProcess=Pedido - Aguardando Recebimento
+StatusSupplierOrderOnProcessWithValidation=Ordenada - recepção Standby ou validação
+StatusSupplierOrderReceivedPartially=Recebido Parcialmente
+StatusSupplierOrderReceivedAll=Todos os produtos recebidos
diff --git a/htdocs/langs/pt_BR/other.lang b/htdocs/langs/pt_BR/other.lang
index 17c78abc4dc..434fd4bde09 100644
--- a/htdocs/langs/pt_BR/other.lang
+++ b/htdocs/langs/pt_BR/other.lang
@@ -68,7 +68,6 @@ DemoFundation=Administração de Membros de uma associação
DemoFundation2=Administração de Membros e tesouraria de uma associação
DemoCompanyServiceOnly=Venda de servico somente para Empresa ou Freelance
DemoCompanyShopWithCashDesk=Administração de uma loja com Caixa
-DemoCompanyProductAndStocks=Empresa vendendo produtos com a loja
DemoCompanyAll=Empresa com multiplas atividades (todos os principais modulos)
ClosedBy=Encerrado por %s
CreatedById=Id usuario que criou
@@ -165,7 +164,6 @@ LibraryUsed=Biblioteca usada
ExportableDatas=dados exportáveis
NoExportableData=não existe dados exportáveis (sem módulos com dados exportáveis gastodos, necessitam de permissões)
WebsiteSetup=Configuração do módulo website
-WEBSITE_IMAGEDesc=Caminho relativo da mídia de imagem. Você pode mantê-lo vazio, pois isso raramente é usado (ele pode ser usado pelo conteúdo dinâmico para mostrar uma visualização de uma lista de postagens do blog).
LinesToImport=Linhas para importar
MemoryUsage=Uso de memória
RequestDuration=Duração do pedido
diff --git a/htdocs/langs/pt_BR/products.lang b/htdocs/langs/pt_BR/products.lang
index 0beaa035c72..9bb27c28df9 100644
--- a/htdocs/langs/pt_BR/products.lang
+++ b/htdocs/langs/pt_BR/products.lang
@@ -108,6 +108,7 @@ ShortLabel=Etiqueta curta
set=conjunto
se=conjunto
meter=medidor
+unitT=t
ProductCodeModel=Modelo de ref. de produto
ServiceCodeModel=Modelo de ref. de serviço
AlwaysUseNewPrice=Usar sempre preço atual do produto/serviço
@@ -117,6 +118,7 @@ PriceByQuantityRange=Intervalo de quantidade
MultipriceRules=Regras de preços por segmento
PercentVariationOver=%% variação sobre %s
PercentDiscountOver=%% disconto sobre %s
+VariantRefExample=Exemplos: COR, TAMANHO
VariantLabelExample=Exemplos: Cor, Tamanho
ProductsMultiPrice=Produtos e preços de cada segmento
ProductsOrServiceMultiPrice=Preços de Clientes (de produtos ou serviços, multi-preços)
diff --git a/htdocs/langs/pt_BR/projects.lang b/htdocs/langs/pt_BR/projects.lang
index 0e22f1da168..ccb427b1c44 100644
--- a/htdocs/langs/pt_BR/projects.lang
+++ b/htdocs/langs/pt_BR/projects.lang
@@ -32,6 +32,9 @@ NbOfTasks=N°. de tarefas
TimeSpent=Dispêndio de tempo
TimeSpentByUser=Tempo gasto por usuário
TimesSpent=Dispêndio de tempo
+TaskId=ID da tarefa
+RefTask=Tarefa ref.
+LabelTask=Rótulo tarefa
TaskTimeSpent=Dispêndio de tempo com tarefas
TaskTimeUser=Usuário
NewTimeSpent=Dispêndio de tempo
@@ -45,8 +48,11 @@ Activities=Tarefas/atividades
MyActivities=Minhas Tarefas/Atividades
MyProjectsArea=Minha Área de projetos
ProgressDeclared=o progresso declarado
+TaskProgressSummary=Progresso tarefa
+CurentlyOpenedTasks=Tarefas atualmente abertas
ProgressCalculated=calculado do progresso
GoToListOfTimeConsumed=Ir para a lista de dispêndios de tempo
+GoToListOfTasks=Exibir como lista
ListOrdersAssociatedProject=Lista de pedidos de vendas relacionadas ao projeto
ListSupplierOrdersAssociatedProject=Lista de ordens de compra relacionadas ao projeto
ListSupplierInvoicesAssociatedProject=Lista de faturas do fornec. relacionadas ao projeto
@@ -131,4 +137,3 @@ TimeSpentForInvoice=Dispêndio de tempo
OneLinePerUser=Uma linha por usuário
ServiceToUseOnLines=Serviço para usar em linhas
InvoiceGeneratedFromTimeSpent=Fatura %s foi gerada a partir do tempo gasto no projeto
-ProjectBillTimeDescription=Verifique se você inseriu o quadro de horários nas tarefas do projeto E planeja gerar fatura(s) do quadro de horários para faturar o cliente do projeto (não verifique se planeja criar fatura que não seja baseada em quadros de horas inseridos).
diff --git a/htdocs/langs/pt_BR/propal.lang b/htdocs/langs/pt_BR/propal.lang
index 85ae18405e8..7ebc052ea98 100644
--- a/htdocs/langs/pt_BR/propal.lang
+++ b/htdocs/langs/pt_BR/propal.lang
@@ -16,12 +16,11 @@ AllPropals=Todos Os Orçamentos
SearchAProposal=Procurar um Orçamento
NoProposal=Sem propostas
ProposalsStatistics=Estatísticas de Orçamentos
-AmountOfProposalsByMonthHT=Valor por mês (sem Imposto)
+AmountOfProposalsByMonthHT=Valor por mês (sem imposto)
NbOfProposals=Número Orçamentos
ShowPropal=Ver Orçamento
PropalsOpened=Aberto
PropalStatusDraft=Rascunho (a Confirmar)
-PropalStatusValidated=Validado (a proposta esta em aberto)
PropalStatusSigned=Assinado (A Faturar)
PropalStatusNotSigned=Sem Assinar (Encerrado)
PropalStatusValidatedShort=Validado (aberto)
@@ -56,10 +55,9 @@ TypeContact_propal_internal_SALESREPFOLL=Representante seguindo a proposta
TypeContact_propal_external_BILLING=Contato da fatura cliente
TypeContact_propal_external_CUSTOMER=Contato cliente seguindo a proposta
TypeContact_propal_external_SHIPPING=Contato do cliente para entrega
-DocModelAzurDescription=Modelo de orçamento completo (logo...)
-DocModelCyanDescription=Modelo de orçamento completo (logo...)
DefaultModelPropalCreate=Criaçao modelo padrao
DefaultModelPropalToBill=Modelo padrao no fechamento da proposta comercial ( a se faturar)
DefaultModelPropalClosed=Modelo padrao no fechamento da proposta comercial (nao faturada)
ProposalCustomerSignature=Aceite por escrito, carimbo da empresa, data e assinatura
ProposalsStatisticsSuppliers=Estatísticas de propostas de fornecedores
+CaseFollowedBy=Caso seguido por
diff --git a/htdocs/langs/pt_BR/stocks.lang b/htdocs/langs/pt_BR/stocks.lang
index a5c62d1785b..f4611cd42ed 100644
--- a/htdocs/langs/pt_BR/stocks.lang
+++ b/htdocs/langs/pt_BR/stocks.lang
@@ -96,6 +96,7 @@ MovementLabel=Rótulo de movimentação
InventoryCode=Código da movimentação ou do inventário
IsInPackage=Contido em pacote
WarehouseAllowNegativeTransfer=O estoque pode ser negativo
+qtyToTranferLotIsNotEnough=Você não tem estoque suficiente, para este número de lote, em seu armazém de origem e sua configuração não permite estoques negativos (quantidade para o produto '%s' com lote '%s' é %s no armazém '%s').
MovementCorrectStock=Da correção para o produto %s
MovementTransferStock=Da transferência de produto %s em um outro armazém
InventoryCodeShort=Código mov./inv.
@@ -119,3 +120,4 @@ StockSupportServicesDesc=Por padrão, você pode estocar somente produtos do tip
InventoryForASpecificWarehouse=Inventário para um armazém específico
InventoryForASpecificProduct=Inventário para um produto específico
StockIsRequiredToChooseWhichLotToUse=É necessário estoque para escolher qual lote usar
+ForceTo=Forçar a
diff --git a/htdocs/langs/pt_BR/supplier_proposal.lang b/htdocs/langs/pt_BR/supplier_proposal.lang
index 48358a9496e..32b020535af 100644
--- a/htdocs/langs/pt_BR/supplier_proposal.lang
+++ b/htdocs/langs/pt_BR/supplier_proposal.lang
@@ -31,7 +31,7 @@ SupplierProposalStatusDraftShort=Minuta
SupplierProposalStatusClosedShort=Encerrada
SupplierProposalStatusSignedShort=Aceita
SupplierProposalStatusNotSignedShort=Recusada
-CopyAskFrom=Criar uma solicitação de preço copiando uma solicitação existente
+CopyAskFrom=Criar solicitação de preço, copiando uma solicitação existente
CreateEmptyAsk=Criar solicitação em branco
ConfirmCloneAsk=Você tem certeza que deseja clonar a solicitação de preço %s?
ConfirmReOpenAsk=Você tem certeza que deseja abrir novamente a solicitação de preço %s?
diff --git a/htdocs/langs/pt_BR/ticket.lang b/htdocs/langs/pt_BR/ticket.lang
index cdc78939ff2..e212daf4ff0 100644
--- a/htdocs/langs/pt_BR/ticket.lang
+++ b/htdocs/langs/pt_BR/ticket.lang
@@ -101,10 +101,12 @@ TicketLogMesgReadBy=Tíquete %s lido por %s
TicketLogAssignedTo=Tíquete %s assinalado para %s
TicketLogPropertyChanged=Tíquete %s modificado : Classificação passou de %s para %s
TicketLogClosedBy=íquete %s encerrado por %s
-TicketLogReopen=Tíquete %s re-aberto
+TicketLogReopen=Ticket %s reaberto
TicketSystem=Ticket System
ShowListTicketWithTrackId=Exibir lista de bilhetes do ID da faixa
YourTicketSuccessfullySaved=O ticket foi salvo com sucesso!
+MesgInfosPublicTicketCreatedWithTrackId=Um novo ticket foi criado com ID %s e Ref. %s.
+TicketNewEmailSubject=Confirmação de criação de ticket - Ref %s
TicketNewEmailBody=Este é um e-mail automático para confirmar que você registrou um novo ticket.
TicketNewEmailBodyCustomer=Este é um e-mail automático para confirmar que um novo ticket acaba de ser criado na sua conta.
TicketNewEmailBodyInfosTrackId=Número de acompanhamento do tíquete : %s
@@ -115,6 +117,7 @@ ErrorTicketNotFound=Tíquete com número %s não encontrado
ViewTicket=Visualizar passagem
ViewMyTicketList=Ver minha lista de bilhetes
ErrorEmailMustExistToCreateTicket=Erro : Endereço de e-mail não encontrado em nosso banco de dados
+TicketNewEmailSubjectAdmin=Novo ticket criado - Ref %s
TicketNewEmailBodyAdmin=O ticket acabou de ser criado com a ID #%s, consulte as informações:
TicketPublicInterfaceForbidden=A interface pública dos tickets não foi ativada
ErrorEmailOrTrackingInvalid=Valor ruim para o ID ou o e-mail de rastreamento
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index 1ec1f1cbfcc..b095deb0b70 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -519,7 +519,7 @@ Module25Desc=Sales order management
Module30Name=Faturas
Module30Desc=Gerenciamento de notas fiscais e notas de crédito para clientes. Gerenciamento de notas fiscais e notas de crédito para fornecedores
Module40Name=Fornecedores
-Module40Desc=Vendors and purchase management (purchase orders and billing)
+Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
Module42Name=Registos Debug
Module42Desc=Funções de registo de eventos (ficheiro, registo do sistema, ...). Tais registos, são para fins técnicos/depuração.
Module49Name=Editores
@@ -561,9 +561,9 @@ Module200Desc=Sincronização da diretoria LDAP
Module210Name=PostNuke
Module210Desc=Integração com PostNuke
Module240Name=Exportações de dados
-Module240Desc=Ferramenta para exportação dos dados do Dolibarr
+Module240Desc=Tool to export Dolibarr data (with assistance)
Module250Name=Importação de dados
-Module250Desc=Tool to import data into Dolibarr (with assistants)
+Module250Desc=Tool to import data into Dolibarr (with assistance)
Module310Name=Membros
Module310Desc=Gestão de membros de uma fundação
Module320Name=Feed RSS
@@ -878,7 +878,7 @@ Permission1251=Executar importações em massa de dados externos para a bases de
Permission1321=Exportar faturas, atributos e cobranças de clientes
Permission1322=Reabrir uma fatura paga
Permission1421=Export sales orders and attributes
-Permission2401=Read actions (events or tasks) linked to his user account (if owner of event)
+Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
Permission2411=Consultar ações (eventos ou tarefas) de outros
@@ -1156,7 +1156,7 @@ NoEventOrNoAuditSetup=No security event has been logged. This is normal if Audit
NoEventFoundWithCriteria=Nenhum evento de segurança foi encontrado para este critério de pesquisa.
SeeLocalSendMailSetup=Verifique a configuração local de sendmail
BackupDesc=A complete backup of a Dolibarr installation requires two steps.
-BackupDesc2=Backup the contents of the "documents" directory (%s) containing all uploaded and generated files. This will also include all the dump files generated in Step 1.
+BackupDesc2=Backup the contents of the "documents" directory (%s) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
BackupDesc3=Backup the structure and contents of your database (%s) into a dump file. For this, you can use the following assistant.
BackupDescX=The archived directory should be stored in a secure place.
BackupDescY=A cópia de segurança gerada deve ser armazenada num local seguro.
@@ -1167,6 +1167,7 @@ RestoreDesc3=Restore the database structure and data from a backup dump file int
RestoreMySQL=Importação MySQL
ForcedToByAModule= Esta regra é forçada a a %s, por um módulo ativo
PreviousDumpFiles=Existing backup files
+PreviousArchiveFiles=Existing archive files
WeekStartOnDay=First day of the week
RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
YouMustRunCommandFromCommandLineAfterLoginToUser=Deve executar este comando a partir de uma linha de comandos depois de iniciar a sessão, na linha de comandos, com o utilizador %s ou deve adicionar a opção -W no fim da linha de comando para indicar a palavra-passe %s.
@@ -1248,6 +1249,7 @@ AskForPreferredShippingMethod=Peça o método de envio preferido para terceiros.
FieldEdition=Edição do campo %s
FillThisOnlyIfRequired=Exemplo: +2 (para preencher apenas se existir problemas de desvios de fuso horário)
GetBarCode=Obter código de barras
+NumberingModules=Numbering models
##### Module password generation
PasswordGenerationStandard=Devolve uma palavra-passe gerada pelo algoritmo interno Dolibarr: 8 caracteres no mínimo, contendo números e letras minúsculas.
PasswordGenerationNone=Não sugira uma senha gerada. A senha deve ser digitada manualmente.
@@ -1711,8 +1713,9 @@ ChequeReceiptsNumberingModule=Check Receipts Numbering Module
MultiCompanySetup=Configuração do módulo "Multi-empresa"
##### Suppliers #####
SuppliersSetup=Vendor module setup
-SuppliersCommandModel=Modelo completo do pedido de compra (logotipo ...)
-SuppliersInvoiceModel=Modelo completo de fatura de fornecedor (logotipo ...)
+SuppliersCommandModel=Complete template of Purchase Order
+SuppliersCommandModelMuscadet=Complete template of Purchase Order
+SuppliersInvoiceModel=Complete template of Vendor Invoice
SuppliersInvoiceNumberingModel=Vendor invoices numbering models
IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
##### GeoIPMaxmind #####
@@ -1762,9 +1765,10 @@ ListOfNotificationsPerUser=List of automatic notifications per user*
ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
ListOfFixedNotifications=List of automatic fixed notifications
GoOntoUserCardToAddMore=Vá até a guia "Notificações" de um usuário para adicionar ou remover notificações para usuários
-GoOntoContactCardToAddMore=Vá ao separador "Notificações" de um terceiro para adicionar ou remover as notificações de contactos/endereços
+GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
Threshold=Limite
-BackupDumpWizard=Wizard to build the backup file
+BackupDumpWizard=Wizard to build the database dump file
+BackupZipWizard=Wizard to build the archive of documents directory
SomethingMakeInstallFromWebNotPossible=Instalação do módulo externo não é possível a partir da interface web pelo seguinte motivo:
SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
InstallModuleFromWebHasBeenDisabledByFile=Instalação de um módulo externo da aplicação foi desativada pelo seu administrador. Você deve pedir-lhe para remover o ficheiro %s para permitir esta funcionalidade.
@@ -1953,6 +1957,8 @@ SmallerThan=Smaller than
LargerThan=Larger than
IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
+EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set a value here to use this feature. Note that you must also use a read/write login account.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
EndPointFor=End point for %s : %s
DeleteEmailCollector=Delete email collector
ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang
index 3430473a1bf..7c299e0ffc4 100644
--- a/htdocs/langs/pt_PT/bills.lang
+++ b/htdocs/langs/pt_PT/bills.lang
@@ -416,7 +416,7 @@ PaymentConditionShort14D=14 dias
PaymentCondition14D=14 dias
PaymentConditionShort14DENDMONTH=14 dias do final do mês
PaymentCondition14DENDMONTH=Dentro de 14 dias após o final do mês
-FixAmount=Fixed amount
+FixAmount=Fixed amount - 1 line with label '%s'
VarAmount=Quantidade variável (%% total.)
VarAmountOneLine=Quantidade variável (%% tot.) - 1 linha com o rótulo '%s'
# PaymentType
@@ -512,7 +512,7 @@ RevenueStamp=Selo fiscal
YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
YouMustCreateStandardInvoiceFirstDesc=Você precisa criar uma fatura padrão primeiro e convertê-la em "modelo" para criar uma nova fatura modelo
-PDFCrabeDescription=Modelo de fatura PDF Crabe. Um modelo completo de fatura (modelo recomendado)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template
PDFSpongeDescription=Modelo PDF da fatura Esponja. Um modelo de fatura completo
PDFCrevetteDescription=Modelo PDF da fatura Crevette. Um modelo de fatura completo para faturas de situação
TerreNumRefModelDesc1=Devolve o número com o formato %syymm-nnnn para facturas standard e %syymm-nnnn para notas de crédito em que yy é ano, mm é mês e nnnn é uma sequência sem pausa e sem retorno a 0
diff --git a/htdocs/langs/pt_PT/categories.lang b/htdocs/langs/pt_PT/categories.lang
index 225af9afa1c..94efa736300 100644
--- a/htdocs/langs/pt_PT/categories.lang
+++ b/htdocs/langs/pt_PT/categories.lang
@@ -62,6 +62,7 @@ ContactCategoriesShort=Etiquetas/Catego. de Contactos
AccountsCategoriesShort=Etiquetas/Categorias de contas
ProjectsCategoriesShort=Etiquetas/Categorias de projetos
UsersCategoriesShort=Users tags/categories
+StockCategoriesShort=Warehouse tags/categories
ThisCategoryHasNoProduct=Esta categoria não contem nenhum produto.
ThisCategoryHasNoSupplier=This category does not contain any vendor.
ThisCategoryHasNoCustomer=Esta categoria não contem a nenhum cliente.
@@ -88,3 +89,6 @@ AddProductServiceIntoCategory=Adicioanr o produto/serviço seguinte
ShowCategory=Mostrar etiqueta/categoria
ByDefaultInList=Por predefinição na lista
ChooseCategory=Escolha a categoria
+StocksCategoriesArea=Warehouses Categories Area
+ActionCommCategoriesArea=Events Categories Area
+UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/pt_PT/companies.lang b/htdocs/langs/pt_PT/companies.lang
index e61e35ecb58..f858136653d 100644
--- a/htdocs/langs/pt_PT/companies.lang
+++ b/htdocs/langs/pt_PT/companies.lang
@@ -247,6 +247,12 @@ ProfId3US=-
ProfId4US=-
ProfId5US=-
ProfId6US=-
+ProfId1RO=Prof Id 1 (CUI)
+ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
+ProfId3RO=Prof Id 3 (CAEN)
+ProfId4RO=-
+ProfId5RO=Prof Id 5 (EUID)
+ProfId6RO=-
ProfId1RU=ID Prof. 1 (OGRN)
ProfId2RU=ID Prof. 2 (INN)
ProfId3RU=ID Prof. 3 (KPP)
@@ -339,7 +345,7 @@ MyContacts=Os Meus Contactos
Capital=Capital
CapitalOf=Capital Social de %s
EditCompany=Modificar Empresa
-ThisUserIsNot=Este utilizador não é um potencial cliente, cliente nem fornecedor
+ThisUserIsNot=This user is not a prospect, customer or vendor
VATIntraCheck=Verificar
VATIntraCheckDesc=The VAT ID must include the country prefix. The link %s uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -406,6 +412,13 @@ AllocateCommercial=Atribuído a representante de vendas
Organization=Organismo
FiscalYearInformation=Ano fiscal
FiscalMonthStart=Mês de Inicio do Exercício
+SocialNetworksInformation=Social networks
+SocialNetworksFacebookURL=Facebook URL
+SocialNetworksTwitterURL=Twitter URL
+SocialNetworksLinkedinURL=Linkedin URL
+SocialNetworksInstagramURL=Instagram URL
+SocialNetworksYoutubeURL=Youtube URL
+SocialNetworksGithubURL=Github URL
YouMustAssignUserMailFirst=Você deve criar um email para esse usuário antes de poder adicionar uma notificação por email.
YouMustCreateContactFirst=Para adicionar a funcionalidade de notificações por e-mail, você deve definir contactos com e-mails válidos para o terceiro.
ListSuppliersShort=Lista de Fornecedores
diff --git a/htdocs/langs/pt_PT/compta.lang b/htdocs/langs/pt_PT/compta.lang
index 1605882ed6d..3a29e054498 100644
--- a/htdocs/langs/pt_PT/compta.lang
+++ b/htdocs/langs/pt_PT/compta.lang
@@ -63,7 +63,7 @@ LT2SupplierES=Compras IRPF
LT2CustomerIN=Vendas do SGST
LT2SupplierIN=Compras do SGST
VATCollected=IVA Recuperado
-ToPay=A pagar
+StatusToPay=A pagar
SpecialExpensesArea=Área para todos os pagamentos especiais
SocialContribution=Imposto social ou fiscal
SocialContributions=Impostos sociais ou fiscais
@@ -112,7 +112,7 @@ ShowVatPayment=Ver Pagamentos IVA
TotalToPay=Total a Pagar
BalanceVisibilityDependsOnSortAndFilters=O saldo é visível nesta lista apenas se a tabela estiver classificada como ascendente no %s e filtrada para uma conta bancária
CustomerAccountancyCode=Código de contabilidade do cliente
-SupplierAccountancyCode=vendor accounting code
+SupplierAccountancyCode=Vendor accounting code
CustomerAccountancyCodeShort=Cust. conta. código
SupplierAccountancyCodeShort=Sup. conta. código
AccountNumber=Número de conta
@@ -254,3 +254,4 @@ ByVatRate=Por taxa de imposto de venda
TurnoverbyVatrate=Volume de negócios faturado por taxa de imposto sobre vendas
TurnoverCollectedbyVatrate=Volume de negócios cobrado pela taxa de imposto sobre vendas
PurchasebyVatrate=Compra por taxa de imposto sobre vendas
+LabelToShow=Short label
diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang
index 05a33d9ba6f..1da0be88b84 100644
--- a/htdocs/langs/pt_PT/errors.lang
+++ b/htdocs/langs/pt_PT/errors.lang
@@ -117,7 +117,8 @@ ErrorLoginDoesNotExists=a conta de utilizador de %s não foi encontrado.
ErrorLoginHasNoEmail=Este utilizador não tem e-mail. impossivel continuar.
ErrorBadValueForCode=Valor incorreto para o código de segurança. Tente novamente com um novo valor...
ErrorBothFieldCantBeNegative=Campos %s %s e não pode ser tanto negativo
-ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you want to add a discount line, just create the discount first with link %s on screen and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
+ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
ErrorQtyForCustomerInvoiceCantBeNegative=A quantidade de linha nas faturas do cliente não pode ser negativa
ErrorWebServerUserHasNotPermission=Conta de usuário utilizada para executar %s servidor web não tem permissão para que
ErrorNoActivatedBarcode=Nenhum tipo de código de barras ativado
@@ -224,6 +225,8 @@ ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to
ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
ErrorFieldRequiredForProduct=Field '%s' is required for product %s
+ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
+ErrorAddAtLeastOneLineFirst=Add at least one line first
# Warnings
WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
WarningPasswordSetWithNoAccount=Uma senha foi definida para este membro. No entanto, nenhuma conta de usuário foi criada. Portanto, essa senha é armazenada, mas não pode ser usada para fazer login no Dolibarr. Pode ser usado por um módulo externo / interface, mas se você não precisa definir nenhum login nem senha para um membro, você pode desativar a opção "Gerenciar um login para cada membro" da configuração do módulo de membro. Se você precisar gerenciar um login, mas não precisar de nenhuma senha, poderá manter esse campo vazio para evitar esse aviso. Nota: O email também pode ser usado como um login se o membro estiver vinculado a um usuário.
diff --git a/htdocs/langs/pt_PT/holiday.lang b/htdocs/langs/pt_PT/holiday.lang
index 64624114be9..0d56632330b 100644
--- a/htdocs/langs/pt_PT/holiday.lang
+++ b/htdocs/langs/pt_PT/holiday.lang
@@ -39,8 +39,10 @@ TypeOfLeaveId=Tipo de ID de licença
TypeOfLeaveCode=Tipo de licença (código)
TypeOfLeaveLabel=Tipo de licença (nome)
NbUseDaysCP=Número de dias de férias consumidos
+NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary.
NbUseDaysCPShort=Dias consumidos
NbUseDaysCPShortInMonth=Dias consumidos no mês
+DayIsANonWorkingDay=%s is a non working day
DateStartInMonth=Data de início no mês
DateEndInMonth=Data final no mês
EditCP=Editar
diff --git a/htdocs/langs/pt_PT/install.lang b/htdocs/langs/pt_PT/install.lang
index 112874952cc..275fd048fc6 100644
--- a/htdocs/langs/pt_PT/install.lang
+++ b/htdocs/langs/pt_PT/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=Este PHP suporta o Curl.
PHPSupportCalendar=This PHP supports calendars extensions.
PHPSupportUTF8=Este PHP suporta funções UTF8.
PHPSupportIntl=This PHP supports Intl functions.
+PHPSupport=This PHP supports %s functions.
PHPMemoryOK=A sua memória máxima da sessão PHP está definida para %s. Isto deverá ser suficiente.
PHPMemoryTooLow=Sua memória de sessão do PHP max está configurada para %s b> bytes. Isso é muito baixo. Altere seu php.ini b> para definir o parâmetro memory_limit b> para pelo menos %s b> bytes.
Recheck=Clique aqui para um teste mais detalhado
@@ -25,6 +26,7 @@ ErrorPHPDoesNotSupportCurl=A sua instalação PHP não suporta Curl.
ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
ErrorPHPDoesNotSupportUTF8=Sua instalação do PHP não suporta funções UTF8. Dolibarr não pode funcionar corretamente. Resolva isso antes de instalar o Dolibarr.
ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
+ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
ErrorDirDoesNotExists=A diretoria %s não existe.
ErrorGoBackAndCorrectParameters=Volte e verifique / corrija os parâmetros.
ErrorWrongValueForParameter=Pode ter inserido um valor incorreto para o parâmetro ' %s'.
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index de32abe3ff5..ae404b19a0e 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -471,7 +471,7 @@ TotalDuration=Duração total
Summary=Resumo
DolibarrStateBoard=Database Statistics
DolibarrWorkBoard=Open Items
-NoOpenedElementToProcess=Nenhum elemento aberto para processar
+NoOpenedElementToProcess=No open element to process
Available=Disponível
NotYetAvailable=Ainda não disponivel
NotAvailable=Não disponivel
@@ -1005,7 +1005,7 @@ ContactDefault_contrat=Contrato
ContactDefault_facture=Fatura
ContactDefault_fichinter=Intervenção
ContactDefault_invoice_supplier=Supplier Invoice
-ContactDefault_order_supplier=Supplier Order
+ContactDefault_order_supplier=Purchase Order
ContactDefault_project=Projeto
ContactDefault_project_task=Tarefa
ContactDefault_propal=Orçamento
@@ -1013,3 +1013,6 @@ ContactDefault_supplier_proposal=Supplier Proposal
ContactDefault_ticketsup=Ticket
ContactAddedAutomatically=Contact added from contact thirdparty roles
More=More
+ShowDetails=Show details
+CustomReports=Custom reports
+SelectYourGraphOptionsFirst=Select your graph options to build a graph
diff --git a/htdocs/langs/pt_PT/modulebuilder.lang b/htdocs/langs/pt_PT/modulebuilder.lang
index afbe2b3fdea..bd33fe6a97c 100644
--- a/htdocs/langs/pt_PT/modulebuilder.lang
+++ b/htdocs/langs/pt_PT/modulebuilder.lang
@@ -83,7 +83,7 @@ ListOfDictionariesEntries=List of dictionaries entries
ListOfPermissionsDefined=Lista de permissões definidas
SeeExamples=Veja exemplos aqui
EnabledDesc=Condição para ter este campo ativo (Exemplos: 1 ou $ conf-> global-> MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:
preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
($user->rights->holiday->define_holiday ? 1 : 0)
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:
preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
($user->rights->holiday->define_holiday ? 1 : 0)
IsAMeasureDesc=O valor do campo pode ser acumulado para obter um total na lista? (Exemplos: 1 ou 0)
SearchAllDesc=O campo é usado para fazer uma pesquisa a partir da ferramenta de pesquisa rápida? (Exemplos: 1 ou 0)
SpecDefDesc=Digite aqui toda a documentação que você deseja fornecer com seu módulo que ainda não está definido por outras guias. Você pode usar .md ou melhor, a rica sintaxe .asciidoc.
@@ -135,3 +135,5 @@ CSSClass=CSS Class
NotEditable=Not editable
ForeignKey=Foreign key
TypeOfFieldsHelp=Type of fields:
varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
+AsciiToHtmlConverter=Ascii to HTML converter
+AsciiToPdfConverter=Ascii to PDF converter
diff --git a/htdocs/langs/pt_PT/mrp.lang b/htdocs/langs/pt_PT/mrp.lang
index ad612115268..11c6915a25c 100644
--- a/htdocs/langs/pt_PT/mrp.lang
+++ b/htdocs/langs/pt_PT/mrp.lang
@@ -54,12 +54,15 @@ ToConsume=To consume
ToProduce=To produce
QtyAlreadyConsumed=Qty already consumed
QtyAlreadyProduced=Qty already produced
+ConsumeOrProduce=Consume or Produce
ConsumeAndProduceAll=Consume and Produce All
Manufactured=Manufactured
TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
ForAQuantityOf1=For a quantity to produce of 1
ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
-ProductionForRefAndDate=Production %s - %s
+ProductionForRef=Production of %s
AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
NoStockChangeOnServices=No stock change on services
+ProductQtyToConsumeByMO=Product quantity still to consume by open MO
+ProductQtyToProduceByMO=Product quentity still to produce by open MO
diff --git a/htdocs/langs/pt_PT/orders.lang b/htdocs/langs/pt_PT/orders.lang
index 8175116508d..2fc1142e59e 100644
--- a/htdocs/langs/pt_PT/orders.lang
+++ b/htdocs/langs/pt_PT/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Data da encomenda
OrderDateShort=Data de encomenda
OrderToProcess=Encomenda a processar
NewOrder=Nova encomenda
+NewOrderSupplier=New Purchase Order
ToOrder=Efetuar encomenda
MakeOrder=Efetuar encomenda
SupplierOrder=Ordem de compra
@@ -25,6 +26,8 @@ OrdersToBill=Sales orders delivered
OrdersInProcess=Sales orders in process
OrdersToProcess=Sales orders to process
SuppliersOrdersToProcess=Encomendas a fornecedores por processar
+SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
+AwaitingReception=Awaiting reception
StatusOrderCanceledShort=Anulado
StatusOrderDraftShort=Rascunho
StatusOrderValidatedShort=Validado
@@ -37,7 +40,6 @@ StatusOrderDeliveredShort=Entregue
StatusOrderToBillShort=Entregue
StatusOrderApprovedShort=Aprovado
StatusOrderRefusedShort=Reprovado
-StatusOrderBilledShort=Faturado
StatusOrderToProcessShort=Por processar
StatusOrderReceivedPartiallyShort=Parcialmente recebido
StatusOrderReceivedAllShort=Produtos recebidos
@@ -50,7 +52,6 @@ StatusOrderProcessed=Processado
StatusOrderToBill=Entregue
StatusOrderApproved=Aprovado
StatusOrderRefused=Recusada
-StatusOrderBilled=Faturado
StatusOrderReceivedPartially=Parcialmente recebido
StatusOrderReceivedAll=Todos os produtos foram recebidos
ShippingExist=Um existe um envio
@@ -68,8 +69,9 @@ ValidateOrder=Validar encomenda
UnvalidateOrder=Invalidar encomenda
DeleteOrder=Eliminar encomenda
CancelOrder=Cancelar encomenda
-OrderReopened= A encomenda %s foi reaberta
+OrderReopened= Order %s re-open
AddOrder=Criar encomenda
+AddPurchaseOrder=Create purchase order
AddToDraftOrders=Adicionar à encomenda rascunho
ShowOrder=Mostrar encomenda
OrdersOpened=Encomendas por processar
@@ -139,10 +141,10 @@ OrderByEMail=Email
OrderByWWW=On-line
OrderByPhone=Telefone
# Documents models
-PDFEinsteinDescription=Modelo de encomenda completo (logo...)
-PDFEratostheneDescription=Modelo de encomenda completo (logo...)
+PDFEinsteinDescription=A complete order model
+PDFEratostheneDescription=A complete order model
PDFEdisonDescription=Um modelo simples de encomenda
-PDFProformaDescription=Uma fatura proforma completa (logo…)
+PDFProformaDescription=A complete Proforma invoice template
CreateInvoiceForThisCustomer=Faturar encomendas
NoOrdersToInvoice=Sem encomendas por faturar
CloseProcessedOrdersAutomatically=Classificar todas as encomendas selecionadas como "Processadas".
@@ -152,7 +154,35 @@ OrderCreated=As suas encomendas foram criadas
OrderFail=Ocorreu um erro durante a criação das suas encomendas
CreateOrders=Criar encomendas
ToBillSeveralOrderSelectCustomer=Para criar uma fatura para várias encomendas, clique primeiro num cliente e depois selecione "%s".
-OptionToSetOrderBilledNotEnabled=A opção (do módulo Fluxo de Trabalho) para definir encomendas como 'Faturada' automaticamente quando a fatura é validada, está desativada. Como tal terá que definir o estado da encomenda como 'Faturada' manualmente.
+OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
IfValidateInvoiceIsNoOrderStayUnbilled=Se a validação da fatura for 'Não', a encomenda permanecerá no estado 'Não faturada' até que a fatura seja validada.
-CloseReceivedSupplierOrdersAutomatically=Fechar encomenda para "%s" automaticamente, se todos os produtos tiverem sido recebidos.
+CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
SetShippingMode=Defina o método de expedição
+WithReceptionFinished=With reception finished
+#### supplier orders status
+StatusSupplierOrderCanceledShort=Cancelado
+StatusSupplierOrderDraftShort=Esboço, projeto
+StatusSupplierOrderValidatedShort=Validado
+StatusSupplierOrderSentShort=Em processo
+StatusSupplierOrderSent=Expedição em processo
+StatusSupplierOrderOnProcessShort=Encomendado
+StatusSupplierOrderProcessedShort=Processado
+StatusSupplierOrderDelivered=Entregue
+StatusSupplierOrderDeliveredShort=Entregue
+StatusSupplierOrderToBillShort=Entregue
+StatusSupplierOrderApprovedShort=Aprovado
+StatusSupplierOrderRefusedShort=Recusada
+StatusSupplierOrderToProcessShort=Por processar
+StatusSupplierOrderReceivedPartiallyShort=Parcialmente recebido
+StatusSupplierOrderReceivedAllShort=Produtos recebidos
+StatusSupplierOrderCanceled=Cancelado
+StatusSupplierOrderDraft=Rascunho (necessita de ser validada)
+StatusSupplierOrderValidated=Validado
+StatusSupplierOrderOnProcess=Encomendado - Aguarda a receção
+StatusSupplierOrderOnProcessWithValidation=Encomendada - Aguarde a receção e validação
+StatusSupplierOrderProcessed=Processado
+StatusSupplierOrderToBill=Entregue
+StatusSupplierOrderApproved=Aprovado
+StatusSupplierOrderRefused=Recusada
+StatusSupplierOrderReceivedPartially=Parcialmente recebido
+StatusSupplierOrderReceivedAll=Todos os produtos foram recebidos
diff --git a/htdocs/langs/pt_PT/other.lang b/htdocs/langs/pt_PT/other.lang
index 7f04d3d18f1..174eaddc866 100644
--- a/htdocs/langs/pt_PT/other.lang
+++ b/htdocs/langs/pt_PT/other.lang
@@ -24,7 +24,7 @@ MessageOK=Message on the return page for a validated payment
MessageKO=Message on the return page for a canceled payment
ContentOfDirectoryIsNotEmpty=O diretório não está vazio.
DeleteAlsoContentRecursively=Marque para excluir todo o conteúdo recursivamente
-
+PoweredBy=Powered by
YearOfInvoice=Ano da data da fatura
PreviousYearOfInvoice=Ano anterior à data da fatura
NextYearOfInvoice=Ano seguinte à data da fatura
@@ -104,7 +104,8 @@ DemoFundation=Gestão de Membros de uma associação
DemoFundation2=Gestão de Membros e tesouraria de uma associação
DemoCompanyServiceOnly=Empresa ou serviço de freelancer apenas
DemoCompanyShopWithCashDesk=Gestão de uma loja com Caixa
-DemoCompanyProductAndStocks=Empresa que vende produtos com uma loja
+DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
+DemoCompanyManufacturing=Company manufacturing products
DemoCompanyAll=Empresa com múltiplas atividades (todos os módulos principais)
CreatedBy=Criado por %s
ModifiedBy=Modificado por %s
@@ -267,7 +268,7 @@ WEBSITE_PAGEURL=URL da página
WEBSITE_TITLE=Título
WEBSITE_DESCRIPTION=Descrição
WEBSITE_IMAGE=Imagem
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITEKEY__ in the path if path depends on website name.
WEBSITE_KEYWORDS=Palavras-chave
LinesToImport=Linhas a importar
diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang
index 773aa185b48..399cedaacd5 100644
--- a/htdocs/langs/pt_PT/projects.lang
+++ b/htdocs/langs/pt_PT/projects.lang
@@ -77,7 +77,7 @@ MyProjectsArea=A Minha Área de Projetos
DurationEffective=Duração Efetiva
ProgressDeclared=Progresso declarado
TaskProgressSummary=Task progress
-CurentlyOpenedTasks=Curently opened tasks
+CurentlyOpenedTasks=Curently open tasks
TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
ProgressCalculated=Progresso calculado
@@ -249,9 +249,13 @@ TimeSpentForInvoice=Tempos Dispendidos
OneLinePerUser=One line per user
ServiceToUseOnLines=Service to use on lines
InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets).
+ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
ProjectFollowOpportunity=Follow opportunity
ProjectFollowTasks=Follow tasks
UsageOpportunity=Usage: Opportunity
UsageTasks=Usage: Tasks
UsageBillTimeShort=Usage: Bill time
+InvoiceToUse=Draft invoice to use
+NewInvoice=Nova fatura
+OneLinePerTask=One line per task
+OneLinePerPeriod=One line per period
diff --git a/htdocs/langs/pt_PT/propal.lang b/htdocs/langs/pt_PT/propal.lang
index e5b82735538..cfd6e71ca77 100644
--- a/htdocs/langs/pt_PT/propal.lang
+++ b/htdocs/langs/pt_PT/propal.lang
@@ -28,7 +28,7 @@ ShowPropal=Mostrar orçamento
PropalsDraft=Rascunho
PropalsOpened=Aberta
PropalStatusDraft=Rascunho (precisa de ser validado)
-PropalStatusValidated=Validado (o orçamento está aberto)
+PropalStatusValidated=Validado (Orçamento Aberto)
PropalStatusSigned=Assinado (por faturar)
PropalStatusNotSigned=Sem Assinar (Fechado)
PropalStatusBilled=Faturado
@@ -76,10 +76,11 @@ TypeContact_propal_external_BILLING=Contacto na fatura do cliente
TypeContact_propal_external_CUSTOMER=Contacto do cliente que dá seguimento ao orçamento
TypeContact_propal_external_SHIPPING=Customer contact for delivery
# Document models
-DocModelAzurDescription=Um modelo de orçamento completo (logótipo...)
-DocModelCyanDescription=Um modelo de orçamento completo (logótipo...)
+DocModelAzurDescription=A complete proposal model
+DocModelCyanDescription=A complete proposal model
DefaultModelPropalCreate=Criação do modelo padrão
DefaultModelPropalToBill=Modelo predefinido quando fechar um orçamento (a faturar)
DefaultModelPropalClosed=Modelo predefinido quando fechar um orçamento (não faturado)
ProposalCustomerSignature=Aceitação escrita, carimbo da empresa, data e assinatura
ProposalsStatisticsSuppliers=Vendor proposals statistics
+CaseFollowedBy=Case followed by
diff --git a/htdocs/langs/pt_PT/stocks.lang b/htdocs/langs/pt_PT/stocks.lang
index 880aa6f0b6c..2cf191876b7 100644
--- a/htdocs/langs/pt_PT/stocks.lang
+++ b/htdocs/langs/pt_PT/stocks.lang
@@ -143,6 +143,7 @@ InventoryCode=Movimento ou código do inventário
IsInPackage=Contido no pacote
WarehouseAllowNegativeTransfer=O stock pode ser negativo
qtyToTranferIsNotEnough=Você não tem estoque suficiente do seu depósito de origem e sua configuração não permite estoques negativos.
+qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
ShowWarehouse=Mostrar armazém
MovementCorrectStock=Correção de estoque para o produto %s
MovementTransferStock=Transferência de estoque do produto %s para outro depósito
@@ -192,6 +193,7 @@ TheoricalQty=Teorique qty
TheoricalValue=Teorique qty
LastPA=Último BP
CurrentPA=PB de Curadoria
+RecordedQty=Recorded Qty
RealQty=Qtd Real
RealValue=Valor real
RegulatedQty=Quantidade Registada
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index a8ac1a76024..fff99a2d6cd 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -519,7 +519,7 @@ Module25Desc=Gestionarea comenzilor de vânzări
Module30Name=Facturi
Module30Desc=Gestionarea facturilor și a bonurilor de credit pentru clienți. Gestionarea facturilor și a bonurilor de credit pentru furnizori
Module40Name=Furnizori
-Module40Desc=Gestionarea furnizorilor și achizițiilor (comenzi de achiziție și facturare)
+Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
Module42Name=Depanați jurnalele
Module42Desc=Facilități de înregistrare (fișier, syslog, ...). Aceste jurnale sunt pentru scopuri tehnice / de depanare.
Module49Name=Editori
@@ -561,9 +561,9 @@ Module200Desc=Sincronizarea directorului LDAP
Module210Name=PostNuke
Module210Desc=PostNuke integrare
Module240Name=Exportul de date
-Module240Desc=Instrument pentru a exporta date Dolibarr (cu asistenți)
+Module240Desc=Tool to export Dolibarr data (with assistance)
Module250Name=Date importurile
-Module250Desc=Instrument pentru a importa date în Dolibarr (cu asistenți)
+Module250Desc=Tool to import data into Dolibarr (with assistance)
Module310Name=Membri
Module310Desc=Fundatia membri de management
Module320Name=Feed RSS
@@ -878,7 +878,7 @@ Permission1251=Run masa importurile de date externe în baza de date (date de sa
Permission1321=Export client facturi, atribute şi plăţile
Permission1322=Redeschide o factură plătită
Permission1421=Exportaţi comenzi de vânzări și atribute
-Permission2401=Read actions (events or tasks) linked to his user account (if owner of event)
+Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
Permission2411=Citeşte acţiuni (evenimente sau sarcini) ale altor persoane
@@ -1156,7 +1156,7 @@ NoEventOrNoAuditSetup=Nu a fost înregistrat niciun eveniment de securitate. Ace
NoEventFoundWithCriteria=Nu a fost găsit niciun eveniment de securitate pentru aceste criterii de căutare.
SeeLocalSendMailSetup=Vedeţi-vă locale sendmail setup
BackupDesc=O completă copie de rezervă a unei instalări Dolibarr necesită doi pași.
-BackupDesc2=Faceţi o copie de rezervă a conținutului directorului "documente" ( %s ) conținând toate fișierele încărcate și generate. Aceasta va include, de asemenea, toate fișierele de memorie generate în etapa 1.
+BackupDesc2=Backup the contents of the "documents" directory (%s) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
BackupDesc3=Faceţi o copie de rezervă la structura și conținutul bazei de date ( %s ) într-un cos de gunoi. Pentru aceasta, puteți utiliza următorul asistent
BackupDescX=Directorul arhivat trebuie să fie stocat într-un loc sigur.
BackupDescY=Generate de fişier de imagine memorie trebuie să fie depozitate într-un loc sigur.
@@ -1167,6 +1167,7 @@ RestoreDesc3=Restaurați structura bazei de date și datele dintr-un fișier de
RestoreMySQL=MySQL import
ForcedToByAModule= Această regulă este obligat la %s către un activat modulul
PreviousDumpFiles=Fișiere de rezervă existente
+PreviousArchiveFiles=Existing archive files
WeekStartOnDay=Prima zi a săptămânii
RunningUpdateProcessMayBeRequired=Rularea procesului de actualizare pare a fi necesară (versiunea programului %s diferă de versiunea bazei de date %s)
YouMustRunCommandFromCommandLineAfterLoginToUser=Trebuie să rulaţi această comandă de la linia de comandă, după login la un raft cu %s utilizator.
@@ -1248,6 +1249,7 @@ AskForPreferredShippingMethod=Solicitați o metodă de transport preferată pent
FieldEdition=Editarea campului %s
FillThisOnlyIfRequired=Exemplu: +2 (completați numai dacă problemele decalajjului fusului orar sunt cunoscute)
GetBarCode=Dă codbare
+NumberingModules=Numbering models
##### Module password generation
PasswordGenerationStandard=Întoarceţi-vă o parolă generate în funcţie de interne Dolibarr algoritmul: 8 caractere care conţin numere în comun şi în caractere minuscule.
PasswordGenerationNone=Nu sugerați o parolă generată. Parola trebuie introdusă manual.
@@ -1711,8 +1713,9 @@ ChequeReceiptsNumberingModule=Modul de verificare a numerotării chitanţelor
MultiCompanySetup=Multi-societate modul setup
##### Suppliers #####
SuppliersSetup=Configurarea modulului furnizor
-SuppliersCommandModel=Șablonul complet al comenzii de achiziție (logo ...)
-SuppliersInvoiceModel=Șablonul complet al facturii furnizorului (logo ...)
+SuppliersCommandModel=Complete template of Purchase Order
+SuppliersCommandModelMuscadet=Complete template of Purchase Order
+SuppliersInvoiceModel=Complete template of Vendor Invoice
SuppliersInvoiceNumberingModel=Modele de numerotare a facturilor furnizorilor
IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
##### GeoIPMaxmind #####
@@ -1762,9 +1765,10 @@ ListOfNotificationsPerUser=List of automatic notifications per user*
ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
ListOfFixedNotifications=List of automatic fixed notifications
GoOntoUserCardToAddMore=Accesați fila "Notificări" a unui mesaj de utilizator pentru a adăuga sau elimina notificările pentru utilizatori
-GoOntoContactCardToAddMore=Mergeți în fila "Notificări" a unei terțe părți pentru a adăuga sau elimina notificări pentru contacte / adrese
+GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
Threshold=Prag
-BackupDumpWizard=Expertul pentru a construi copie de siguranţă
+BackupDumpWizard=Wizard to build the database dump file
+BackupZipWizard=Wizard to build the archive of documents directory
SomethingMakeInstallFromWebNotPossible=Instalarea modulului extern nu este posibilă din interfața web din următorul motiv:
SomethingMakeInstallFromWebNotPossible2=Din acest motiv, procesul de actualizare descris aici este un proces manual pe care numai un utilizator privilegiat poate face.
InstallModuleFromWebHasBeenDisabledByFile=Instalarea modulului extern din aplicație a fost dezactivată de administratorul dvs. Trebuie să-l rogi să-l elimine fişierul %s pentru a permite această caracteristică
@@ -1953,6 +1957,8 @@ SmallerThan=Smaller than
LargerThan=Larger than
IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
+EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set a value here to use this feature. Note that you must also use a read/write login account.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
EndPointFor=End point for %s : %s
DeleteEmailCollector=Delete email collector
ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
index b0ea808b6b2..c36f542b6a1 100644
--- a/htdocs/langs/ro_RO/bills.lang
+++ b/htdocs/langs/ro_RO/bills.lang
@@ -416,7 +416,7 @@ PaymentConditionShort14D=14 zile
PaymentCondition14D=14 zile
PaymentConditionShort14DENDMONTH=14 zile de la sfârșitul lunii
PaymentCondition14DENDMONTH=În termen de 14 zile de la sfârșitul lunii
-FixAmount=Valoare fixă
+FixAmount=Fixed amount - 1 line with label '%s'
VarAmount=Valoare variabilă (%% tot.)
VarAmountOneLine=Cantitate variabilă (%% tot.) - 1 rând cu eticheta "%s"
# PaymentType
@@ -512,7 +512,7 @@ RevenueStamp=Timbru fiscal
YouMustCreateInvoiceFromThird=Această opțiune este disponibilă numai când creați o factură din fila "Client" al unui terț
YouMustCreateInvoiceFromSupplierThird=Această opțiune este disponibilă numai când creați o factură din fila "Furnizor" al unui terț
YouMustCreateStandardInvoiceFirstDesc=Intai se poate crea o factură standard si se transforma in model pentru a avea un nou model de factura.
-PDFCrabeDescription=Şablon PDF Factura Crabe . Un șablon factură complet (format recomandat)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template
PDFSpongeDescription=Factura PDF șablon Burete. Un șablon complet de factură
PDFCrevetteDescription=Model factură PDF Crevette. Un model complet pentru factura de situaţie
TerreNumRefModelDesc1=Returnează numărul sub forma %syymm-nnnn pentru facturile standard și %syymm-nnnn pentru notele de credit unde yy este anul, mm este luna și nnnn este o secvenţă fără nici o pauză și fără revenire la 0
diff --git a/htdocs/langs/ro_RO/categories.lang b/htdocs/langs/ro_RO/categories.lang
index 5415657f781..88e5ce67e52 100644
--- a/htdocs/langs/ro_RO/categories.lang
+++ b/htdocs/langs/ro_RO/categories.lang
@@ -62,6 +62,7 @@ ContactCategoriesShort=Tag-uri / Categorii Contacte
AccountsCategoriesShort=Tag-uri / Categorii Contabilitate
ProjectsCategoriesShort=Etichete / categorii de proiecte
UsersCategoriesShort=Etichetele/categoriile utilizatorilor
+StockCategoriesShort=Warehouse tags/categories
ThisCategoryHasNoProduct=Această categorie nu conţine nici un produs.
ThisCategoryHasNoSupplier=Această categorie nu conține niciun furnizor.
ThisCategoryHasNoCustomer=Această categorie nu conţine nici un client.
@@ -83,8 +84,11 @@ DeleteFromCat=Elimina din tag-uri / categoriii
ExtraFieldsCategories=Atribute complementare
CategoriesSetup=Configurare Tag-uri / categorii
CategorieRecursiv=Link automat către tag /categoria părinte
-CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
+CategorieRecursivHelp=Dacă opțiunea este activă, când adăugați un produs într-o subcategorie, produsul va fi adăugat și în categoria părinte
AddProductServiceIntoCategory=Add următoarele produseservicii
ShowCategory=Arată tag / categorie
ByDefaultInList=Implicit în listă
ChooseCategory=Alegeți categoria
+StocksCategoriesArea=Warehouses Categories Area
+ActionCommCategoriesArea=Events Categories Area
+UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/ro_RO/companies.lang b/htdocs/langs/ro_RO/companies.lang
index 1cd5142e960..0e79c39d744 100644
--- a/htdocs/langs/ro_RO/companies.lang
+++ b/htdocs/langs/ro_RO/companies.lang
@@ -247,6 +247,12 @@ ProfId3US=-
ProfId4US=-
ProfId5US=-
ProfId6US=-
+ProfId1RO=Prof Id 1 (CUI)
+ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
+ProfId3RO=Prof Id 3 (CAEN)
+ProfId4RO=-
+ProfId5RO=Prof Id 5 (EUID)
+ProfId6RO=-
ProfId1RU=Prof. Id-ul 1 (OGRN)
ProfId2RU=Prof. Id-ul 2 (DCI)
ProfId3RU=Prof. ID 3 (KPP)
@@ -339,7 +345,7 @@ MyContacts=Contactele mele
Capital=Capital
CapitalOf=Capital de % s
EditCompany=Modifică societate
-ThisUserIsNot=Acest utilizator nu este o perspectivă nici client nici vânzător
+ThisUserIsNot=This user is not a prospect, customer or vendor
VATIntraCheck=Verifică
VATIntraCheckDesc=ID-ul de TVA trebuie să includă prefixul țării. Linkul %s utilizează serviciul european de verificare a TVA-ului (VIES), care necesită acces la internet de pe serverul Dolibarr.
VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -406,6 +412,13 @@ AllocateCommercial=Asociat la reprezentant vânzări
Organization=Instituția
FiscalYearInformation=An fiscal
FiscalMonthStart=Luna de început a anului fiscal
+SocialNetworksInformation=Social networks
+SocialNetworksFacebookURL=Facebook URL
+SocialNetworksTwitterURL=Twitter URL
+SocialNetworksLinkedinURL=Linkedin URL
+SocialNetworksInstagramURL=Instagram URL
+SocialNetworksYoutubeURL=Youtube URL
+SocialNetworksGithubURL=Github URL
YouMustAssignUserMailFirst=Trebuie să creați un e-mail pentru acest utilizator înainte de a putea adăuga o notificare prin e-mail.
YouMustCreateContactFirst=Pentru a putea adaugă notificări pe email, este necesară definirea unor contacte pentru terţi cu adresa de email validă
ListSuppliersShort=Lista furnizori
diff --git a/htdocs/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang
index c3893612189..3793fa21abe 100644
--- a/htdocs/langs/ro_RO/compta.lang
+++ b/htdocs/langs/ro_RO/compta.lang
@@ -254,3 +254,4 @@ ByVatRate=Prin cota de impozit pe vânzare
TurnoverbyVatrate=Cifra de afaceri facturată prin rata impozitului pe vânzare
TurnoverCollectedbyVatrate=Cifra de afaceri colectată prin rata impozitului pe vânzare
PurchasebyVatrate=Cumpărare prin rata de impozitare a vânzării
+LabelToShow=Etichetă scurta
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index d17f35b0ddb..1ff9cfbf23e 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -117,7 +117,8 @@ ErrorLoginDoesNotExists=User login cu %s nu a putut fi găsit.
ErrorLoginHasNoEmail=Acest utilizator nu are nici o adresa de e-mail. Procesul de anulată.
ErrorBadValueForCode=Bad valoare tipuri de cod. Încercaţi din nou cu o nouă valoare ...
ErrorBothFieldCantBeNegative=%s Domenii şi %s nu poate fi atât negativ
-ErrorFieldCantBeNegativeOnInvoice=Câmpul %s nu poate fi negativ pentru acest tip de factură. Dacă doriți să adăugați o linie de reducere, creați primul discount cu link-ul %s pe ecran și aplicați-l pe factură. De asemenea, puteți solicita administratorului dvs. să setați opțiunea FACTURE_ENABLE_NEGATIVE_LINES la 1 pentru a permite vechiul comportament.
+ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
ErrorQtyForCustomerInvoiceCantBeNegative=Cantitatea pentru linia unei facturi client nu poate fi negativa.
ErrorWebServerUserHasNotPermission=Contul de utilizator %s folosite pentru a executa serverul de web nu are permisiunea, pentru că
ErrorNoActivatedBarcode=Niciun tip de coduri de bare activat
@@ -224,6 +225,8 @@ ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to
ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
ErrorFieldRequiredForProduct=Field '%s' is required for product %s
+ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
+ErrorAddAtLeastOneLineFirst=Add at least one line first
# Warnings
WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
WarningPasswordSetWithNoAccount= O parolă a fost trimisă către acest membru. Cu toate acestea, nu a fost creat nici un cont de utilizator. Astfel, această parolă este stocată, dar nu poate fi utilizată pentru autentificare. Poate fi utilizată de către un modul / interfată externă, dar dacă nu aveți nevoie să definiți un utilizator sau o parolă pentru un membru, puteți dezactiva opțiunea "Gestionați o conectare pentru fiecare membru" din modul de configurare membri. În cazul în care aveți nevoie să gestionați un utilizator, dar nu este nevoie de parolă, aveți posibilitatea să păstrați acest câmp gol pentru a evita acest avertisment. Notă: Adresa de e-mail poate fi utilizată ca utilizator la autentificare, în cazul în care membrul este legat de un utilizator.
diff --git a/htdocs/langs/ro_RO/holiday.lang b/htdocs/langs/ro_RO/holiday.lang
index 679a984bb62..1cd9b14a7c9 100644
--- a/htdocs/langs/ro_RO/holiday.lang
+++ b/htdocs/langs/ro_RO/holiday.lang
@@ -39,8 +39,10 @@ TypeOfLeaveId=Tipul de ID de concediu
TypeOfLeaveCode=Tipul codului de concediu
TypeOfLeaveLabel=Tipul tabelului de concediu
NbUseDaysCP=Numărul de zile de concediu consumate
+NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary.
NbUseDaysCPShort=Zile consumate
NbUseDaysCPShortInMonth=Zilele consumate în lună
+DayIsANonWorkingDay=%s is a non working day
DateStartInMonth=Data de începere în lună
DateEndInMonth=Data de încheiere în lună
EditCP=Editare
diff --git a/htdocs/langs/ro_RO/install.lang b/htdocs/langs/ro_RO/install.lang
index 81172075759..5b22f86f0ea 100644
--- a/htdocs/langs/ro_RO/install.lang
+++ b/htdocs/langs/ro_RO/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=Acest PHP suportă Curl.
PHPSupportCalendar=This PHP supports calendars extensions.
PHPSupportUTF8=Acest PHP suportă functiile UTF8.
PHPSupportIntl=This PHP supports Intl functions.
+PHPSupport=This PHP supports %s functions.
PHPMemoryOK=PHP max memorie sesiune este setată la %s. Acest lucru ar trebui să fie suficient.
PHPMemoryTooLow=Memoria sesiunii PHP max este setată la %s octeți. Această valoare este prea mică. Schimbați-vă php.ini pentru a seta parametrul memory_limit la cel puțin %s octeți.
Recheck=Faceți clic aici pentru un test mai detaliat
@@ -25,6 +26,7 @@ ErrorPHPDoesNotSupportCurl=Instalarea dvs. PHP nu suportă Curl.
ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
ErrorPHPDoesNotSupportUTF8=Instalarea dvs. de PHP nu suportă funcții UTF8. Dolibarr nu poate funcționa corect. Rezolvați acest lucru înainte de a instala Dolibarr.
ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
+ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
ErrorDirDoesNotExists=Directorul %s nu există.
ErrorGoBackAndCorrectParameters=Întoarceți-vă și verificați/corectați parametrii.
ErrorWrongValueForParameter=Este posibil să fi tastat greşit o valoare pentru parametrul "%s".
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index 2be9880a6ef..439cd9439ef 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -471,7 +471,7 @@ TotalDuration=Durată totală
Summary=Sumar
DolibarrStateBoard=Statisticile bazei de date
DolibarrWorkBoard=Deschideți Elementele
-NoOpenedElementToProcess=Niciun element deschis pentru procesare
+NoOpenedElementToProcess=No open element to process
Available=Disponibil
NotYetAvailable=Nedisponibil încă
NotAvailable=Nedisponibil
@@ -1005,7 +1005,7 @@ ContactDefault_contrat=Contract
ContactDefault_facture=Factură
ContactDefault_fichinter=Intervenţie
ContactDefault_invoice_supplier=Supplier Invoice
-ContactDefault_order_supplier=Supplier Order
+ContactDefault_order_supplier=Purchase Order
ContactDefault_project=Proiect
ContactDefault_project_task=Task
ContactDefault_propal=Ofertă
@@ -1013,3 +1013,6 @@ ContactDefault_supplier_proposal=Supplier Proposal
ContactDefault_ticketsup=Tichet
ContactAddedAutomatically=Contact added from contact thirdparty roles
More=More
+ShowDetails=Show details
+CustomReports=Custom reports
+SelectYourGraphOptionsFirst=Select your graph options to build a graph
diff --git a/htdocs/langs/ro_RO/modulebuilder.lang b/htdocs/langs/ro_RO/modulebuilder.lang
index 9018cb61ea7..b139a9ef3f6 100644
--- a/htdocs/langs/ro_RO/modulebuilder.lang
+++ b/htdocs/langs/ro_RO/modulebuilder.lang
@@ -83,7 +83,7 @@ ListOfDictionariesEntries=List of dictionaries entries
ListOfPermissionsDefined=Lista permisiunilor definite
SeeExamples=Vedeți aici exemple
EnabledDesc=Condiție de activare a acestui câmp (Exemple: 1 sau $ conf-> global-> MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:
preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
($user->rights->holiday->define_holiday ? 1 : 0)
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:
preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
($user->rights->holiday->define_holiday ? 1 : 0)
IsAMeasureDesc=Poate fi cumulata valoarea câmpului pentru a obține un total în listă? (Exemple: 1 sau 0)
SearchAllDesc=Este câmpul folosit pentru a face o căutare din instrumentul de căutare rapidă? (Exemple: 1 sau 0)
SpecDefDesc=Introduceți aici toată documentația pe care doriți să o furnizați împreună cu modulul, care nu este deja definită de alte file. Puteți utiliza .md sau mai bine, sintaxa bogată .asciidoc.
@@ -135,3 +135,5 @@ CSSClass=CSS Class
NotEditable=Not editable
ForeignKey=Foreign key
TypeOfFieldsHelp=Type of fields:
varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
+AsciiToHtmlConverter=Ascii to HTML converter
+AsciiToPdfConverter=Ascii to PDF converter
diff --git a/htdocs/langs/ro_RO/mrp.lang b/htdocs/langs/ro_RO/mrp.lang
index 4864851a037..4b7c49fd3ab 100644
--- a/htdocs/langs/ro_RO/mrp.lang
+++ b/htdocs/langs/ro_RO/mrp.lang
@@ -54,12 +54,15 @@ ToConsume=To consume
ToProduce=To produce
QtyAlreadyConsumed=Qty already consumed
QtyAlreadyProduced=Qty already produced
+ConsumeOrProduce=Consume or Produce
ConsumeAndProduceAll=Consume and Produce All
Manufactured=Manufactured
TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
ForAQuantityOf1=For a quantity to produce of 1
ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
-ProductionForRefAndDate=Production %s - %s
+ProductionForRef=Production of %s
AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
NoStockChangeOnServices=No stock change on services
+ProductQtyToConsumeByMO=Product quantity still to consume by open MO
+ProductQtyToProduceByMO=Product quentity still to produce by open MO
diff --git a/htdocs/langs/ro_RO/orders.lang b/htdocs/langs/ro_RO/orders.lang
index 9ec7d26d34e..0ae0c5eba4d 100644
--- a/htdocs/langs/ro_RO/orders.lang
+++ b/htdocs/langs/ro_RO/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Dată Comandă
OrderDateShort=Data comandă
OrderToProcess=Comandă de procesat
NewOrder=Comandă nouă
+NewOrderSupplier=New Purchase Order
ToOrder=Plasează comanda
MakeOrder=Plasează comanda
SupplierOrder=Comandă de achiziție
@@ -25,6 +26,8 @@ OrdersToBill=Comenzi de vânzări livrate
OrdersInProcess=Comenzi de vânzări în curs
OrdersToProcess=Comenzile de vânzări pentru procesare
SuppliersOrdersToProcess=Comenzile de cumpărare pentru procesare
+SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
+AwaitingReception=Awaiting reception
StatusOrderCanceledShort=Anulata
StatusOrderDraftShort=Schiţă
StatusOrderValidatedShort=Validat
@@ -37,7 +40,6 @@ StatusOrderDeliveredShort=Livrate
StatusOrderToBillShort=Livrate
StatusOrderApprovedShort=Aprobată
StatusOrderRefusedShort=Refuzată
-StatusOrderBilledShort=Facturat
StatusOrderToProcessShort=De procesat
StatusOrderReceivedPartiallyShort=Parţial recepţionată
StatusOrderReceivedAllShort=Produse primite
@@ -50,7 +52,6 @@ StatusOrderProcessed=Procesată
StatusOrderToBill=Livrată
StatusOrderApproved=Aprobată
StatusOrderRefused=Refuzată
-StatusOrderBilled=Facturat
StatusOrderReceivedPartially=Parţial recepţionată
StatusOrderReceivedAll=Toate produsele primite
ShippingExist=O expediţie există
@@ -68,8 +69,9 @@ ValidateOrder=Validează comanda
UnvalidateOrder=Devalidează comandă
DeleteOrder=Şterge comada
CancelOrder=Anulează comanda
-OrderReopened= Comanda %s redeschisa
+OrderReopened= Order %s re-open
AddOrder=Crează comanda
+AddPurchaseOrder=Create purchase order
AddToDraftOrders=Adaugă la comanda schiţă
ShowOrder=Afişează comanda
OrdersOpened=Comenzi de procesat
@@ -139,10 +141,10 @@ OrderByEMail=Email
OrderByWWW=Online
OrderByPhone=Telefon
# Documents models
-PDFEinsteinDescription=Un model complet pentru (logo. ..)
-PDFEratostheneDescription=Un model complet pentru (logo. ..)
+PDFEinsteinDescription=A complete order model
+PDFEratostheneDescription=A complete order model
PDFEdisonDescription=Un simplu pentru model
-PDFProformaDescription=De completat factura proformă (logo-ul ...)
+PDFProformaDescription=A complete Proforma invoice template
CreateInvoiceForThisCustomer=Comenzi facturate
NoOrdersToInvoice=Nicio comandă facturabilă
CloseProcessedOrdersAutomatically=Clasează automat "Procesat" toate comenzile selectate.
@@ -152,7 +154,35 @@ OrderCreated=Comenzile dvs au fost generate
OrderFail=O eroare întâlnită în timpul creării comezilor dvs
CreateOrders=Crează Comenzi
ToBillSeveralOrderSelectCustomer=Pentru crearea unei facturi pentru câteva comenzi, click mai întâi pe client apoi alege "%s".
-OptionToSetOrderBilledNotEnabled=Opțiunea (din modulul fluxul de lucru) pentru a seta ordinea la "facturat" automat atunci când factura este validată este dezactivată, deci va trebui să setați starea comenzii la "facturat" manual.
+OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
IfValidateInvoiceIsNoOrderStayUnbilled=Dacă validarea facturilor este "Nu", comanda va rămâne în starea "Nefacturată" până când factura va fi validată.
-CloseReceivedSupplierOrdersAutomatically=Închideți ordinea automată a "%s" dacă toate produsele sunt primite.
+CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
SetShippingMode=Setați modul de expediere
+WithReceptionFinished=With reception finished
+#### supplier orders status
+StatusSupplierOrderCanceledShort=Anulata
+StatusSupplierOrderDraftShort=Draft
+StatusSupplierOrderValidatedShort=Validată
+StatusSupplierOrderSentShort=În curs
+StatusSupplierOrderSent=Livrare în curs
+StatusSupplierOrderOnProcessShort=Comandat
+StatusSupplierOrderProcessedShort=Procesate
+StatusSupplierOrderDelivered=Livrate
+StatusSupplierOrderDeliveredShort=Livrate
+StatusSupplierOrderToBillShort=Livrate
+StatusSupplierOrderApprovedShort=Aprobat
+StatusSupplierOrderRefusedShort=Refuzat
+StatusSupplierOrderToProcessShort=De procesat
+StatusSupplierOrderReceivedPartiallyShort=Parţial recepţionată
+StatusSupplierOrderReceivedAllShort=Produse primite
+StatusSupplierOrderCanceled=Anulata
+StatusSupplierOrderDraft=Schiţă (cererea tebuie validata)
+StatusSupplierOrderValidated=Validată
+StatusSupplierOrderOnProcess=Comandate - receptie standby
+StatusSupplierOrderOnProcessWithValidation=Comandat - recepție în așteptare sau validare
+StatusSupplierOrderProcessed=Procesate
+StatusSupplierOrderToBill=Livrate
+StatusSupplierOrderApproved=Aprobat
+StatusSupplierOrderRefused=Refuzat
+StatusSupplierOrderReceivedPartially=Parţial recepţionată
+StatusSupplierOrderReceivedAll=Toate produsele primite
diff --git a/htdocs/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang
index c4d2415cab9..f7a1ac3af74 100644
--- a/htdocs/langs/ro_RO/other.lang
+++ b/htdocs/langs/ro_RO/other.lang
@@ -24,7 +24,7 @@ MessageOK=Mesaj pe pagina de returnare pentru o plată validată
MessageKO=Mesaj de pe pagina de returnare pentru o plată anulată
ContentOfDirectoryIsNotEmpty=Conținutul acestui director nu este gol.
DeleteAlsoContentRecursively=Verificați pentru a șterge tot conținutul recursiv
-
+PoweredBy=Powered by
YearOfInvoice=Anul datei facturii
PreviousYearOfInvoice=Anul anterior datei facturii
NextYearOfInvoice=Anul următor datei facturii
@@ -104,7 +104,8 @@ DemoFundation=Gestionare membrii unui Fundaţia
DemoFundation2=Gestionaţi membri şi un cont bancar de Fundaţia
DemoCompanyServiceOnly=Companie sau independent cu vânzare de servicii
DemoCompanyShopWithCashDesk=Gestionaţi-un magazin cu o casă de marcat
-DemoCompanyProductAndStocks=Companie care vinde produse cu un magazin
+DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
+DemoCompanyManufacturing=Company manufacturing products
DemoCompanyAll=Companie cu activități multiple (toate modulele principale)
CreatedBy=Creat de %s
ModifiedBy=Modificat de %s
@@ -267,7 +268,7 @@ WEBSITE_PAGEURL=URL pagina
WEBSITE_TITLE=Titlu
WEBSITE_DESCRIPTION=Descriere
WEBSITE_IMAGE=Imagine
-WEBSITE_IMAGEDesc=Calea relativă a imaginii media. Puteți păstra acest lucru gol, deoarece acesta este rar folosit (acesta poate fi utilizat de conținut dinamic pentru a afișa o previzualizare a unei liste de postări pe blog).
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITEKEY__ in the path if path depends on website name.
WEBSITE_KEYWORDS=Cuvânt cheie
LinesToImport=Linii de import
diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang
index 65b058e2152..752642cf504 100644
--- a/htdocs/langs/ro_RO/projects.lang
+++ b/htdocs/langs/ro_RO/projects.lang
@@ -77,7 +77,7 @@ MyProjectsArea=Zona proiectelor mele
DurationEffective=Durata efectivă
ProgressDeclared=Progres calculat
TaskProgressSummary=Task progress
-CurentlyOpenedTasks=Curently opened tasks
+CurentlyOpenedTasks=Curently open tasks
TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
ProgressCalculated=Progres calculat
@@ -249,9 +249,13 @@ TimeSpentForInvoice=Timpi consumaţi
OneLinePerUser=O linie pe utilizator
ServiceToUseOnLines=Serviciu de utilizare pe linii
InvoiceGeneratedFromTimeSpent=Factura %s a fost generată din timpul petrecut pe proiect
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets).
+ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
ProjectFollowOpportunity=Follow opportunity
ProjectFollowTasks=Follow tasks
UsageOpportunity=Usage: Opportunity
UsageTasks=Usage: Tasks
UsageBillTimeShort=Usage: Bill time
+InvoiceToUse=Draft invoice to use
+NewInvoice=Factură nouă
+OneLinePerTask=One line per task
+OneLinePerPeriod=One line per period
diff --git a/htdocs/langs/ro_RO/propal.lang b/htdocs/langs/ro_RO/propal.lang
index 4fefacdb600..b14143848f3 100644
--- a/htdocs/langs/ro_RO/propal.lang
+++ b/htdocs/langs/ro_RO/propal.lang
@@ -28,7 +28,7 @@ ShowPropal=Afişează oferta
PropalsDraft=Schiţe
PropalsOpened=Deschis
PropalStatusDraft=Schiţă (de validat)
-PropalStatusValidated=Validat (propunerea este deschisă)
+PropalStatusValidated=Validată (ofertă deschisă)
PropalStatusSigned=Semnată (de facturat)
PropalStatusNotSigned=Nesemnată (inchisă)
PropalStatusBilled=Facturată
@@ -76,10 +76,11 @@ TypeContact_propal_external_BILLING=Contact client facturare propunere
TypeContact_propal_external_CUSTOMER=Contact client urmărire ofertă
TypeContact_propal_external_SHIPPING=Contactul clientului pentru livrare
# Document models
-DocModelAzurDescription=Model de ofertă comercială completă (logo. ..)
-DocModelCyanDescription=Model de ofertă comercială completă (logo. ..)
+DocModelAzurDescription=A complete proposal model
+DocModelCyanDescription=A complete proposal model
DefaultModelPropalCreate=Crează model implicit
DefaultModelPropalToBill=Model implicit la închiderea unei oferte comerciale (de facturat)
DefaultModelPropalClosed=Model implicit la închiderea unei oferte comerciale (nefacturat)
ProposalCustomerSignature=Acceptarea scrisă, ștampila companiei, data și semnătura
ProposalsStatisticsSuppliers=Statistici privind propunerile furnizorilor
+CaseFollowedBy=Case followed by
diff --git a/htdocs/langs/ro_RO/stocks.lang b/htdocs/langs/ro_RO/stocks.lang
index d4b56f97086..041ccf99dbe 100644
--- a/htdocs/langs/ro_RO/stocks.lang
+++ b/htdocs/langs/ro_RO/stocks.lang
@@ -143,6 +143,7 @@ InventoryCode=Codul de inventar sau transfer
IsInPackage=Continute in pachet
WarehouseAllowNegativeTransfer=Stocul poate fi negativ
qtyToTranferIsNotEnough=Nu aveți suficiente stocuri din depozitul sursă și configurația dvs. nu permite stocuri negative.
+qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
ShowWarehouse=Arată depozit
MovementCorrectStock=Corecția stocului pentru produsul%s
MovementTransferStock=Transfer stoc al produsului %s in alt depozit
@@ -192,6 +193,7 @@ TheoricalQty=Cantitate teoretică
TheoricalValue=Cantitate teoretică
LastPA=Ultimul BP
CurrentPA=BP Curent
+RecordedQty=Recorded Qty
RealQty=Cantitate reală
RealValue=Valoare reală
RegulatedQty=Cantitate reglementată
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index cc3e93598a2..2fb1d9ca98f 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -519,7 +519,7 @@ Module25Desc=Управление заказами на продажу
Module30Name=Счета-фактуры
Module30Desc=Управление счетами и кредитными авизо для клиентов. Управление счетами и кредитными авизо для поставщиков
Module40Name=Поставщики
-Module40Desc=Поставщики и управление закупками (заказы на покупку и выставление счетов)
+Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
Module42Name=Отчет об ошибках
Module42Desc=Средства регистрации (file, syslog, ...). Такие журналы предназначены для технических/отладочных целей.
Module49Name=Редакторы
@@ -561,9 +561,9 @@ Module200Desc=Синхронизация каталогов LDAP
Module210Name=PostNuke
Module210Desc=Интергация с PostNuke
Module240Name=Экспорт данных
-Module240Desc=Инструмент для экспорта данных Dolibarr (с ассистентами)
+Module240Desc=Tool to export Dolibarr data (with assistance)
Module250Name=Импорт данных
-Module250Desc=Инструмент для импорта данных в Dolibarr (с помощниками)
+Module250Desc=Tool to import data into Dolibarr (with assistance)
Module310Name=Участники
Module310Desc=Управление участниками фонда
Module320Name=RSS-канал
@@ -878,7 +878,7 @@ Permission1251=Запуск массового импорта внешних д
Permission1321=Экспорт клиентом счета-фактуры, качества и платежей
Permission1322=Повторно открыть оплаченный счет
Permission1421=Экспорт заказов на продажу и атрибутов
-Permission2401=Read actions (events or tasks) linked to his user account (if owner of event)
+Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
Permission2411=Просмотреть действия (события или задачи), других
@@ -1156,7 +1156,7 @@ NoEventOrNoAuditSetup=Событие безопасности не было за
NoEventFoundWithCriteria=Для этого критерия поиска событие безопасности не найдено.
SeeLocalSendMailSetup=См. вашей локальной настройки Sendmail
BackupDesc=Полное резервное копирование установки Dolibarr требует двух шагов.
-BackupDesc2=Резервное копирование содержимого каталога «documents» ( %s ), содержащего все загруженные и сгенерированные файлы. Это также будет включать все файлы дампа, сгенерированные на шаге 1.
+BackupDesc2=Backup the contents of the "documents" directory (%s) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
BackupDesc3=Резервное копирование структуры и содержимого вашей базы данных (%s ) в файл дампа. Для этого вы можете использовать следующий помощник.
BackupDescX=Архивный каталог должен храниться в безопасном месте.
BackupDescY=Генерируемый файла дампа следует хранить в надежном месте.
@@ -1167,6 +1167,7 @@ RestoreDesc3=Восстановить структуру базы данных
RestoreMySQL=Иvпорт MySQL
ForcedToByAModule= Это правило принудительно активируется модулем %s.
PreviousDumpFiles=Существующие файлы резервных копий
+PreviousArchiveFiles=Existing archive files
WeekStartOnDay=Первый день недели
RunningUpdateProcessMayBeRequired=Похоже требуется запуск процесса обновления (версия программы %s отличается от версии базы данных %s)
YouMustRunCommandFromCommandLineAfterLoginToUser=Вы должны запустить эту команду из командной строки после Войти в оболочку с пользователем %s.
@@ -1248,6 +1249,7 @@ AskForPreferredShippingMethod=Запросить предпочтительны
FieldEdition=Редакция поля %s
FillThisOnlyIfRequired=Например, +2 (заполняйте это поле только тогда, когда ваш часовой пояс отличается от того, который используется на сервере)
GetBarCode=Получить штрих-код
+NumberingModules=Numbering models
##### Module password generation
PasswordGenerationStandard=Возврат пароля, полученных в соответствии с внутренними Dolibarr алгоритма: 8 символов, содержащих общие цифры и символы в нижнем регистре.
PasswordGenerationNone=Не предлагать сгенерированный пароль. Пароль должен быть введен вручную.
@@ -1711,8 +1713,9 @@ ChequeReceiptsNumberingModule=Модуль Проверки чеков
MultiCompanySetup=Настройка модуля Корпорация
##### Suppliers #####
SuppliersSetup=Настройка модуля Поставщика
-SuppliersCommandModel=Complete template of purchase order (logo...)
-SuppliersInvoiceModel=Полный шаблон счета-фактуры поставщика (логотип ...)
+SuppliersCommandModel=Complete template of Purchase Order
+SuppliersCommandModelMuscadet=Complete template of Purchase Order
+SuppliersInvoiceModel=Complete template of Vendor Invoice
SuppliersInvoiceNumberingModel=Vendor invoices numbering models
IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
##### GeoIPMaxmind #####
@@ -1762,9 +1765,10 @@ ListOfNotificationsPerUser=List of automatic notifications per user*
ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
ListOfFixedNotifications=List of automatic fixed notifications
GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Перейдите на вкладку «Уведомления» третьей стороны, чтобы добавлять или удалять уведомления для контактов/адресов
+GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
Threshold=Порог
-BackupDumpWizard=Wizard to build the backup file
+BackupDumpWizard=Wizard to build the database dump file
+BackupZipWizard=Wizard to build the archive of documents directory
SomethingMakeInstallFromWebNotPossible=Установка внешних модулей через веб-интерфейс не возможна по следующей причине:
SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
InstallModuleFromWebHasBeenDisabledByFile=Установка внешних модулей из приложения отключена вашим администратором. Вы должны попросить его удалить файл %s, чтобы использовать эту функцию.
@@ -1953,6 +1957,8 @@ SmallerThan=Smaller than
LargerThan=Larger than
IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
+EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set a value here to use this feature. Note that you must also use a read/write login account.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
EndPointFor=End point for %s : %s
DeleteEmailCollector=Delete email collector
ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
diff --git a/htdocs/langs/ru_RU/bills.lang b/htdocs/langs/ru_RU/bills.lang
index 44b6a3c3a64..285bca049bf 100644
--- a/htdocs/langs/ru_RU/bills.lang
+++ b/htdocs/langs/ru_RU/bills.lang
@@ -416,7 +416,7 @@ PaymentConditionShort14D=14 days
PaymentCondition14D=14 days
PaymentConditionShort14DENDMONTH=14 days of month-end
PaymentCondition14DENDMONTH=Within 14 days following the end of the month
-FixAmount=Fixed amount
+FixAmount=Fixed amount - 1 line with label '%s'
VarAmount=Произвольное значение (%% от суммы)
VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
# PaymentType
@@ -512,7 +512,7 @@ RevenueStamp=Штамп о уплате налогов
YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Шаблон Счета-фактуры Crabe. Полный шаблон (вспомогательные опции НДС, скидки, условия платежей, логотип и т.д. ..)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template
PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
TerreNumRefModelDesc1=Функция возвращает номер в формате %syymm-nnnn для стандартных счетов и %syymm-nnnn для кредитных авизо, где yy год, mm месяц и nnnn является непрерывной последовательностью и не возвращает 0
diff --git a/htdocs/langs/ru_RU/categories.lang b/htdocs/langs/ru_RU/categories.lang
index 1b29f114966..c5b8112cb2c 100644
--- a/htdocs/langs/ru_RU/categories.lang
+++ b/htdocs/langs/ru_RU/categories.lang
@@ -62,6 +62,7 @@ ContactCategoriesShort=Теги/категории контактов
AccountsCategoriesShort=Accounts tags/categories
ProjectsCategoriesShort=Теги/категории Проектов
UsersCategoriesShort=Теги/категории пользователей
+StockCategoriesShort=Warehouse tags/categories
ThisCategoryHasNoProduct=В этой категории нет товаров.
ThisCategoryHasNoSupplier=В этой категории нет ни одного поставщика.
ThisCategoryHasNoCustomer=В этой категории нет покупателей.
@@ -88,3 +89,6 @@ AddProductServiceIntoCategory=Добавить следующий товар/у
ShowCategory=Показать тег/категорию
ByDefaultInList=By default in list
ChooseCategory=Выберите категорию
+StocksCategoriesArea=Warehouses Categories Area
+ActionCommCategoriesArea=Events Categories Area
+UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/ru_RU/companies.lang b/htdocs/langs/ru_RU/companies.lang
index c33b5053c41..2b688e7cb51 100644
--- a/htdocs/langs/ru_RU/companies.lang
+++ b/htdocs/langs/ru_RU/companies.lang
@@ -247,6 +247,12 @@ ProfId3US=-
ProfId4US=-
ProfId5US=-
ProfId6US=-
+ProfId1RO=Prof Id 1 (CUI)
+ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
+ProfId3RO=Prof Id 3 (CAEN)
+ProfId4RO=-
+ProfId5RO=Prof Id 5 (EUID)
+ProfId6RO=-
ProfId1RU=Prof Id 1 (ОГРН)
ProfId2RU=Prof Id 2 (ИНН)
ProfId3RU=Prof Id 3 (КПП)
@@ -339,7 +345,7 @@ MyContacts=Мои контакты
Capital=Капитал
CapitalOf=Столица %s
EditCompany=Изменить компанию
-ThisUserIsNot=Этот пользователь не является перспективой, клиентом и поставщиком
+ThisUserIsNot=This user is not a prospect, customer or vendor
VATIntraCheck=Проверить
VATIntraCheckDesc=Идентификатор НДС должен включать префикс страны. Ссылка %s использует европейскую службу проверки НДС (VIES), для которой требуется доступ в Интернет с сервера Dolibarr.
VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -406,6 +412,13 @@ AllocateCommercial=Назначить торгового представите
Organization=Организация
FiscalYearInformation=Финансовый год
FiscalMonthStart=Первый месяц финансового года
+SocialNetworksInformation=Social networks
+SocialNetworksFacebookURL=Facebook URL
+SocialNetworksTwitterURL=Twitter URL
+SocialNetworksLinkedinURL=Linkedin URL
+SocialNetworksInstagramURL=Instagram URL
+SocialNetworksYoutubeURL=Youtube URL
+SocialNetworksGithubURL=Github URL
YouMustAssignUserMailFirst=Вы должны создать адрес электронной почты для этого пользователя, прежде чем сможете добавить уведомление по электронной почте.
YouMustCreateContactFirst=Для добавления электронных уведомлений вы должны сначала указать действующий email контрагента
ListSuppliersShort=Список Поставщиков
diff --git a/htdocs/langs/ru_RU/compta.lang b/htdocs/langs/ru_RU/compta.lang
index bb264b10e93..1123381eec9 100644
--- a/htdocs/langs/ru_RU/compta.lang
+++ b/htdocs/langs/ru_RU/compta.lang
@@ -63,7 +63,7 @@ LT2SupplierES=IRPF покупки
LT2CustomerIN=SGST sales
LT2SupplierIN=SGST purchases
VATCollected=НДС собрали
-ToPay=Для оплаты
+StatusToPay=Для оплаты
SpecialExpensesArea=Раздел для всех специальных платежей
SocialContribution=Social or fiscal tax
SocialContributions=Social or fiscal taxes
@@ -112,7 +112,7 @@ ShowVatPayment=Показать оплате НДС
TotalToPay=Всего к оплате
BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=vendor accounting code
+SupplierAccountancyCode=Vendor accounting code
CustomerAccountancyCodeShort=Cust. account. code
SupplierAccountancyCodeShort=Sup. account. code
AccountNumber=Номер счета
@@ -254,3 +254,4 @@ ByVatRate=By sale tax rate
TurnoverbyVatrate=Turnover invoiced by sale tax rate
TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
PurchasebyVatrate=Purchase by sale tax rate
+LabelToShow=Короткая метка
diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang
index cb96c8ee6ce..7851abaac02 100644
--- a/htdocs/langs/ru_RU/errors.lang
+++ b/htdocs/langs/ru_RU/errors.lang
@@ -117,7 +117,8 @@ ErrorLoginDoesNotExists=Пользователь с логином %s н
ErrorLoginHasNoEmail=Этот пользователь не имеет адреса электронной почты. Процесс прерван.
ErrorBadValueForCode=Плохо значения типов кода. Попробуйте еще раз с новой стоимости ...
ErrorBothFieldCantBeNegative=Поля %s и %s не может быть и отрицательным
-ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you want to add a discount line, just create the discount first with link %s on screen and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
+ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
ErrorQtyForCustomerInvoiceCantBeNegative=Количество строк в счетах клиента не может быть отрицательным
ErrorWebServerUserHasNotPermission=Учетная запись пользователя %s используется для выполнения веб-сервер не имеет разрешения для этого
ErrorNoActivatedBarcode=Нет штрих-кодов типа активированного
@@ -224,6 +225,8 @@ ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to
ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
ErrorFieldRequiredForProduct=Field '%s' is required for product %s
+ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
+ErrorAddAtLeastOneLineFirst=Add at least one line first
# Warnings
WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/ru_RU/holiday.lang b/htdocs/langs/ru_RU/holiday.lang
index 006fad197c3..f89db7c7f68 100644
--- a/htdocs/langs/ru_RU/holiday.lang
+++ b/htdocs/langs/ru_RU/holiday.lang
@@ -39,8 +39,10 @@ TypeOfLeaveId=Type of leave ID
TypeOfLeaveCode=Type of leave code
TypeOfLeaveLabel=Type of leave label
NbUseDaysCP=Количество истраченных дней отпуска
+NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary.
NbUseDaysCPShort=Days consumed
NbUseDaysCPShortInMonth=Days consumed in month
+DayIsANonWorkingDay=%s is a non working day
DateStartInMonth=Start date in month
DateEndInMonth=End date in month
EditCP=Редактировать
diff --git a/htdocs/langs/ru_RU/install.lang b/htdocs/langs/ru_RU/install.lang
index 136addedef3..7b3e731652b 100644
--- a/htdocs/langs/ru_RU/install.lang
+++ b/htdocs/langs/ru_RU/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
PHPSupportCalendar=This PHP supports calendars extensions.
PHPSupportUTF8=This PHP supports UTF8 functions.
PHPSupportIntl=This PHP supports Intl functions.
+PHPSupport=This PHP supports %s functions.
PHPMemoryOK= Максимально допустимый размер памяти для сессии установлен в %s. Это должно быть достаточно.
PHPMemoryTooLow=Your PHP max session memory is set to %s bytes. This is too low. Change your php.ini to set memory_limit parameter to at least %s bytes.
Recheck=Click here for a more detailed test
@@ -25,6 +26,7 @@ ErrorPHPDoesNotSupportCurl=Ваша установка PHP не поддержи
ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
+ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
ErrorDirDoesNotExists=Каталог %s не существует.
ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
ErrorWrongValueForParameter=Вы ввели неправильное значение для параметра ' %s'.
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index 8c92ca3dad7..6aeedc477ad 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -471,7 +471,7 @@ TotalDuration=Общая продолжительность
Summary=Общее
DolibarrStateBoard=Статистика базы данных
DolibarrWorkBoard=Открытые позиции
-NoOpenedElementToProcess=Нет открытого элемента для обработки
+NoOpenedElementToProcess=No open element to process
Available=Доступно
NotYetAvailable=Пока не доступно
NotAvailable=Не доступно
@@ -1005,7 +1005,7 @@ ContactDefault_contrat=Договор
ContactDefault_facture=Счёт
ContactDefault_fichinter=Посредничество
ContactDefault_invoice_supplier=Supplier Invoice
-ContactDefault_order_supplier=Supplier Order
+ContactDefault_order_supplier=Purchase Order
ContactDefault_project=Проект
ContactDefault_project_task=Задача
ContactDefault_propal=Предложение
@@ -1013,3 +1013,6 @@ ContactDefault_supplier_proposal=Supplier Proposal
ContactDefault_ticketsup=Ticket
ContactAddedAutomatically=Contact added from contact thirdparty roles
More=More
+ShowDetails=Show details
+CustomReports=Custom reports
+SelectYourGraphOptionsFirst=Select your graph options to build a graph
diff --git a/htdocs/langs/ru_RU/modulebuilder.lang b/htdocs/langs/ru_RU/modulebuilder.lang
index 5e2ae72a85a..a79b4549045 100644
--- a/htdocs/langs/ru_RU/modulebuilder.lang
+++ b/htdocs/langs/ru_RU/modulebuilder.lang
@@ -83,7 +83,7 @@ ListOfDictionariesEntries=List of dictionaries entries
ListOfPermissionsDefined=List of defined permissions
SeeExamples=See examples here
EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:
preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
($user->rights->holiday->define_holiday ? 1 : 0)
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:
preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
($user->rights->holiday->define_holiday ? 1 : 0)
IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
@@ -135,3 +135,5 @@ CSSClass=CSS Class
NotEditable=Not editable
ForeignKey=Foreign key
TypeOfFieldsHelp=Type of fields:
varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
+AsciiToHtmlConverter=Ascii to HTML converter
+AsciiToPdfConverter=Ascii to PDF converter
diff --git a/htdocs/langs/ru_RU/mrp.lang b/htdocs/langs/ru_RU/mrp.lang
index ad612115268..11c6915a25c 100644
--- a/htdocs/langs/ru_RU/mrp.lang
+++ b/htdocs/langs/ru_RU/mrp.lang
@@ -54,12 +54,15 @@ ToConsume=To consume
ToProduce=To produce
QtyAlreadyConsumed=Qty already consumed
QtyAlreadyProduced=Qty already produced
+ConsumeOrProduce=Consume or Produce
ConsumeAndProduceAll=Consume and Produce All
Manufactured=Manufactured
TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
ForAQuantityOf1=For a quantity to produce of 1
ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
-ProductionForRefAndDate=Production %s - %s
+ProductionForRef=Production of %s
AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
NoStockChangeOnServices=No stock change on services
+ProductQtyToConsumeByMO=Product quantity still to consume by open MO
+ProductQtyToProduceByMO=Product quentity still to produce by open MO
diff --git a/htdocs/langs/ru_RU/orders.lang b/htdocs/langs/ru_RU/orders.lang
index d8e19ddf9e1..5e148001e53 100644
--- a/htdocs/langs/ru_RU/orders.lang
+++ b/htdocs/langs/ru_RU/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Дата заказа
OrderDateShort=Дата заказа
OrderToProcess=Для обработки
NewOrder= Новый заказ
+NewOrderSupplier=New Purchase Order
ToOrder=Сделать заказ
MakeOrder=Сделать заказ
SupplierOrder=Purchase order
@@ -25,6 +26,8 @@ OrdersToBill=Sales orders delivered
OrdersInProcess=Sales orders in process
OrdersToProcess=Sales orders to process
SuppliersOrdersToProcess=Purchase orders to process
+SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
+AwaitingReception=Awaiting reception
StatusOrderCanceledShort=Отменен
StatusOrderDraftShort=Черновик
StatusOrderValidatedShort=Подтвержденные
@@ -37,7 +40,6 @@ StatusOrderDeliveredShort=В законопроекте
StatusOrderToBillShort=В законопроекте
StatusOrderApprovedShort=Утверждено
StatusOrderRefusedShort=Отказался
-StatusOrderBilledShort=Billed
StatusOrderToProcessShort=Для обработки
StatusOrderReceivedPartiallyShort=Частично получил
StatusOrderReceivedAllShort=Products received
@@ -50,7 +52,6 @@ StatusOrderProcessed=Обработано
StatusOrderToBill=В законопроекте
StatusOrderApproved=Утверждено
StatusOrderRefused=Отказался
-StatusOrderBilled=Billed
StatusOrderReceivedPartially=Частично получил
StatusOrderReceivedAll=All products received
ShippingExist=Отгрузки существует
@@ -68,8 +69,9 @@ ValidateOrder=Проверка порядка
UnvalidateOrder=Unvalidate порядке
DeleteOrder=Удалить тему
CancelOrder=Отмена порядка
-OrderReopened= Order %s Reopened
+OrderReopened= Order %s re-open
AddOrder=Создать заказ
+AddPurchaseOrder=Create purchase order
AddToDraftOrders=Добавить проект заказа
ShowOrder=Показать порядок
OrdersOpened=Orders to process
@@ -139,10 +141,10 @@ OrderByEMail=Адрес электронной почты
OrderByWWW=Интернет
OrderByPhone=Телефон
# Documents models
-PDFEinsteinDescription=Для полной модели (logo. ..)
-PDFEratostheneDescription=Для полной модели (logo. ..)
+PDFEinsteinDescription=A complete order model
+PDFEratostheneDescription=A complete order model
PDFEdisonDescription=Простая модель для
-PDFProformaDescription=Целиком заполненный счёт (логотип...)
+PDFProformaDescription=A complete Proforma invoice template
CreateInvoiceForThisCustomer=Оплатить заказы
NoOrdersToInvoice=Нет заказов для оплаты
CloseProcessedOrdersAutomatically=Отметить "В обработке" все выделенные заказы
@@ -152,7 +154,35 @@ OrderCreated=Ваши заказы созданы
OrderFail=Возникла ошибка при создании заказов
CreateOrders=Создать заказы
ToBillSeveralOrderSelectCustomer=Для создания счёта на несколько заказов, сначала нажмите на клиента, затем выберете "%s".
-OptionToSetOrderBilledNotEnabled=Option (from module Workflow) to set order to 'Billed' automatically when invoice is validated is off, so you will have to set status of order to 'Billed' manually.
+OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
-CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
+CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
SetShippingMode=Set shipping mode
+WithReceptionFinished=With reception finished
+#### supplier orders status
+StatusSupplierOrderCanceledShort=Отменена
+StatusSupplierOrderDraftShort=Проект
+StatusSupplierOrderValidatedShort=Утверждена
+StatusSupplierOrderSentShort=В процессе
+StatusSupplierOrderSent=Поставки в процессе
+StatusSupplierOrderOnProcessShort=Заказано
+StatusSupplierOrderProcessedShort=Обработано
+StatusSupplierOrderDelivered=В законопроекте
+StatusSupplierOrderDeliveredShort=В законопроекте
+StatusSupplierOrderToBillShort=В законопроекте
+StatusSupplierOrderApprovedShort=Утверждено
+StatusSupplierOrderRefusedShort=Отклонено
+StatusSupplierOrderToProcessShort=Для обработки
+StatusSupplierOrderReceivedPartiallyShort=Частично получил
+StatusSupplierOrderReceivedAllShort=Products received
+StatusSupplierOrderCanceled=Отменена
+StatusSupplierOrderDraft=Проект (должно быть подтверждено)
+StatusSupplierOrderValidated=Утверждена
+StatusSupplierOrderOnProcess=Заказано - ожидает приёма
+StatusSupplierOrderOnProcessWithValidation=Заказано - ожидает приёма или подтверждения
+StatusSupplierOrderProcessed=Обработано
+StatusSupplierOrderToBill=В законопроекте
+StatusSupplierOrderApproved=Утверждено
+StatusSupplierOrderRefused=Отклонено
+StatusSupplierOrderReceivedPartially=Частично получил
+StatusSupplierOrderReceivedAll=All products received
diff --git a/htdocs/langs/ru_RU/other.lang b/htdocs/langs/ru_RU/other.lang
index 3d8a7ec92e9..e1ecbfaf9d7 100644
--- a/htdocs/langs/ru_RU/other.lang
+++ b/htdocs/langs/ru_RU/other.lang
@@ -24,7 +24,7 @@ MessageOK=Message on the return page for a validated payment
MessageKO=Message on the return page for a canceled payment
ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
DeleteAlsoContentRecursively=Check to delete all content recursively
-
+PoweredBy=Powered by
YearOfInvoice=Year of invoice date
PreviousYearOfInvoice=Previous year of invoice date
NextYearOfInvoice=Following year of invoice date
@@ -104,7 +104,8 @@ DemoFundation=Управление членов Фонда
DemoFundation2=Управление членами и банковские счета Фонда
DemoCompanyServiceOnly=Company or freelance selling service only
DemoCompanyShopWithCashDesk=Работа магазина в кассу
-DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
+DemoCompanyManufacturing=Company manufacturing products
DemoCompanyAll=Company with multiple activities (all main modules)
CreatedBy=Создан %s
ModifiedBy=Модифицированное% по S
@@ -267,7 +268,7 @@ WEBSITE_PAGEURL=URL of page
WEBSITE_TITLE=Название
WEBSITE_DESCRIPTION=Описание
WEBSITE_IMAGE=Image
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITEKEY__ in the path if path depends on website name.
WEBSITE_KEYWORDS=Keywords
LinesToImport=Lines to import
diff --git a/htdocs/langs/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang
index 896f789b8e5..2596e7e4df2 100644
--- a/htdocs/langs/ru_RU/projects.lang
+++ b/htdocs/langs/ru_RU/projects.lang
@@ -77,7 +77,7 @@ MyProjectsArea=My projects Area
DurationEffective=Эффективная длительность
ProgressDeclared=Заданный ход выполнения проекта
TaskProgressSummary=Task progress
-CurentlyOpenedTasks=Curently opened tasks
+CurentlyOpenedTasks=Curently open tasks
TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
ProgressCalculated=Вычисленный ход выполнения проекта
@@ -249,9 +249,13 @@ TimeSpentForInvoice=Время, проведенное
OneLinePerUser=One line per user
ServiceToUseOnLines=Service to use on lines
InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets).
+ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
ProjectFollowOpportunity=Follow opportunity
ProjectFollowTasks=Follow tasks
UsageOpportunity=Usage: Opportunity
UsageTasks=Usage: Tasks
UsageBillTimeShort=Usage: Bill time
+InvoiceToUse=Draft invoice to use
+NewInvoice=Новый счёт
+OneLinePerTask=One line per task
+OneLinePerPeriod=One line per period
diff --git a/htdocs/langs/ru_RU/propal.lang b/htdocs/langs/ru_RU/propal.lang
index 4d298fa0903..0ec39a8b5e7 100644
--- a/htdocs/langs/ru_RU/propal.lang
+++ b/htdocs/langs/ru_RU/propal.lang
@@ -28,7 +28,7 @@ ShowPropal=Показать предложение
PropalsDraft=Черновики
PropalsOpened=Открытые
PropalStatusDraft=Проект (должно быть подтверждено)
-PropalStatusValidated=Validated (proposal is opened)
+PropalStatusValidated=Удостоверенная (предложение открыто)
PropalStatusSigned=Подпись (в законопроекте)
PropalStatusNotSigned=Не подписал (закрытые)
PropalStatusBilled=Billed
@@ -76,10 +76,11 @@ TypeContact_propal_external_BILLING=свяжитесь со счета
TypeContact_propal_external_CUSTOMER=Абонентский отдел следующие меры предложение
TypeContact_propal_external_SHIPPING=Customer contact for delivery
# Document models
-DocModelAzurDescription=Полный текст предложения модели (logo. ..)
-DocModelCyanDescription=Полный текст предложения модели (logo. ..)
+DocModelAzurDescription=A complete proposal model
+DocModelCyanDescription=A complete proposal model
DefaultModelPropalCreate=Создание модели по умолчанию
DefaultModelPropalToBill=Шаблон по умолчанию, когда закрывается коммерческое предложение (для создания счёта)
DefaultModelPropalClosed=Шаблон по умолчанию, когда закрывается коммерческое предложение (не оплаченное)
ProposalCustomerSignature=Письменное подтверждение, печать компании, дата и подпись
ProposalsStatisticsSuppliers=Vendor proposals statistics
+CaseFollowedBy=Case followed by
diff --git a/htdocs/langs/ru_RU/stocks.lang b/htdocs/langs/ru_RU/stocks.lang
index c9f2825e282..a2e752bc883 100644
--- a/htdocs/langs/ru_RU/stocks.lang
+++ b/htdocs/langs/ru_RU/stocks.lang
@@ -143,6 +143,7 @@ InventoryCode=Movement or inventory code
IsInPackage=Contained into package
WarehouseAllowNegativeTransfer=Stock can be negative
qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
+qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
ShowWarehouse=Просмотр склада
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Перевозка товара %s на другой склад
@@ -192,6 +193,7 @@ TheoricalQty=Theorique qty
TheoricalValue=Theorique qty
LastPA=Last BP
CurrentPA=Curent BP
+RecordedQty=Recorded Qty
RealQty=Real Qty
RealValue=Real Value
RegulatedQty=Regulated Qty
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index 5d1881fbc3f..e7d0129cd5c 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -519,7 +519,7 @@ Module25Desc=Sales order management
Module30Name=Faktúry
Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
Module40Name=Vendors
-Module40Desc=Vendors and purchase management (purchase orders and billing)
+Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
Module42Name=Debug Logs
Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
Module49Name=Redakcia
@@ -561,9 +561,9 @@ Module200Desc=LDAP directory synchronization
Module210Name=PostNuke
Module210Desc=PostNuke integrácia
Module240Name=Exporty dát
-Module240Desc=Nástroje pre export Dolibarr dát ( s asistentom )
+Module240Desc=Tool to export Dolibarr data (with assistance)
Module250Name=Import dát
-Module250Desc=Tool to import data into Dolibarr (with assistants)
+Module250Desc=Tool to import data into Dolibarr (with assistance)
Module310Name=Členovia
Module310Desc=Nadácia členovia vedenia
Module320Name=RSS Feed
@@ -878,7 +878,7 @@ Permission1251=Spustiť Hmotné dovozy externých dát do databázy (načítanie
Permission1321=Export zákazníkov faktúry, atribúty a platby
Permission1322=Znova otvoriť zaplatený účet
Permission1421=Export sales orders and attributes
-Permission2401=Read actions (events or tasks) linked to his user account (if owner of event)
+Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
Permission2411=Prečítajte akcie (udalosti alebo úlohy) a ďalšie
@@ -1156,7 +1156,7 @@ NoEventOrNoAuditSetup=No security event has been logged. This is normal if Audit
NoEventFoundWithCriteria=No security event has been found for this search criteria.
SeeLocalSendMailSetup=Pozrite sa na miestne sendmail nastavenie
BackupDesc=A complete backup of a Dolibarr installation requires two steps.
-BackupDesc2=Backup the contents of the "documents" directory (%s) containing all uploaded and generated files. This will also include all the dump files generated in Step 1.
+BackupDesc2=Backup the contents of the "documents" directory (%s) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
BackupDesc3=Backup the structure and contents of your database (%s) into a dump file. For this, you can use the following assistant.
BackupDescX=The archived directory should be stored in a secure place.
BackupDescY=Vygenerovaný súbor výpisu by sa mal skladovať na bezpečnom mieste.
@@ -1167,6 +1167,7 @@ RestoreDesc3=Restore the database structure and data from a backup dump file int
RestoreMySQL=MySQL import
ForcedToByAModule= Toto pravidlo je nútený %s aktivovaným modulom
PreviousDumpFiles=Existing backup files
+PreviousArchiveFiles=Existing archive files
WeekStartOnDay=First day of the week
RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
YouMustRunCommandFromCommandLineAfterLoginToUser=Je nutné spustiť tento príkaz z príkazového riadka po prihlásení do shellu s užívateľskými %s alebo musíte pridať parameter-w na konci príkazového riadku, aby %s heslo.
@@ -1248,6 +1249,7 @@ AskForPreferredShippingMethod=Ask for preferred shipping method for Third Partie
FieldEdition=Vydanie poľných %s
FillThisOnlyIfRequired=Príklad: +2 ( vyplňte iba ak sú predpokladané problémy s časovým posunom )
GetBarCode=Získať čiarový kód
+NumberingModules=Numbering models
##### Module password generation
PasswordGenerationStandard=Späť heslo generované podľa interného algoritmu Dolibarr: 8 znakov obsahujúci zdieľanej čísla a znaky malými písmenami.
PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
@@ -1711,8 +1713,9 @@ ChequeReceiptsNumberingModule=Check Receipts Numbering Module
MultiCompanySetup=Spoločnosť Multi-modul nastavenia
##### Suppliers #####
SuppliersSetup=Vendor module setup
-SuppliersCommandModel=Complete template of purchase order (logo...)
-SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
+SuppliersCommandModel=Complete template of Purchase Order
+SuppliersCommandModelMuscadet=Complete template of Purchase Order
+SuppliersInvoiceModel=Complete template of Vendor Invoice
SuppliersInvoiceNumberingModel=Vendor invoices numbering models
IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
##### GeoIPMaxmind #####
@@ -1762,9 +1765,10 @@ ListOfNotificationsPerUser=List of automatic notifications per user*
ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
ListOfFixedNotifications=List of automatic fixed notifications
GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
Threshold=Maximálna hodnota
-BackupDumpWizard=Wizard to build the backup file
+BackupDumpWizard=Wizard to build the database dump file
+BackupZipWizard=Wizard to build the archive of documents directory
SomethingMakeInstallFromWebNotPossible=Inštalácia externého modulu z webu nie je možná kôli :
SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file %s to allow this feature.
@@ -1953,6 +1957,8 @@ SmallerThan=Smaller than
LargerThan=Larger than
IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
+EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set a value here to use this feature. Note that you must also use a read/write login account.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
EndPointFor=End point for %s : %s
DeleteEmailCollector=Delete email collector
ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
diff --git a/htdocs/langs/sk_SK/bills.lang b/htdocs/langs/sk_SK/bills.lang
index 9dd4f3fd60a..e58e9d74cc1 100644
--- a/htdocs/langs/sk_SK/bills.lang
+++ b/htdocs/langs/sk_SK/bills.lang
@@ -416,7 +416,7 @@ PaymentConditionShort14D=14 days
PaymentCondition14D=14 days
PaymentConditionShort14DENDMONTH=14 days of month-end
PaymentCondition14DENDMONTH=Within 14 days following the end of the month
-FixAmount=Fixed amount
+FixAmount=Fixed amount - 1 line with label '%s'
VarAmount=Variabilná čiastka (%% celk.)
VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
# PaymentType
@@ -512,7 +512,7 @@ RevenueStamp=Kolek
YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template
PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
diff --git a/htdocs/langs/sk_SK/categories.lang b/htdocs/langs/sk_SK/categories.lang
index 27d67d26d3e..9f9505b76c7 100644
--- a/htdocs/langs/sk_SK/categories.lang
+++ b/htdocs/langs/sk_SK/categories.lang
@@ -62,6 +62,7 @@ ContactCategoriesShort=Contacts tags/categories
AccountsCategoriesShort=Accounts tags/categories
ProjectsCategoriesShort=Projects tags/categories
UsersCategoriesShort=Users tags/categories
+StockCategoriesShort=Warehouse tags/categories
ThisCategoryHasNoProduct=Táto kategória neobsahuje žiadny produkt.
ThisCategoryHasNoSupplier=This category does not contain any vendor.
ThisCategoryHasNoCustomer=Táto kategória neobsahuje žiadne zákazníka.
@@ -88,3 +89,6 @@ AddProductServiceIntoCategory=Add the following product/service
ShowCategory=Show tag/category
ByDefaultInList=By default in list
ChooseCategory=Choose category
+StocksCategoriesArea=Warehouses Categories Area
+ActionCommCategoriesArea=Events Categories Area
+UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/sk_SK/companies.lang b/htdocs/langs/sk_SK/companies.lang
index c7e6938b958..ba91a15b328 100644
--- a/htdocs/langs/sk_SK/companies.lang
+++ b/htdocs/langs/sk_SK/companies.lang
@@ -247,6 +247,12 @@ ProfId3US=-
ProfId4US=-
ProfId5US=-
ProfId6US=-
+ProfId1RO=Prof Id 1 (CUI)
+ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
+ProfId3RO=Prof Id 3 (CAEN)
+ProfId4RO=-
+ProfId5RO=Prof Id 5 (EUID)
+ProfId6RO=-
ProfId1RU=Prof Id 1 (OGRN)
ProfId2RU=Prof Id 2 (INN)
ProfId3RU=Prof ID 3 (KPP)
@@ -339,7 +345,7 @@ MyContacts=Moje kontakty
Capital=Kapitál
CapitalOf=Hlavné mesto %s
EditCompany=Upraviť spoločnosť
-ThisUserIsNot=This user is not a prospect, customer nor vendor
+ThisUserIsNot=This user is not a prospect, customer or vendor
VATIntraCheck=Kontrola
VATIntraCheckDesc=The VAT ID must include the country prefix. The link %s uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -406,6 +412,13 @@ AllocateCommercial=Assigned to sales representative
Organization=Organizácia
FiscalYearInformation=Fiscal Year
FiscalMonthStart=Počiatočný mesiac fiškálneho roka
+SocialNetworksInformation=Social networks
+SocialNetworksFacebookURL=Facebook URL
+SocialNetworksTwitterURL=Twitter URL
+SocialNetworksLinkedinURL=Linkedin URL
+SocialNetworksInstagramURL=Instagram URL
+SocialNetworksYoutubeURL=Youtube URL
+SocialNetworksGithubURL=Github URL
YouMustAssignUserMailFirst=You must create an email for this user prior to being able to add an email notification.
YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
ListSuppliersShort=List of Vendors
diff --git a/htdocs/langs/sk_SK/compta.lang b/htdocs/langs/sk_SK/compta.lang
index c587fcd1b25..859d3e5ae70 100644
--- a/htdocs/langs/sk_SK/compta.lang
+++ b/htdocs/langs/sk_SK/compta.lang
@@ -63,7 +63,7 @@ LT2SupplierES=IRPF nákupy
LT2CustomerIN=SGST sales
LT2SupplierIN=SGST purchases
VATCollected=Vybrané DPH
-ToPay=Zaplatiť
+StatusToPay=Zaplatiť
SpecialExpensesArea=Area for all special payments
SocialContribution=Social or fiscal tax
SocialContributions=Social or fiscal taxes
@@ -112,7 +112,7 @@ ShowVatPayment=Zobraziť DPH platbu
TotalToPay=Celkom k zaplateniu
BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=vendor accounting code
+SupplierAccountancyCode=Vendor accounting code
CustomerAccountancyCodeShort=Cust. account. code
SupplierAccountancyCodeShort=Sup. account. code
AccountNumber=Číslo účtu
@@ -254,3 +254,4 @@ ByVatRate=By sale tax rate
TurnoverbyVatrate=Turnover invoiced by sale tax rate
TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
PurchasebyVatrate=Purchase by sale tax rate
+LabelToShow=Krátky názov
diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang
index 67b0b0bcdb9..72cb13e6254 100644
--- a/htdocs/langs/sk_SK/errors.lang
+++ b/htdocs/langs/sk_SK/errors.lang
@@ -117,7 +117,8 @@ ErrorLoginDoesNotExists=Užívateľ s prihlásením %s nebol nájdený.
ErrorLoginHasNoEmail=Tento užívateľ nemá žiadnu e-mailovú adresu. Proces prerušená.
ErrorBadValueForCode=Bad hodnota bezpečnostného kódu. Skúste to znova s novou hodnotou ...
ErrorBothFieldCantBeNegative=Polia %s a %s nemôžu byť negatívna
-ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you want to add a discount line, just create the discount first with link %s on screen and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
+ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
ErrorWebServerUserHasNotPermission=Užívateľský účet %s použiť na spustenie webový server nemá oprávnenie pre ktoré
ErrorNoActivatedBarcode=Žiaden čiarový kód aktivovaný typ
@@ -224,6 +225,8 @@ ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to
ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
ErrorFieldRequiredForProduct=Field '%s' is required for product %s
+ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
+ErrorAddAtLeastOneLineFirst=Add at least one line first
# Warnings
WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/sk_SK/holiday.lang b/htdocs/langs/sk_SK/holiday.lang
index 6c0101396ce..fd689f5f4a9 100644
--- a/htdocs/langs/sk_SK/holiday.lang
+++ b/htdocs/langs/sk_SK/holiday.lang
@@ -39,8 +39,10 @@ TypeOfLeaveId=Type of leave ID
TypeOfLeaveCode=Type of leave code
TypeOfLeaveLabel=Type of leave label
NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary.
NbUseDaysCPShort=Days consumed
NbUseDaysCPShortInMonth=Days consumed in month
+DayIsANonWorkingDay=%s is a non working day
DateStartInMonth=Start date in month
DateEndInMonth=End date in month
EditCP=Upraviť
diff --git a/htdocs/langs/sk_SK/install.lang b/htdocs/langs/sk_SK/install.lang
index 6e725eeb833..d25a85dc4f2 100644
--- a/htdocs/langs/sk_SK/install.lang
+++ b/htdocs/langs/sk_SK/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
PHPSupportCalendar=This PHP supports calendars extensions.
PHPSupportUTF8=This PHP supports UTF8 functions.
PHPSupportIntl=This PHP supports Intl functions.
+PHPSupport=This PHP supports %s functions.
PHPMemoryOK=Maximálna pamäť pre relácie v PHP je nastavená na %s. To by malo stačiť.
PHPMemoryTooLow=Your PHP max session memory is set to %s bytes. This is too low. Change your php.ini to set memory_limit parameter to at least %s bytes.
Recheck=Click here for a more detailed test
@@ -25,6 +26,7 @@ ErrorPHPDoesNotSupportCurl=Vaše nainštalované PHP nepodporuje Curl
ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
+ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
ErrorDirDoesNotExists=Adresár %s neexistuje.
ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
ErrorWrongValueForParameter=Možno ste zadali nesprávnu hodnotu pre parameter "%s".
diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang
index 8cb5e269ddc..effb0e7a22c 100644
--- a/htdocs/langs/sk_SK/main.lang
+++ b/htdocs/langs/sk_SK/main.lang
@@ -471,7 +471,7 @@ TotalDuration=Celkové trvanie
Summary=Zhrnutie
DolibarrStateBoard=Database Statistics
DolibarrWorkBoard=Open Items
-NoOpenedElementToProcess=No opened element to process
+NoOpenedElementToProcess=No open element to process
Available=Dostupný
NotYetAvailable=Zatiaľ nie je k dispozícii
NotAvailable=Nie je k dispozícii
@@ -1005,7 +1005,7 @@ ContactDefault_contrat=Zmluva
ContactDefault_facture=Faktúra
ContactDefault_fichinter=Zásah
ContactDefault_invoice_supplier=Supplier Invoice
-ContactDefault_order_supplier=Supplier Order
+ContactDefault_order_supplier=Purchase Order
ContactDefault_project=Projekt
ContactDefault_project_task=Úloha
ContactDefault_propal=Návrh
@@ -1013,3 +1013,6 @@ ContactDefault_supplier_proposal=Supplier Proposal
ContactDefault_ticketsup=Ticket
ContactAddedAutomatically=Contact added from contact thirdparty roles
More=More
+ShowDetails=Show details
+CustomReports=Custom reports
+SelectYourGraphOptionsFirst=Select your graph options to build a graph
diff --git a/htdocs/langs/sk_SK/modulebuilder.lang b/htdocs/langs/sk_SK/modulebuilder.lang
index 5e2ae72a85a..a79b4549045 100644
--- a/htdocs/langs/sk_SK/modulebuilder.lang
+++ b/htdocs/langs/sk_SK/modulebuilder.lang
@@ -83,7 +83,7 @@ ListOfDictionariesEntries=List of dictionaries entries
ListOfPermissionsDefined=List of defined permissions
SeeExamples=See examples here
EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:
preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
($user->rights->holiday->define_holiday ? 1 : 0)
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:
preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
($user->rights->holiday->define_holiday ? 1 : 0)
IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
@@ -135,3 +135,5 @@ CSSClass=CSS Class
NotEditable=Not editable
ForeignKey=Foreign key
TypeOfFieldsHelp=Type of fields:
varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
+AsciiToHtmlConverter=Ascii to HTML converter
+AsciiToPdfConverter=Ascii to PDF converter
diff --git a/htdocs/langs/sk_SK/mrp.lang b/htdocs/langs/sk_SK/mrp.lang
index ad612115268..11c6915a25c 100644
--- a/htdocs/langs/sk_SK/mrp.lang
+++ b/htdocs/langs/sk_SK/mrp.lang
@@ -54,12 +54,15 @@ ToConsume=To consume
ToProduce=To produce
QtyAlreadyConsumed=Qty already consumed
QtyAlreadyProduced=Qty already produced
+ConsumeOrProduce=Consume or Produce
ConsumeAndProduceAll=Consume and Produce All
Manufactured=Manufactured
TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
ForAQuantityOf1=For a quantity to produce of 1
ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
-ProductionForRefAndDate=Production %s - %s
+ProductionForRef=Production of %s
AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
NoStockChangeOnServices=No stock change on services
+ProductQtyToConsumeByMO=Product quantity still to consume by open MO
+ProductQtyToProduceByMO=Product quentity still to produce by open MO
diff --git a/htdocs/langs/sk_SK/orders.lang b/htdocs/langs/sk_SK/orders.lang
index 7073f9b9695..826364134cd 100644
--- a/htdocs/langs/sk_SK/orders.lang
+++ b/htdocs/langs/sk_SK/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Dátum objednávky
OrderDateShort=Dátum objednávky
OrderToProcess=Objednávka na spracovanie
NewOrder=Nová objednávka
+NewOrderSupplier=New Purchase Order
ToOrder=Objednať
MakeOrder=Objednať
SupplierOrder=Purchase order
@@ -25,6 +26,8 @@ OrdersToBill=Sales orders delivered
OrdersInProcess=Sales orders in process
OrdersToProcess=Sales orders to process
SuppliersOrdersToProcess=Purchase orders to process
+SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
+AwaitingReception=Awaiting reception
StatusOrderCanceledShort=Zrušený
StatusOrderDraftShort=Návrh
StatusOrderValidatedShort=Overené
@@ -37,7 +40,6 @@ StatusOrderDeliveredShort=Dodáva sa
StatusOrderToBillShort=Dodáva sa
StatusOrderApprovedShort=Schválený
StatusOrderRefusedShort=Odmietol
-StatusOrderBilledShort=Účtované
StatusOrderToProcessShort=Ak chcete spracovať
StatusOrderReceivedPartiallyShort=Čiastočne uložený
StatusOrderReceivedAllShort=Products received
@@ -50,7 +52,6 @@ StatusOrderProcessed=Spracované
StatusOrderToBill=Dodáva sa
StatusOrderApproved=Schválený
StatusOrderRefused=Odmietol
-StatusOrderBilled=Účtované
StatusOrderReceivedPartially=Čiastočne uložený
StatusOrderReceivedAll=All products received
ShippingExist=Zásielka existuje
@@ -68,8 +69,9 @@ ValidateOrder=Potvrdenie objednávky
UnvalidateOrder=Unvalidate objednávku
DeleteOrder=Zmazať objednávku
CancelOrder=Zrušenie objednávky
-OrderReopened= Order %s Reopened
+OrderReopened= Order %s re-open
AddOrder=Create order
+AddPurchaseOrder=Create purchase order
AddToDraftOrders=Pridať k predlohe
ShowOrder=Zobraziť objednávku
OrdersOpened=Orders to process
@@ -139,10 +141,10 @@ OrderByEMail=E-mail
OrderByWWW=Online
OrderByPhone=Telefón
# Documents models
-PDFEinsteinDescription=Kompletné objednávka modelu (logo. ..)
-PDFEratostheneDescription=Kompletné objednávka modelu (logo. ..)
+PDFEinsteinDescription=A complete order model
+PDFEratostheneDescription=A complete order model
PDFEdisonDescription=Jednoduchý model, aby
-PDFProformaDescription=Kompletné proforma faktúra (logo ...)
+PDFProformaDescription=A complete Proforma invoice template
CreateInvoiceForThisCustomer=Bill objednávky
NoOrdersToInvoice=Žiadne objednávky zúčtovateľné
CloseProcessedOrdersAutomatically=Klasifikovať "spracovanie" všetky vybrané príkazy.
@@ -152,7 +154,35 @@ OrderCreated=Vaše objednávky boli vytvorené
OrderFail=Došlo k chybe pri vytváraní objednávky
CreateOrders=Vytvorenie objednávky
ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
-OptionToSetOrderBilledNotEnabled=Option (from module Workflow) to set order to 'Billed' automatically when invoice is validated is off, so you will have to set status of order to 'Billed' manually.
+OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
-CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
+CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
SetShippingMode=Set shipping mode
+WithReceptionFinished=With reception finished
+#### supplier orders status
+StatusSupplierOrderCanceledShort=Zrušený
+StatusSupplierOrderDraftShort=Návrh
+StatusSupplierOrderValidatedShort=Overené
+StatusSupplierOrderSentShort=V procese
+StatusSupplierOrderSent=Preprava v procese
+StatusSupplierOrderOnProcessShort=Objednal
+StatusSupplierOrderProcessedShort=Spracované
+StatusSupplierOrderDelivered=Dodáva sa
+StatusSupplierOrderDeliveredShort=Dodáva sa
+StatusSupplierOrderToBillShort=Dodáva sa
+StatusSupplierOrderApprovedShort=Schválený
+StatusSupplierOrderRefusedShort=Odmietol
+StatusSupplierOrderToProcessShort=Ak chcete spracovať
+StatusSupplierOrderReceivedPartiallyShort=Čiastočne uložený
+StatusSupplierOrderReceivedAllShort=Products received
+StatusSupplierOrderCanceled=Zrušený
+StatusSupplierOrderDraft=Návrh (musí byť overená)
+StatusSupplierOrderValidated=Overené
+StatusSupplierOrderOnProcess=Ordered - Standby reception
+StatusSupplierOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusSupplierOrderProcessed=Spracované
+StatusSupplierOrderToBill=Dodáva sa
+StatusSupplierOrderApproved=Schválený
+StatusSupplierOrderRefused=Odmietol
+StatusSupplierOrderReceivedPartially=Čiastočne uložený
+StatusSupplierOrderReceivedAll=All products received
diff --git a/htdocs/langs/sk_SK/other.lang b/htdocs/langs/sk_SK/other.lang
index cd4d003a3d1..cc027659e10 100644
--- a/htdocs/langs/sk_SK/other.lang
+++ b/htdocs/langs/sk_SK/other.lang
@@ -24,7 +24,7 @@ MessageOK=Message on the return page for a validated payment
MessageKO=Message on the return page for a canceled payment
ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
DeleteAlsoContentRecursively=Check to delete all content recursively
-
+PoweredBy=Powered by
YearOfInvoice=Year of invoice date
PreviousYearOfInvoice=Previous year of invoice date
NextYearOfInvoice=Following year of invoice date
@@ -104,7 +104,8 @@ DemoFundation=Správa členov nadácie
DemoFundation2=Správa členov a bankový účet nadácie
DemoCompanyServiceOnly=Company or freelance selling service only
DemoCompanyShopWithCashDesk=Správa obchod s pokladňou
-DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
+DemoCompanyManufacturing=Company manufacturing products
DemoCompanyAll=Company with multiple activities (all main modules)
CreatedBy=Vytvoril %s
ModifiedBy=Zmenil %s
@@ -267,7 +268,7 @@ WEBSITE_PAGEURL=URL of page
WEBSITE_TITLE=Názov
WEBSITE_DESCRIPTION=Popis
WEBSITE_IMAGE=Image
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITEKEY__ in the path if path depends on website name.
WEBSITE_KEYWORDS=Keywords
LinesToImport=Lines to import
diff --git a/htdocs/langs/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang
index 56ceb5ffe84..13d6765f611 100644
--- a/htdocs/langs/sk_SK/projects.lang
+++ b/htdocs/langs/sk_SK/projects.lang
@@ -77,7 +77,7 @@ MyProjectsArea=My projects Area
DurationEffective=Efektívny čas
ProgressDeclared=Deklarovaná pokrok
TaskProgressSummary=Task progress
-CurentlyOpenedTasks=Curently opened tasks
+CurentlyOpenedTasks=Curently open tasks
TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
ProgressCalculated=Vypočítaná pokrok
@@ -249,9 +249,13 @@ TimeSpentForInvoice=Čas strávený
OneLinePerUser=One line per user
ServiceToUseOnLines=Service to use on lines
InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets).
+ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
ProjectFollowOpportunity=Follow opportunity
ProjectFollowTasks=Follow tasks
UsageOpportunity=Usage: Opportunity
UsageTasks=Usage: Tasks
UsageBillTimeShort=Usage: Bill time
+InvoiceToUse=Draft invoice to use
+NewInvoice=Nová faktúra
+OneLinePerTask=One line per task
+OneLinePerPeriod=One line per period
diff --git a/htdocs/langs/sk_SK/propal.lang b/htdocs/langs/sk_SK/propal.lang
index 65e6503aaa4..f5891993cb5 100644
--- a/htdocs/langs/sk_SK/propal.lang
+++ b/htdocs/langs/sk_SK/propal.lang
@@ -28,7 +28,7 @@ ShowPropal=Zobraziť návrhu
PropalsDraft=Dáma
PropalsOpened=Otvorení
PropalStatusDraft=Návrh (musí byť overená)
-PropalStatusValidated=Validated (proposal is opened)
+PropalStatusValidated=Overené (Návrh je v prevádzke)
PropalStatusSigned=Podpis (potreby fakturácia)
PropalStatusNotSigned=Nie ste prihlásený (uzavretý)
PropalStatusBilled=Účtované
@@ -76,10 +76,11 @@ TypeContact_propal_external_BILLING=Zákazník faktúra kontakt
TypeContact_propal_external_CUSTOMER=Kontakt so zákazníkom nasledujúce vypracovaného návrhu
TypeContact_propal_external_SHIPPING=Customer contact for delivery
# Document models
-DocModelAzurDescription=Kompletný návrh modelu (logo. ..)
-DocModelCyanDescription=Kompletný návrh modelu (logo. ..)
+DocModelAzurDescription=A complete proposal model
+DocModelCyanDescription=A complete proposal model
DefaultModelPropalCreate=Predvolené model, tvorba
DefaultModelPropalToBill=Predvolená šablóna pri zatváraní obchodnej návrh (bude faktúrovať)
DefaultModelPropalClosed=Predvolená šablóna pri zatváraní obchodnej návrh (nevyfakturované)
ProposalCustomerSignature=Písomná akceptácia, firemná pečiatka, dátum a podpis
ProposalsStatisticsSuppliers=Vendor proposals statistics
+CaseFollowedBy=Case followed by
diff --git a/htdocs/langs/sk_SK/stocks.lang b/htdocs/langs/sk_SK/stocks.lang
index 505374809a4..732da41c991 100644
--- a/htdocs/langs/sk_SK/stocks.lang
+++ b/htdocs/langs/sk_SK/stocks.lang
@@ -143,6 +143,7 @@ InventoryCode=Presun alebo skladový kód
IsInPackage=Vložené do balíka
WarehouseAllowNegativeTransfer=Zásoby môžu byť mínusové
qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
+qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
ShowWarehouse=Ukázať sklad
MovementCorrectStock=Uprava zásob pre produkt %s
MovementTransferStock=Transfer zásoby produktu %s do iného skladu
@@ -192,6 +193,7 @@ TheoricalQty=Theorique qty
TheoricalValue=Theorique qty
LastPA=Last BP
CurrentPA=Curent BP
+RecordedQty=Recorded Qty
RealQty=Real Qty
RealValue=Real Value
RegulatedQty=Regulated Qty
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index 0e87ec2871b..6ab8f6dcfa0 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -519,7 +519,7 @@ Module25Desc=Sales order management
Module30Name=Računi
Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
Module40Name=Vendors
-Module40Desc=Vendors and purchase management (purchase orders and billing)
+Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
Module42Name=Debug Logs
Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
Module49Name=Urejevalniki
@@ -561,9 +561,9 @@ Module200Desc=LDAP directory synchronization
Module210Name=PostNuke
Module210Desc=Integracija PostNuke
Module240Name=Izvoz podatkov
-Module240Desc=Tool to export Dolibarr data (with assistants)
+Module240Desc=Tool to export Dolibarr data (with assistance)
Module250Name=Uvoz podatkov
-Module250Desc=Tool to import data into Dolibarr (with assistants)
+Module250Desc=Tool to import data into Dolibarr (with assistance)
Module310Name=Člani
Module310Desc=Upravljanje članov ustanove
Module320Name=Vir RSS
@@ -878,7 +878,7 @@ Permission1251=Izvajanje masovnega izvoza zunanjih podatkov v bazo podatkov (nal
Permission1321=Izvoz računov za kupce, atributov in plačil
Permission1322=Reopen a paid bill
Permission1421=Export sales orders and attributes
-Permission2401=Read actions (events or tasks) linked to his user account (if owner of event)
+Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
Permission2411=Branje aktivnosti (dogodki ali naloge) ostalih
@@ -1156,7 +1156,7 @@ NoEventOrNoAuditSetup=No security event has been logged. This is normal if Audit
NoEventFoundWithCriteria=No security event has been found for this search criteria.
SeeLocalSendMailSetup=Glejte lokalne nastavitve za pošiljanje pošte
BackupDesc=A complete backup of a Dolibarr installation requires two steps.
-BackupDesc2=Backup the contents of the "documents" directory (%s) containing all uploaded and generated files. This will also include all the dump files generated in Step 1.
+BackupDesc2=Backup the contents of the "documents" directory (%s) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
BackupDesc3=Backup the structure and contents of your database (%s) into a dump file. For this, you can use the following assistant.
BackupDescX=The archived directory should be stored in a secure place.
BackupDescY=Generirano dump datoteko morate shraniti na varno mesto.
@@ -1167,6 +1167,7 @@ RestoreDesc3=Restore the database structure and data from a backup dump file int
RestoreMySQL=Uvoz MySQL
ForcedToByAModule= To pravilo je postavljeno v %s z aktivnim modulom
PreviousDumpFiles=Existing backup files
+PreviousArchiveFiles=Existing archive files
WeekStartOnDay=First day of the week
RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
YouMustRunCommandFromCommandLineAfterLoginToUser=Ta ukaz morate pognati iz ukazne vrstice po prijavi v sistem kot uporabnik %s.
@@ -1248,6 +1249,7 @@ AskForPreferredShippingMethod=Ask for preferred shipping method for Third Partie
FieldEdition=%s premenjenih polj
FillThisOnlyIfRequired=Primer: +2 (uporabite samo, če se pojavijo težave s časovno cono)
GetBarCode=Pridobi črtno kodo
+NumberingModules=Numbering models
##### Module password generation
PasswordGenerationStandard=Predlaga geslo, generirano glede na interni Dolibarr algoritem: 8 mest, ki vsebujejo različne številke in male črke.
PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
@@ -1711,8 +1713,9 @@ ChequeReceiptsNumberingModule=Check Receipts Numbering Module
MultiCompanySetup=Nastavitev modula za več podjetij
##### Suppliers #####
SuppliersSetup=Vendor module setup
-SuppliersCommandModel=Complete template of purchase order (logo...)
-SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
+SuppliersCommandModel=Complete template of Purchase Order
+SuppliersCommandModelMuscadet=Complete template of Purchase Order
+SuppliersInvoiceModel=Complete template of Vendor Invoice
SuppliersInvoiceNumberingModel=Vendor invoices numbering models
IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
##### GeoIPMaxmind #####
@@ -1762,9 +1765,10 @@ ListOfNotificationsPerUser=List of automatic notifications per user*
ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
ListOfFixedNotifications=List of automatic fixed notifications
GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
Threshold=Prag
-BackupDumpWizard=Wizard to build the backup file
+BackupDumpWizard=Wizard to build the database dump file
+BackupZipWizard=Wizard to build the archive of documents directory
SomethingMakeInstallFromWebNotPossible=Instalacija eksternega modula s spletnega vmesnika ni možna zaradi naslednjega razloga:
SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
InstallModuleFromWebHasBeenDisabledByFile=Instalacijo zunanjega modula iz aplikacije je onemogočil vaš administrator. Prositi ga morate, naj odstrani datoteko %s, da bi omogočil to funkcijo.
@@ -1953,6 +1957,8 @@ SmallerThan=Smaller than
LargerThan=Larger than
IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
+EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set a value here to use this feature. Note that you must also use a read/write login account.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
EndPointFor=End point for %s : %s
DeleteEmailCollector=Delete email collector
ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
diff --git a/htdocs/langs/sl_SI/bills.lang b/htdocs/langs/sl_SI/bills.lang
index 9e198064e4b..755b37a13f3 100644
--- a/htdocs/langs/sl_SI/bills.lang
+++ b/htdocs/langs/sl_SI/bills.lang
@@ -416,7 +416,7 @@ PaymentConditionShort14D=14 days
PaymentCondition14D=14 days
PaymentConditionShort14DENDMONTH=14 days of month-end
PaymentCondition14DENDMONTH=Within 14 days following the end of the month
-FixAmount=Fixed amount
+FixAmount=Fixed amount - 1 line with label '%s'
VarAmount=Variabilni znesek (%% tot.)
VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
# PaymentType
@@ -512,7 +512,7 @@ RevenueStamp=Žig prihodka
YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Predloga računa Crabe. Predloga kompletnega računa (Podpora DDV opcije, popusti, pogoji plačila, logo, itd...)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template
PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
TerreNumRefModelDesc1=Predlaga številko v formatu %syymm-nnnn za standardne račune in %syymm-nnnn za dobropise kjer je yy leto, mm mesec in nnnn zaporedna številka brez presledkov in večja od 0
diff --git a/htdocs/langs/sl_SI/categories.lang b/htdocs/langs/sl_SI/categories.lang
index 1d7aff17df0..738ecd2ca1c 100644
--- a/htdocs/langs/sl_SI/categories.lang
+++ b/htdocs/langs/sl_SI/categories.lang
@@ -62,6 +62,7 @@ ContactCategoriesShort=Značke/kategorije kontaktov
AccountsCategoriesShort=Accounts tags/categories
ProjectsCategoriesShort=Projects tags/categories
UsersCategoriesShort=Users tags/categories
+StockCategoriesShort=Warehouse tags/categories
ThisCategoryHasNoProduct=Ta kategorija ne vsebuje nobenega proizvoda.
ThisCategoryHasNoSupplier=This category does not contain any vendor.
ThisCategoryHasNoCustomer=Ta kategorija ne vsebuje nobenega kupca.
@@ -88,3 +89,6 @@ AddProductServiceIntoCategory=Dodaj sledeči produkt/storitev
ShowCategory=Pokaži značko/kategorijo
ByDefaultInList=Privzeto na seznamu
ChooseCategory=Choose category
+StocksCategoriesArea=Warehouses Categories Area
+ActionCommCategoriesArea=Events Categories Area
+UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/sl_SI/companies.lang b/htdocs/langs/sl_SI/companies.lang
index fb2cc4d80ff..4ae82256d89 100644
--- a/htdocs/langs/sl_SI/companies.lang
+++ b/htdocs/langs/sl_SI/companies.lang
@@ -247,6 +247,12 @@ ProfId3US=-
ProfId4US=-
ProfId5US=-
ProfId6US=-
+ProfId1RO=Prof Id 1 (CUI)
+ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
+ProfId3RO=Prof Id 3 (CAEN)
+ProfId4RO=-
+ProfId5RO=Prof Id 5 (EUID)
+ProfId6RO=-
ProfId1RU=Prof ID 1 (OGRN)
ProfId2RU=Prof Id 2 (INN)
ProfId3RU=Prof Id 3 (KPP)
@@ -339,7 +345,7 @@ MyContacts=Moji kontakti
Capital=Kapital
CapitalOf=Kapital %s
EditCompany=Uredi podjetje
-ThisUserIsNot=This user is not a prospect, customer nor vendor
+ThisUserIsNot=This user is not a prospect, customer or vendor
VATIntraCheck=Kontrola
VATIntraCheckDesc=The VAT ID must include the country prefix. The link %s uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -406,6 +412,13 @@ AllocateCommercial=Assigned to sales representative
Organization=Organizacija
FiscalYearInformation=Fiscal Year
FiscalMonthStart=Začetni mesec fiskalnega leta
+SocialNetworksInformation=Social networks
+SocialNetworksFacebookURL=Facebook URL
+SocialNetworksTwitterURL=Twitter URL
+SocialNetworksLinkedinURL=Linkedin URL
+SocialNetworksInstagramURL=Instagram URL
+SocialNetworksYoutubeURL=Youtube URL
+SocialNetworksGithubURL=Github URL
YouMustAssignUserMailFirst=You must create an email for this user prior to being able to add an email notification.
YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
ListSuppliersShort=List of Vendors
diff --git a/htdocs/langs/sl_SI/compta.lang b/htdocs/langs/sl_SI/compta.lang
index aadfe3b9ee4..f10f0569bd5 100644
--- a/htdocs/langs/sl_SI/compta.lang
+++ b/htdocs/langs/sl_SI/compta.lang
@@ -63,7 +63,7 @@ LT2SupplierES=IRPF nakupi
LT2CustomerIN=SGST sales
LT2SupplierIN=SGST purchases
VATCollected=Zbir DDV
-ToPay=Za plačilo
+StatusToPay=Za plačilo
SpecialExpensesArea=Področje za posebna plačila
SocialContribution=Social or fiscal tax
SocialContributions=Social or fiscal taxes
@@ -112,7 +112,7 @@ ShowVatPayment=Prikaži plačilo DDV
TotalToPay=Skupaj za plačilo
BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=vendor accounting code
+SupplierAccountancyCode=Vendor accounting code
CustomerAccountancyCodeShort=Cust. account. code
SupplierAccountancyCodeShort=Sup. account. code
AccountNumber=Številka konta
@@ -254,3 +254,4 @@ ByVatRate=By sale tax rate
TurnoverbyVatrate=Turnover invoiced by sale tax rate
TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
PurchasebyVatrate=Purchase by sale tax rate
+LabelToShow=Kratek naziv
diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang
index 57f624e73b3..6145d2e9b38 100644
--- a/htdocs/langs/sl_SI/errors.lang
+++ b/htdocs/langs/sl_SI/errors.lang
@@ -117,7 +117,8 @@ ErrorLoginDoesNotExists=Uporabnik s prijavo %s ni bilo mogoče najti.
ErrorLoginHasNoEmail=Ta uporabnik nima e-poštni naslov. Obdelati prekinjena.
ErrorBadValueForCode=Slaba vrednost za varnostno kodo. Poskusite znova z novo vrednost ...
ErrorBothFieldCantBeNegative=Polja %s in %s ne more biti tako negativna
-ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you want to add a discount line, just create the discount first with link %s on screen and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
+ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
ErrorWebServerUserHasNotPermission=Uporabniški račun %s uporablja za izvedbo spletni strežnik nima dovoljenja za to
ErrorNoActivatedBarcode=Noben tip črtne kode ni aktiviran
@@ -224,6 +225,8 @@ ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to
ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
ErrorFieldRequiredForProduct=Field '%s' is required for product %s
+ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
+ErrorAddAtLeastOneLineFirst=Add at least one line first
# Warnings
WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/sl_SI/holiday.lang b/htdocs/langs/sl_SI/holiday.lang
index a70a02a8c45..b823a1490d7 100644
--- a/htdocs/langs/sl_SI/holiday.lang
+++ b/htdocs/langs/sl_SI/holiday.lang
@@ -39,8 +39,10 @@ TypeOfLeaveId=Type of leave ID
TypeOfLeaveCode=Type of leave code
TypeOfLeaveLabel=Type of leave label
NbUseDaysCP=Število porabljenih dni dopusta
+NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary.
NbUseDaysCPShort=Days consumed
NbUseDaysCPShortInMonth=Days consumed in month
+DayIsANonWorkingDay=%s is a non working day
DateStartInMonth=Start date in month
DateEndInMonth=End date in month
EditCP=Uredi
diff --git a/htdocs/langs/sl_SI/install.lang b/htdocs/langs/sl_SI/install.lang
index ba93276409e..ca6d73f06f9 100644
--- a/htdocs/langs/sl_SI/install.lang
+++ b/htdocs/langs/sl_SI/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
PHPSupportCalendar=This PHP supports calendars extensions.
PHPSupportUTF8=This PHP supports UTF8 functions.
PHPSupportIntl=This PHP supports Intl functions.
+PHPSupport=This PHP supports %s functions.
PHPMemoryOK=Maksimalni spomin za sejo vašega PHP je nastavljen na %s. To bi moralo zadoščati.
PHPMemoryTooLow=Your PHP max session memory is set to %s bytes. This is too low. Change your php.ini to set memory_limit parameter to at least %s bytes.
Recheck=Click here for a more detailed test
@@ -25,6 +26,7 @@ ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
+ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
ErrorDirDoesNotExists=Mapa %s ne obstaja.
ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
ErrorWrongValueForParameter=Morda ste vnesli napačno vrednost parametra '%s'.
diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index 9a4390a5d20..ded624936f2 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -471,7 +471,7 @@ TotalDuration=Skupno trajanje
Summary=Povzetek
DolibarrStateBoard=Database Statistics
DolibarrWorkBoard=Open Items
-NoOpenedElementToProcess=No opened element to process
+NoOpenedElementToProcess=No open element to process
Available=Na voljo
NotYetAvailable=Še ni na voljo
NotAvailable=Ni na voljo
@@ -1005,7 +1005,7 @@ ContactDefault_contrat=Pogodba
ContactDefault_facture=Račun
ContactDefault_fichinter=Intervencija
ContactDefault_invoice_supplier=Supplier Invoice
-ContactDefault_order_supplier=Supplier Order
+ContactDefault_order_supplier=Purchase Order
ContactDefault_project=Projekt
ContactDefault_project_task=Naloga
ContactDefault_propal=Ponudba
@@ -1013,3 +1013,6 @@ ContactDefault_supplier_proposal=Supplier Proposal
ContactDefault_ticketsup=Ticket
ContactAddedAutomatically=Contact added from contact thirdparty roles
More=More
+ShowDetails=Show details
+CustomReports=Custom reports
+SelectYourGraphOptionsFirst=Select your graph options to build a graph
diff --git a/htdocs/langs/sl_SI/modulebuilder.lang b/htdocs/langs/sl_SI/modulebuilder.lang
index 5e2ae72a85a..a79b4549045 100644
--- a/htdocs/langs/sl_SI/modulebuilder.lang
+++ b/htdocs/langs/sl_SI/modulebuilder.lang
@@ -83,7 +83,7 @@ ListOfDictionariesEntries=List of dictionaries entries
ListOfPermissionsDefined=List of defined permissions
SeeExamples=See examples here
EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:
preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
($user->rights->holiday->define_holiday ? 1 : 0)
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:
preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
($user->rights->holiday->define_holiday ? 1 : 0)
IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
@@ -135,3 +135,5 @@ CSSClass=CSS Class
NotEditable=Not editable
ForeignKey=Foreign key
TypeOfFieldsHelp=Type of fields:
varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
+AsciiToHtmlConverter=Ascii to HTML converter
+AsciiToPdfConverter=Ascii to PDF converter
diff --git a/htdocs/langs/sl_SI/mrp.lang b/htdocs/langs/sl_SI/mrp.lang
index ad612115268..11c6915a25c 100644
--- a/htdocs/langs/sl_SI/mrp.lang
+++ b/htdocs/langs/sl_SI/mrp.lang
@@ -54,12 +54,15 @@ ToConsume=To consume
ToProduce=To produce
QtyAlreadyConsumed=Qty already consumed
QtyAlreadyProduced=Qty already produced
+ConsumeOrProduce=Consume or Produce
ConsumeAndProduceAll=Consume and Produce All
Manufactured=Manufactured
TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
ForAQuantityOf1=For a quantity to produce of 1
ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
-ProductionForRefAndDate=Production %s - %s
+ProductionForRef=Production of %s
AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
NoStockChangeOnServices=No stock change on services
+ProductQtyToConsumeByMO=Product quantity still to consume by open MO
+ProductQtyToProduceByMO=Product quentity still to produce by open MO
diff --git a/htdocs/langs/sl_SI/orders.lang b/htdocs/langs/sl_SI/orders.lang
index eaf7c667d2e..6ac81edd908 100644
--- a/htdocs/langs/sl_SI/orders.lang
+++ b/htdocs/langs/sl_SI/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Datum naročila
OrderDateShort=Datum naročila
OrderToProcess=Naročilo za obdelavo
NewOrder=Novo naročilo
+NewOrderSupplier=New Purchase Order
ToOrder=Potrebno naročiti
MakeOrder=Izdelaj naročilo
SupplierOrder=Purchase order
@@ -25,6 +26,8 @@ OrdersToBill=Sales orders delivered
OrdersInProcess=Sales orders in process
OrdersToProcess=Sales orders to process
SuppliersOrdersToProcess=Purchase orders to process
+SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
+AwaitingReception=Awaiting reception
StatusOrderCanceledShort=Preklicano
StatusOrderDraftShort=Osnutek
StatusOrderValidatedShort=Potrjeno
@@ -37,7 +40,6 @@ StatusOrderDeliveredShort=Za fakturiranje
StatusOrderToBillShort=Za fakturiranje
StatusOrderApprovedShort=Odobreno
StatusOrderRefusedShort=Zavrnjeno
-StatusOrderBilledShort=Fakturirana
StatusOrderToProcessShort=Za obdelavo
StatusOrderReceivedPartiallyShort=Delno prejeto
StatusOrderReceivedAllShort=Products received
@@ -50,7 +52,6 @@ StatusOrderProcessed=Obdelano
StatusOrderToBill=Za fakturiranje
StatusOrderApproved=Odobreno
StatusOrderRefused=Zavrnjeno
-StatusOrderBilled=Fakturirana
StatusOrderReceivedPartially=Delno prejeto
StatusOrderReceivedAll=All products received
ShippingExist=Pošiljka ne obstaja
@@ -68,8 +69,9 @@ ValidateOrder=Potrdi naročilo
UnvalidateOrder=Unvalidate red
DeleteOrder=Briši naročilo
CancelOrder=Prekliči naročilo
-OrderReopened= Order %s Reopened
+OrderReopened= Order %s re-open
AddOrder=Ustvari naročilo
+AddPurchaseOrder=Create purchase order
AddToDraftOrders=Dodaj osnutku naročila
ShowOrder=Prikaži naročilo
OrdersOpened=Naročila za procesiranje
@@ -139,10 +141,10 @@ OrderByEMail=E-pošta
OrderByWWW=Internet
OrderByPhone=Telefon
# Documents models
-PDFEinsteinDescription=Vzorec popolnega naročila (logo...)
-PDFEratostheneDescription=Vzorec popolnega naročila (logo...)
+PDFEinsteinDescription=A complete order model
+PDFEratostheneDescription=A complete order model
PDFEdisonDescription=Vzorec enostavnega naročila
-PDFProformaDescription=Kompleten predračun (logo...)
+PDFProformaDescription=A complete Proforma invoice template
CreateInvoiceForThisCustomer=Zaračunaj naročila
NoOrdersToInvoice=Ni naročil, ki bi jih lahko zaračunali
CloseProcessedOrdersAutomatically=Označi vsa izbrana naročila kot "Procesirano"
@@ -152,7 +154,35 @@ OrderCreated=Vaša naročila so bila ustvarjena
OrderFail=Pri ustvarjanju naročil je prišlo do napake
CreateOrders=Ustvari naročila
ToBillSeveralOrderSelectCustomer=Za ustvarjanje računa za več naročil najprej kliknite na kupca, nato izberite "%s".
-OptionToSetOrderBilledNotEnabled=Option (from module Workflow) to set order to 'Billed' automatically when invoice is validated is off, so you will have to set status of order to 'Billed' manually.
+OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
-CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
+CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
SetShippingMode=Set shipping mode
+WithReceptionFinished=With reception finished
+#### supplier orders status
+StatusSupplierOrderCanceledShort=Preklicano
+StatusSupplierOrderDraftShort=Osnutek
+StatusSupplierOrderValidatedShort=Potrjen
+StatusSupplierOrderSentShort=V postopku
+StatusSupplierOrderSent=Pošiljanje v teku
+StatusSupplierOrderOnProcessShort=Naročeno
+StatusSupplierOrderProcessedShort=Obdelani
+StatusSupplierOrderDelivered=Za fakturiranje
+StatusSupplierOrderDeliveredShort=Za fakturiranje
+StatusSupplierOrderToBillShort=Za fakturiranje
+StatusSupplierOrderApprovedShort=Odobreno
+StatusSupplierOrderRefusedShort=Zavrnjeno
+StatusSupplierOrderToProcessShort=Za obdelavo
+StatusSupplierOrderReceivedPartiallyShort=Delno prejeto
+StatusSupplierOrderReceivedAllShort=Products received
+StatusSupplierOrderCanceled=Preklicano
+StatusSupplierOrderDraft=Osnutek (potrebno potrditi)
+StatusSupplierOrderValidated=Potrjen
+StatusSupplierOrderOnProcess=Naročeno - čaka na prevzem
+StatusSupplierOrderOnProcessWithValidation=Naročeno - čaka na prevzem ali potrditev
+StatusSupplierOrderProcessed=Obdelani
+StatusSupplierOrderToBill=Za fakturiranje
+StatusSupplierOrderApproved=Odobreno
+StatusSupplierOrderRefused=Zavrnjeno
+StatusSupplierOrderReceivedPartially=Delno prejeto
+StatusSupplierOrderReceivedAll=All products received
diff --git a/htdocs/langs/sl_SI/other.lang b/htdocs/langs/sl_SI/other.lang
index bc359fd43c9..82a97867dd7 100644
--- a/htdocs/langs/sl_SI/other.lang
+++ b/htdocs/langs/sl_SI/other.lang
@@ -24,7 +24,7 @@ MessageOK=Message on the return page for a validated payment
MessageKO=Message on the return page for a canceled payment
ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
DeleteAlsoContentRecursively=Check to delete all content recursively
-
+PoweredBy=Powered by
YearOfInvoice=Year of invoice date
PreviousYearOfInvoice=Previous year of invoice date
NextYearOfInvoice=Following year of invoice date
@@ -104,7 +104,8 @@ DemoFundation=Urejanje članov ustanove
DemoFundation2=Urejanje članov in bančnih računov ustanove
DemoCompanyServiceOnly=Company or freelance selling service only
DemoCompanyShopWithCashDesk=Urejanje trgovine z blagajno
-DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
+DemoCompanyManufacturing=Company manufacturing products
DemoCompanyAll=Company with multiple activities (all main modules)
CreatedBy=Kreiral %s
ModifiedBy=Spremenil %s
@@ -267,7 +268,7 @@ WEBSITE_PAGEURL=URL of page
WEBSITE_TITLE=Naziv
WEBSITE_DESCRIPTION=Opis
WEBSITE_IMAGE=Image
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITEKEY__ in the path if path depends on website name.
WEBSITE_KEYWORDS=Keywords
LinesToImport=Lines to import
diff --git a/htdocs/langs/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang
index defca64fbb5..9e633f95814 100644
--- a/htdocs/langs/sl_SI/projects.lang
+++ b/htdocs/langs/sl_SI/projects.lang
@@ -77,7 +77,7 @@ MyProjectsArea=My projects Area
DurationEffective=Efektivno trajanje
ProgressDeclared=Declared progress
TaskProgressSummary=Task progress
-CurentlyOpenedTasks=Curently opened tasks
+CurentlyOpenedTasks=Curently open tasks
TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
ProgressCalculated=Calculated progress
@@ -249,9 +249,13 @@ TimeSpentForInvoice=Porabljen čas
OneLinePerUser=One line per user
ServiceToUseOnLines=Service to use on lines
InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets).
+ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
ProjectFollowOpportunity=Follow opportunity
ProjectFollowTasks=Follow tasks
UsageOpportunity=Usage: Opportunity
UsageTasks=Usage: Tasks
UsageBillTimeShort=Usage: Bill time
+InvoiceToUse=Draft invoice to use
+NewInvoice=Nov račun
+OneLinePerTask=One line per task
+OneLinePerPeriod=One line per period
diff --git a/htdocs/langs/sl_SI/propal.lang b/htdocs/langs/sl_SI/propal.lang
index e09497a1c34..d63900f3f49 100644
--- a/htdocs/langs/sl_SI/propal.lang
+++ b/htdocs/langs/sl_SI/propal.lang
@@ -28,7 +28,7 @@ ShowPropal=Prikaži ponudbo
PropalsDraft=Osnutki
PropalsOpened=Odprt
PropalStatusDraft=Osnutek (potrebno potrditi)
-PropalStatusValidated=Validated (proposal is opened)
+PropalStatusValidated=Odprta (ponudba je odprta)
PropalStatusSigned=Podpisana (potrebno fakturirati)
PropalStatusNotSigned=Nepodpisana (zaprta)
PropalStatusBilled=Fakturirana
@@ -76,10 +76,11 @@ TypeContact_propal_external_BILLING=Kontakt za račun pri kupcu
TypeContact_propal_external_CUSTOMER=Kontakt pri kupcu za sledenje ponudbe
TypeContact_propal_external_SHIPPING=Customer contact for delivery
# Document models
-DocModelAzurDescription=Vzorec kompletne ponudbe (logo...)
-DocModelCyanDescription=Vzorec kompletne ponudbe (logo...)
+DocModelAzurDescription=A complete proposal model
+DocModelCyanDescription=A complete proposal model
DefaultModelPropalCreate=Ustvarjanje privzetega modela
DefaultModelPropalToBill=Privzeta predloga za zaključek ponudbe (za fakturiranje)
DefaultModelPropalClosed=Privzeta predloga za zaključek ponudbe (nefakturirana)
ProposalCustomerSignature=Pisna potrditev, žig podjetja, datum in podpis
ProposalsStatisticsSuppliers=Vendor proposals statistics
+CaseFollowedBy=Case followed by
diff --git a/htdocs/langs/sl_SI/stocks.lang b/htdocs/langs/sl_SI/stocks.lang
index b6dbe17d6af..a4460453147 100644
--- a/htdocs/langs/sl_SI/stocks.lang
+++ b/htdocs/langs/sl_SI/stocks.lang
@@ -143,6 +143,7 @@ InventoryCode=Koda gibanja ali zaloge
IsInPackage=Vsebina paketa
WarehouseAllowNegativeTransfer=Stock can be negative
qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
+qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
ShowWarehouse=Prikaži skladišče
MovementCorrectStock=Korekcija zaloge za proizvod %s
MovementTransferStock=Skladiščni prenos proizvoda %s v drugo skladišče
@@ -192,6 +193,7 @@ TheoricalQty=Theorique qty
TheoricalValue=Theorique qty
LastPA=Last BP
CurrentPA=Curent BP
+RecordedQty=Recorded Qty
RealQty=Real Qty
RealValue=Real Value
RegulatedQty=Regulated Qty
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index c164a708590..94fac6ba7bd 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -519,7 +519,7 @@ Module25Desc=Sales order management
Module30Name=Faturat
Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
Module40Name=Vendors
-Module40Desc=Vendors and purchase management (purchase orders and billing)
+Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
Module42Name=Debug Logs
Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
Module49Name=Editors
@@ -561,9 +561,9 @@ Module200Desc=LDAP directory synchronization
Module210Name=PostNuke
Module210Desc=Integrimi PostNuke
Module240Name=Data exports
-Module240Desc=Tool to export Dolibarr data (with assistants)
+Module240Desc=Tool to export Dolibarr data (with assistance)
Module250Name=Data imports
-Module250Desc=Tool to import data into Dolibarr (with assistants)
+Module250Desc=Tool to import data into Dolibarr (with assistance)
Module310Name=Members
Module310Desc=Foundation members management
Module320Name=RSS Feed
@@ -878,7 +878,7 @@ Permission1251=Run mass imports of external data into database (data load)
Permission1321=Export customer invoices, attributes and payments
Permission1322=Reopen a paid bill
Permission1421=Export sales orders and attributes
-Permission2401=Read actions (events or tasks) linked to his user account (if owner of event)
+Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
Permission2411=Read actions (events or tasks) of others
@@ -1156,7 +1156,7 @@ NoEventOrNoAuditSetup=No security event has been logged. This is normal if Audit
NoEventFoundWithCriteria=No security event has been found for this search criteria.
SeeLocalSendMailSetup=See your local sendmail setup
BackupDesc=A complete backup of a Dolibarr installation requires two steps.
-BackupDesc2=Backup the contents of the "documents" directory (%s) containing all uploaded and generated files. This will also include all the dump files generated in Step 1.
+BackupDesc2=Backup the contents of the "documents" directory (%s) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
BackupDesc3=Backup the structure and contents of your database (%s) into a dump file. For this, you can use the following assistant.
BackupDescX=The archived directory should be stored in a secure place.
BackupDescY=The generated dump file should be stored in a secure place.
@@ -1167,6 +1167,7 @@ RestoreDesc3=Restore the database structure and data from a backup dump file int
RestoreMySQL=MySQL import
ForcedToByAModule= This rule is forced to %s by an activated module
PreviousDumpFiles=Existing backup files
+PreviousArchiveFiles=Existing archive files
WeekStartOnDay=First day of the week
RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user %s or you must add -W option at end of command line to provide %s password.
@@ -1248,6 +1249,7 @@ AskForPreferredShippingMethod=Ask for preferred shipping method for Third Partie
FieldEdition=Edition of field %s
FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
GetBarCode=Get barcode
+NumberingModules=Numbering models
##### Module password generation
PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
@@ -1711,8 +1713,9 @@ ChequeReceiptsNumberingModule=Check Receipts Numbering Module
MultiCompanySetup=Multi-company module setup
##### Suppliers #####
SuppliersSetup=Vendor module setup
-SuppliersCommandModel=Complete template of purchase order (logo...)
-SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
+SuppliersCommandModel=Complete template of Purchase Order
+SuppliersCommandModelMuscadet=Complete template of Purchase Order
+SuppliersInvoiceModel=Complete template of Vendor Invoice
SuppliersInvoiceNumberingModel=Vendor invoices numbering models
IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
##### GeoIPMaxmind #####
@@ -1762,9 +1765,10 @@ ListOfNotificationsPerUser=List of automatic notifications per user*
ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
ListOfFixedNotifications=List of automatic fixed notifications
GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
Threshold=Threshold
-BackupDumpWizard=Wizard to build the backup file
+BackupDumpWizard=Wizard to build the database dump file
+BackupZipWizard=Wizard to build the archive of documents directory
SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file %s to allow this feature.
@@ -1953,6 +1957,8 @@ SmallerThan=Smaller than
LargerThan=Larger than
IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
+EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set a value here to use this feature. Note that you must also use a read/write login account.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
EndPointFor=End point for %s : %s
DeleteEmailCollector=Delete email collector
ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
diff --git a/htdocs/langs/sq_AL/bills.lang b/htdocs/langs/sq_AL/bills.lang
index 5641e7b8112..023c749d5c3 100644
--- a/htdocs/langs/sq_AL/bills.lang
+++ b/htdocs/langs/sq_AL/bills.lang
@@ -416,7 +416,7 @@ PaymentConditionShort14D=14 days
PaymentCondition14D=14 days
PaymentConditionShort14DENDMONTH=14 days of month-end
PaymentCondition14DENDMONTH=Within 14 days following the end of the month
-FixAmount=Fixed amount
+FixAmount=Fixed amount - 1 line with label '%s'
VarAmount=Variable amount (%% tot.)
VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
# PaymentType
@@ -512,7 +512,7 @@ RevenueStamp=Revenue stamp
YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template
PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
diff --git a/htdocs/langs/sq_AL/categories.lang b/htdocs/langs/sq_AL/categories.lang
index c46477fa944..40f283ee000 100644
--- a/htdocs/langs/sq_AL/categories.lang
+++ b/htdocs/langs/sq_AL/categories.lang
@@ -62,6 +62,7 @@ ContactCategoriesShort=Contacts tags/categories
AccountsCategoriesShort=Accounts tags/categories
ProjectsCategoriesShort=Projects tags/categories
UsersCategoriesShort=Users tags/categories
+StockCategoriesShort=Warehouse tags/categories
ThisCategoryHasNoProduct=This category does not contain any product.
ThisCategoryHasNoSupplier=This category does not contain any vendor.
ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -88,3 +89,6 @@ AddProductServiceIntoCategory=Add the following product/service
ShowCategory=Show tag/category
ByDefaultInList=By default in list
ChooseCategory=Choose category
+StocksCategoriesArea=Warehouses Categories Area
+ActionCommCategoriesArea=Events Categories Area
+UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/sq_AL/companies.lang b/htdocs/langs/sq_AL/companies.lang
index d6004a2d917..2aac2fc23b4 100644
--- a/htdocs/langs/sq_AL/companies.lang
+++ b/htdocs/langs/sq_AL/companies.lang
@@ -247,6 +247,12 @@ ProfId3US=-
ProfId4US=-
ProfId5US=-
ProfId6US=-
+ProfId1RO=Prof Id 1 (CUI)
+ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
+ProfId3RO=Prof Id 3 (CAEN)
+ProfId4RO=-
+ProfId5RO=Prof Id 5 (EUID)
+ProfId6RO=-
ProfId1RU=Prof Id 1 (OGRN)
ProfId2RU=Prof Id 2 (INN)
ProfId3RU=Prof Id 3 (KPP)
@@ -339,7 +345,7 @@ MyContacts=My contacts
Capital=Capital
CapitalOf=Capital of %s
EditCompany=Edit company
-ThisUserIsNot=This user is not a prospect, customer nor vendor
+ThisUserIsNot=This user is not a prospect, customer or vendor
VATIntraCheck=Check
VATIntraCheckDesc=The VAT ID must include the country prefix. The link %s uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -406,6 +412,13 @@ AllocateCommercial=Assigned to sales representative
Organization=Organization
FiscalYearInformation=Fiscal Year
FiscalMonthStart=Starting month of the fiscal year
+SocialNetworksInformation=Social networks
+SocialNetworksFacebookURL=Facebook URL
+SocialNetworksTwitterURL=Twitter URL
+SocialNetworksLinkedinURL=Linkedin URL
+SocialNetworksInstagramURL=Instagram URL
+SocialNetworksYoutubeURL=Youtube URL
+SocialNetworksGithubURL=Github URL
YouMustAssignUserMailFirst=You must create an email for this user prior to being able to add an email notification.
YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
ListSuppliersShort=List of Vendors
diff --git a/htdocs/langs/sq_AL/compta.lang b/htdocs/langs/sq_AL/compta.lang
index 7f53aa7d165..7bea59962f2 100644
--- a/htdocs/langs/sq_AL/compta.lang
+++ b/htdocs/langs/sq_AL/compta.lang
@@ -63,7 +63,7 @@ LT2SupplierES=IRPF purchases
LT2CustomerIN=SGST sales
LT2SupplierIN=SGST purchases
VATCollected=VAT collected
-ToPay=To pay
+StatusToPay=To pay
SpecialExpensesArea=Area for all special payments
SocialContribution=Social or fiscal tax
SocialContributions=Social or fiscal taxes
@@ -112,7 +112,7 @@ ShowVatPayment=Show VAT payment
TotalToPay=Total to pay
BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=vendor accounting code
+SupplierAccountancyCode=Vendor accounting code
CustomerAccountancyCodeShort=Cust. account. code
SupplierAccountancyCodeShort=Sup. account. code
AccountNumber=Account number
@@ -254,3 +254,4 @@ ByVatRate=By sale tax rate
TurnoverbyVatrate=Turnover invoiced by sale tax rate
TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
PurchasebyVatrate=Purchase by sale tax rate
+LabelToShow=Short label
diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang
index b070695736f..4edca737c66 100644
--- a/htdocs/langs/sq_AL/errors.lang
+++ b/htdocs/langs/sq_AL/errors.lang
@@ -117,7 +117,8 @@ ErrorLoginDoesNotExists=User with login %s could not be found.
ErrorLoginHasNoEmail=This user has no email address. Process aborted.
ErrorBadValueForCode=Bad value for security code. Try again with new value...
ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
-ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you want to add a discount line, just create the discount first with link %s on screen and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
+ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
ErrorWebServerUserHasNotPermission=User account %s used to execute web server has no permission for that
ErrorNoActivatedBarcode=No barcode type activated
@@ -224,6 +225,8 @@ ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to
ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
ErrorFieldRequiredForProduct=Field '%s' is required for product %s
+ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
+ErrorAddAtLeastOneLineFirst=Add at least one line first
# Warnings
WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/sq_AL/holiday.lang b/htdocs/langs/sq_AL/holiday.lang
index 315180b1ad6..fab4134627d 100644
--- a/htdocs/langs/sq_AL/holiday.lang
+++ b/htdocs/langs/sq_AL/holiday.lang
@@ -39,8 +39,10 @@ TypeOfLeaveId=Type of leave ID
TypeOfLeaveCode=Type of leave code
TypeOfLeaveLabel=Type of leave label
NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary.
NbUseDaysCPShort=Days consumed
NbUseDaysCPShortInMonth=Days consumed in month
+DayIsANonWorkingDay=%s is a non working day
DateStartInMonth=Start date in month
DateEndInMonth=End date in month
EditCP=Edit
diff --git a/htdocs/langs/sq_AL/install.lang b/htdocs/langs/sq_AL/install.lang
index 8d24b612db2..7f49a04dd2e 100644
--- a/htdocs/langs/sq_AL/install.lang
+++ b/htdocs/langs/sq_AL/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
PHPSupportCalendar=This PHP supports calendars extensions.
PHPSupportUTF8=This PHP supports UTF8 functions.
PHPSupportIntl=This PHP supports Intl functions.
+PHPSupport=This PHP supports %s functions.
PHPMemoryOK=Your PHP max session memory is set to %s. This should be enough.
PHPMemoryTooLow=Your PHP max session memory is set to %s bytes. This is too low. Change your php.ini to set memory_limit parameter to at least %s bytes.
Recheck=Click here for a more detailed test
@@ -25,6 +26,7 @@ ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
+ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
ErrorDirDoesNotExists=Directory %s does not exist.
ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang
index 1737847e9f0..c2c2d16f829 100644
--- a/htdocs/langs/sq_AL/main.lang
+++ b/htdocs/langs/sq_AL/main.lang
@@ -471,7 +471,7 @@ TotalDuration=Total duration
Summary=Summary
DolibarrStateBoard=Database Statistics
DolibarrWorkBoard=Open Items
-NoOpenedElementToProcess=No opened element to process
+NoOpenedElementToProcess=No open element to process
Available=Available
NotYetAvailable=Not yet available
NotAvailable=Not available
@@ -1005,7 +1005,7 @@ ContactDefault_contrat=Contract
ContactDefault_facture=Faturë
ContactDefault_fichinter=Intervention
ContactDefault_invoice_supplier=Supplier Invoice
-ContactDefault_order_supplier=Supplier Order
+ContactDefault_order_supplier=Purchase Order
ContactDefault_project=Project
ContactDefault_project_task=Task
ContactDefault_propal=Proposal
@@ -1013,3 +1013,6 @@ ContactDefault_supplier_proposal=Supplier Proposal
ContactDefault_ticketsup=Ticket
ContactAddedAutomatically=Contact added from contact thirdparty roles
More=More
+ShowDetails=Show details
+CustomReports=Custom reports
+SelectYourGraphOptionsFirst=Select your graph options to build a graph
diff --git a/htdocs/langs/sq_AL/modulebuilder.lang b/htdocs/langs/sq_AL/modulebuilder.lang
index 5e2ae72a85a..a79b4549045 100644
--- a/htdocs/langs/sq_AL/modulebuilder.lang
+++ b/htdocs/langs/sq_AL/modulebuilder.lang
@@ -83,7 +83,7 @@ ListOfDictionariesEntries=List of dictionaries entries
ListOfPermissionsDefined=List of defined permissions
SeeExamples=See examples here
EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:
preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
($user->rights->holiday->define_holiday ? 1 : 0)
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:
preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
($user->rights->holiday->define_holiday ? 1 : 0)
IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
@@ -135,3 +135,5 @@ CSSClass=CSS Class
NotEditable=Not editable
ForeignKey=Foreign key
TypeOfFieldsHelp=Type of fields:
varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
+AsciiToHtmlConverter=Ascii to HTML converter
+AsciiToPdfConverter=Ascii to PDF converter
diff --git a/htdocs/langs/sq_AL/mrp.lang b/htdocs/langs/sq_AL/mrp.lang
index ad612115268..11c6915a25c 100644
--- a/htdocs/langs/sq_AL/mrp.lang
+++ b/htdocs/langs/sq_AL/mrp.lang
@@ -54,12 +54,15 @@ ToConsume=To consume
ToProduce=To produce
QtyAlreadyConsumed=Qty already consumed
QtyAlreadyProduced=Qty already produced
+ConsumeOrProduce=Consume or Produce
ConsumeAndProduceAll=Consume and Produce All
Manufactured=Manufactured
TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
ForAQuantityOf1=For a quantity to produce of 1
ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
-ProductionForRefAndDate=Production %s - %s
+ProductionForRef=Production of %s
AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
NoStockChangeOnServices=No stock change on services
+ProductQtyToConsumeByMO=Product quantity still to consume by open MO
+ProductQtyToProduceByMO=Product quentity still to produce by open MO
diff --git a/htdocs/langs/sq_AL/orders.lang b/htdocs/langs/sq_AL/orders.lang
index 0fdc77ece9e..0e5aa8847fc 100644
--- a/htdocs/langs/sq_AL/orders.lang
+++ b/htdocs/langs/sq_AL/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Order date
OrderDateShort=Order date
OrderToProcess=Order to process
NewOrder=New order
+NewOrderSupplier=New Purchase Order
ToOrder=Make order
MakeOrder=Make order
SupplierOrder=Purchase order
@@ -25,6 +26,8 @@ OrdersToBill=Sales orders delivered
OrdersInProcess=Sales orders in process
OrdersToProcess=Sales orders to process
SuppliersOrdersToProcess=Purchase orders to process
+SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
+AwaitingReception=Awaiting reception
StatusOrderCanceledShort=Anulluar
StatusOrderDraftShort=Draft
StatusOrderValidatedShort=Validated
@@ -37,7 +40,6 @@ StatusOrderDeliveredShort=Delivered
StatusOrderToBillShort=Delivered
StatusOrderApprovedShort=Miratuar
StatusOrderRefusedShort=Refuzuar
-StatusOrderBilledShort=Billed
StatusOrderToProcessShort=To process
StatusOrderReceivedPartiallyShort=Partially received
StatusOrderReceivedAllShort=Products received
@@ -50,7 +52,6 @@ StatusOrderProcessed=Processed
StatusOrderToBill=Delivered
StatusOrderApproved=Miratuar
StatusOrderRefused=Refuzuar
-StatusOrderBilled=Billed
StatusOrderReceivedPartially=Partially received
StatusOrderReceivedAll=All products received
ShippingExist=A shipment exists
@@ -68,8 +69,9 @@ ValidateOrder=Validate order
UnvalidateOrder=Unvalidate order
DeleteOrder=Delete order
CancelOrder=Cancel order
-OrderReopened= Order %s Reopened
+OrderReopened= Order %s re-open
AddOrder=Create order
+AddPurchaseOrder=Create purchase order
AddToDraftOrders=Add to draft order
ShowOrder=Show order
OrdersOpened=Orders to process
@@ -139,10 +141,10 @@ OrderByEMail=Email
OrderByWWW=Online
OrderByPhone=Telefon
# Documents models
-PDFEinsteinDescription=A complete order model (logo...)
-PDFEratostheneDescription=A complete order model (logo...)
+PDFEinsteinDescription=A complete order model
+PDFEratostheneDescription=A complete order model
PDFEdisonDescription=A simple order model
-PDFProformaDescription=A complete proforma invoice (logo…)
+PDFProformaDescription=A complete Proforma invoice template
CreateInvoiceForThisCustomer=Bill orders
NoOrdersToInvoice=No orders billable
CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
@@ -152,7 +154,35 @@ OrderCreated=Your orders have been created
OrderFail=An error happened during your orders creation
CreateOrders=Create orders
ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
-OptionToSetOrderBilledNotEnabled=Option (from module Workflow) to set order to 'Billed' automatically when invoice is validated is off, so you will have to set status of order to 'Billed' manually.
+OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
-CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
+CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
SetShippingMode=Set shipping mode
+WithReceptionFinished=With reception finished
+#### supplier orders status
+StatusSupplierOrderCanceledShort=Anulluar
+StatusSupplierOrderDraftShort=Draft
+StatusSupplierOrderValidatedShort=Validated
+StatusSupplierOrderSentShort=Nё proces
+StatusSupplierOrderSent=Shipment in process
+StatusSupplierOrderOnProcessShort=Ordered
+StatusSupplierOrderProcessedShort=Processed
+StatusSupplierOrderDelivered=Delivered
+StatusSupplierOrderDeliveredShort=Delivered
+StatusSupplierOrderToBillShort=Delivered
+StatusSupplierOrderApprovedShort=Miratuar
+StatusSupplierOrderRefusedShort=Refuzuar
+StatusSupplierOrderToProcessShort=To process
+StatusSupplierOrderReceivedPartiallyShort=Partially received
+StatusSupplierOrderReceivedAllShort=Products received
+StatusSupplierOrderCanceled=Anulluar
+StatusSupplierOrderDraft=Draft (needs to be validated)
+StatusSupplierOrderValidated=Validated
+StatusSupplierOrderOnProcess=Ordered - Standby reception
+StatusSupplierOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusSupplierOrderProcessed=Processed
+StatusSupplierOrderToBill=Delivered
+StatusSupplierOrderApproved=Miratuar
+StatusSupplierOrderRefused=Refuzuar
+StatusSupplierOrderReceivedPartially=Partially received
+StatusSupplierOrderReceivedAll=All products received
diff --git a/htdocs/langs/sq_AL/other.lang b/htdocs/langs/sq_AL/other.lang
index ddebfe57bd7..ae6be6e116c 100644
--- a/htdocs/langs/sq_AL/other.lang
+++ b/htdocs/langs/sq_AL/other.lang
@@ -24,7 +24,7 @@ MessageOK=Message on the return page for a validated payment
MessageKO=Message on the return page for a canceled payment
ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
DeleteAlsoContentRecursively=Check to delete all content recursively
-
+PoweredBy=Powered by
YearOfInvoice=Year of invoice date
PreviousYearOfInvoice=Previous year of invoice date
NextYearOfInvoice=Following year of invoice date
@@ -104,7 +104,8 @@ DemoFundation=Manage members of a foundation
DemoFundation2=Manage members and bank account of a foundation
DemoCompanyServiceOnly=Company or freelance selling service only
DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
-DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
+DemoCompanyManufacturing=Company manufacturing products
DemoCompanyAll=Company with multiple activities (all main modules)
CreatedBy=Created by %s
ModifiedBy=Modified by %s
@@ -267,7 +268,7 @@ WEBSITE_PAGEURL=URL of page
WEBSITE_TITLE=Title
WEBSITE_DESCRIPTION=Përshkrimi
WEBSITE_IMAGE=Image
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITEKEY__ in the path if path depends on website name.
WEBSITE_KEYWORDS=Keywords
LinesToImport=Lines to import
diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang
index 6aaad99ccfc..715975d3239 100644
--- a/htdocs/langs/sq_AL/projects.lang
+++ b/htdocs/langs/sq_AL/projects.lang
@@ -77,7 +77,7 @@ MyProjectsArea=My projects Area
DurationEffective=Effective duration
ProgressDeclared=Declared progress
TaskProgressSummary=Task progress
-CurentlyOpenedTasks=Curently opened tasks
+CurentlyOpenedTasks=Curently open tasks
TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
ProgressCalculated=Calculated progress
@@ -249,9 +249,13 @@ TimeSpentForInvoice=Time spent
OneLinePerUser=One line per user
ServiceToUseOnLines=Service to use on lines
InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets).
+ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
ProjectFollowOpportunity=Follow opportunity
ProjectFollowTasks=Follow tasks
UsageOpportunity=Usage: Opportunity
UsageTasks=Usage: Tasks
UsageBillTimeShort=Usage: Bill time
+InvoiceToUse=Draft invoice to use
+NewInvoice=New invoice
+OneLinePerTask=One line per task
+OneLinePerPeriod=One line per period
diff --git a/htdocs/langs/sq_AL/propal.lang b/htdocs/langs/sq_AL/propal.lang
index 2dcccc80cc3..a41a73ab787 100644
--- a/htdocs/langs/sq_AL/propal.lang
+++ b/htdocs/langs/sq_AL/propal.lang
@@ -28,7 +28,7 @@ ShowPropal=Show proposal
PropalsDraft=Drafts
PropalsOpened=Hapur
PropalStatusDraft=Draft (needs to be validated)
-PropalStatusValidated=Validated (proposal is opened)
+PropalStatusValidated=Validated (proposal is open)
PropalStatusSigned=Signed (needs billing)
PropalStatusNotSigned=Not signed (closed)
PropalStatusBilled=Billed
@@ -76,10 +76,11 @@ TypeContact_propal_external_BILLING=Customer invoice contact
TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
TypeContact_propal_external_SHIPPING=Customer contact for delivery
# Document models
-DocModelAzurDescription=A complete proposal model (logo...)
-DocModelCyanDescription=A complete proposal model (logo...)
+DocModelAzurDescription=A complete proposal model
+DocModelCyanDescription=A complete proposal model
DefaultModelPropalCreate=Default model creation
DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
ProposalCustomerSignature=Written acceptance, company stamp, date and signature
ProposalsStatisticsSuppliers=Vendor proposals statistics
+CaseFollowedBy=Case followed by
diff --git a/htdocs/langs/sq_AL/stocks.lang b/htdocs/langs/sq_AL/stocks.lang
index 6c2009f74ab..8c0ecec7e14 100644
--- a/htdocs/langs/sq_AL/stocks.lang
+++ b/htdocs/langs/sq_AL/stocks.lang
@@ -143,6 +143,7 @@ InventoryCode=Movement or inventory code
IsInPackage=Contained into package
WarehouseAllowNegativeTransfer=Stock can be negative
qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
+qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
@@ -192,6 +193,7 @@ TheoricalQty=Theorique qty
TheoricalValue=Theorique qty
LastPA=Last BP
CurrentPA=Curent BP
+RecordedQty=Recorded Qty
RealQty=Real Qty
RealValue=Real Value
RegulatedQty=Regulated Qty
diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
index 0e6a39f87f5..9973d17ac4a 100644
--- a/htdocs/langs/sr_RS/admin.lang
+++ b/htdocs/langs/sr_RS/admin.lang
@@ -519,7 +519,7 @@ Module25Desc=Sales order management
Module30Name=Invoices
Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
Module40Name=Vendors
-Module40Desc=Vendors and purchase management (purchase orders and billing)
+Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
Module42Name=Debug Logs
Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
Module49Name=Editors
@@ -561,9 +561,9 @@ Module200Desc=LDAP directory synchronization
Module210Name=PostNuke
Module210Desc=PostNuke integration
Module240Name=Data exports
-Module240Desc=Tool to export Dolibarr data (with assistants)
+Module240Desc=Tool to export Dolibarr data (with assistance)
Module250Name=Data imports
-Module250Desc=Tool to import data into Dolibarr (with assistants)
+Module250Desc=Tool to import data into Dolibarr (with assistance)
Module310Name=Members
Module310Desc=Foundation members management
Module320Name=RSS Feed
@@ -878,7 +878,7 @@ Permission1251=Run mass imports of external data into database (data load)
Permission1321=Export customer invoices, attributes and payments
Permission1322=Reopen a paid bill
Permission1421=Export sales orders and attributes
-Permission2401=Read actions (events or tasks) linked to his user account (if owner of event)
+Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
Permission2411=Read actions (events or tasks) of others
@@ -1156,7 +1156,7 @@ NoEventOrNoAuditSetup=No security event has been logged. This is normal if Audit
NoEventFoundWithCriteria=No security event has been found for this search criteria.
SeeLocalSendMailSetup=See your local sendmail setup
BackupDesc=A complete backup of a Dolibarr installation requires two steps.
-BackupDesc2=Backup the contents of the "documents" directory (%s) containing all uploaded and generated files. This will also include all the dump files generated in Step 1.
+BackupDesc2=Backup the contents of the "documents" directory (%s) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
BackupDesc3=Backup the structure and contents of your database (%s) into a dump file. For this, you can use the following assistant.
BackupDescX=The archived directory should be stored in a secure place.
BackupDescY=The generated dump file should be stored in a secure place.
@@ -1167,6 +1167,7 @@ RestoreDesc3=Restore the database structure and data from a backup dump file int
RestoreMySQL=MySQL import
ForcedToByAModule= This rule is forced to %s by an activated module
PreviousDumpFiles=Existing backup files
+PreviousArchiveFiles=Existing archive files
WeekStartOnDay=First day of the week
RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user %s or you must add -W option at end of command line to provide %s password.
@@ -1248,6 +1249,7 @@ AskForPreferredShippingMethod=Ask for preferred shipping method for Third Partie
FieldEdition=Edition of field %s
FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
GetBarCode=Get barcode
+NumberingModules=Numbering models
##### Module password generation
PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
@@ -1711,8 +1713,9 @@ ChequeReceiptsNumberingModule=Check Receipts Numbering Module
MultiCompanySetup=Multi-company module setup
##### Suppliers #####
SuppliersSetup=Vendor module setup
-SuppliersCommandModel=Complete template of purchase order (logo...)
-SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
+SuppliersCommandModel=Complete template of Purchase Order
+SuppliersCommandModelMuscadet=Complete template of Purchase Order
+SuppliersInvoiceModel=Complete template of Vendor Invoice
SuppliersInvoiceNumberingModel=Vendor invoices numbering models
IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
##### GeoIPMaxmind #####
@@ -1762,9 +1765,10 @@ ListOfNotificationsPerUser=List of automatic notifications per user*
ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
ListOfFixedNotifications=List of automatic fixed notifications
GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
Threshold=Threshold
-BackupDumpWizard=Wizard to build the backup file
+BackupDumpWizard=Wizard to build the database dump file
+BackupZipWizard=Wizard to build the archive of documents directory
SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file %s to allow this feature.
@@ -1953,6 +1957,8 @@ SmallerThan=Smaller than
LargerThan=Larger than
IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
+EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set a value here to use this feature. Note that you must also use a read/write login account.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
EndPointFor=End point for %s : %s
DeleteEmailCollector=Delete email collector
ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
diff --git a/htdocs/langs/sr_RS/bills.lang b/htdocs/langs/sr_RS/bills.lang
index 2d99d31f047..cd171aac798 100644
--- a/htdocs/langs/sr_RS/bills.lang
+++ b/htdocs/langs/sr_RS/bills.lang
@@ -416,7 +416,7 @@ PaymentConditionShort14D=14 dana
PaymentCondition14D=14 dana
PaymentConditionShort14DENDMONTH=14 dana od kraja meseca
PaymentCondition14DENDMONTH=U roku od 14 dana od poslednjeg dana u tekućem mesecu
-FixAmount=Fixed amount
+FixAmount=Fixed amount - 1 line with label '%s'
VarAmount=Variable amount (%% tot.)
VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
# PaymentType
@@ -512,7 +512,7 @@ RevenueStamp=Revenue stamp
YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template
PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
diff --git a/htdocs/langs/sr_RS/categories.lang b/htdocs/langs/sr_RS/categories.lang
index d3f9258586e..07f917d4552 100644
--- a/htdocs/langs/sr_RS/categories.lang
+++ b/htdocs/langs/sr_RS/categories.lang
@@ -62,6 +62,7 @@ ContactCategoriesShort=Naziv/kategorija kontakata
AccountsCategoriesShort=Accounts tags/categories
ProjectsCategoriesShort=Projects tags/categories
UsersCategoriesShort=Users tags/categories
+StockCategoriesShort=Warehouse tags/categories
ThisCategoryHasNoProduct=Ova kategorija ne sadrži nijedan proizvod.
ThisCategoryHasNoSupplier=This category does not contain any vendor.
ThisCategoryHasNoCustomer=Ova kategorija ne sadrži nijednog kupca.
@@ -88,3 +89,6 @@ AddProductServiceIntoCategory=Dodaj sledeći proizvod/uslugu
ShowCategory=Prikaži naziv/kategoriju
ByDefaultInList=Podrazumevano u listi
ChooseCategory=Choose category
+StocksCategoriesArea=Warehouses Categories Area
+ActionCommCategoriesArea=Events Categories Area
+UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/sr_RS/companies.lang b/htdocs/langs/sr_RS/companies.lang
index 64387df339d..b3dc0d176c8 100644
--- a/htdocs/langs/sr_RS/companies.lang
+++ b/htdocs/langs/sr_RS/companies.lang
@@ -247,6 +247,12 @@ ProfId3US=-
ProfId4US=-
ProfId5US=-
ProfId6US=-
+ProfId1RO=Prof Id 1 (CUI)
+ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
+ProfId3RO=Prof Id 3 (CAEN)
+ProfId4RO=-
+ProfId5RO=Prof Id 5 (EUID)
+ProfId6RO=-
ProfId1RU=Prof Id 1 (OGRN)
ProfId2RU=Prof Id 2 (INN)
ProfId3RU=Prof Id 3 (KPP)
@@ -339,7 +345,7 @@ MyContacts=Moji kontakti
Capital=Kapital
CapitalOf=Kapital od %s
EditCompany=Izmeni kompaniju
-ThisUserIsNot=This user is not a prospect, customer nor vendor
+ThisUserIsNot=This user is not a prospect, customer or vendor
VATIntraCheck=Proveri
VATIntraCheckDesc=The VAT ID must include the country prefix. The link %s uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -406,6 +412,13 @@ AllocateCommercial=Assigned to sales representative
Organization=Organizacija
FiscalYearInformation=Fiscal Year
FiscalMonthStart=Prvi mesec fiskalne godine
+SocialNetworksInformation=Social networks
+SocialNetworksFacebookURL=Facebook URL
+SocialNetworksTwitterURL=Twitter URL
+SocialNetworksLinkedinURL=Linkedin URL
+SocialNetworksInstagramURL=Instagram URL
+SocialNetworksYoutubeURL=Youtube URL
+SocialNetworksGithubURL=Github URL
YouMustAssignUserMailFirst=You must create an email for this user prior to being able to add an email notification.
YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
ListSuppliersShort=List of Vendors
diff --git a/htdocs/langs/sr_RS/compta.lang b/htdocs/langs/sr_RS/compta.lang
index 61a8a412c17..6c862fdd0cc 100644
--- a/htdocs/langs/sr_RS/compta.lang
+++ b/htdocs/langs/sr_RS/compta.lang
@@ -63,7 +63,7 @@ LT2SupplierES=IRPF kupovina
LT2CustomerIN=SGST sales
LT2SupplierIN=SGST purchases
VATCollected=Prihodovani PDV
-ToPay=Za plaćanje
+StatusToPay=Za plaćanje
SpecialExpensesArea=Oblast za sve posebne uplate
SocialContribution=Socijalni i poreski trošak
SocialContributions=Socijalni i poreski troškovi
@@ -112,7 +112,7 @@ ShowVatPayment=Prikaži PDV uplatu
TotalToPay=Ukupno za uplatu
BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=vendor accounting code
+SupplierAccountancyCode=Vendor accounting code
CustomerAccountancyCodeShort=Rač. kod klijenta
SupplierAccountancyCodeShort=Rač. kod dobavljača
AccountNumber=Broj naloga
@@ -254,3 +254,4 @@ ByVatRate=By sale tax rate
TurnoverbyVatrate=Turnover invoiced by sale tax rate
TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
PurchasebyVatrate=Purchase by sale tax rate
+LabelToShow=Kratak naziv
diff --git a/htdocs/langs/sr_RS/errors.lang b/htdocs/langs/sr_RS/errors.lang
index a36a92ee61c..b65a9d5191f 100644
--- a/htdocs/langs/sr_RS/errors.lang
+++ b/htdocs/langs/sr_RS/errors.lang
@@ -117,7 +117,8 @@ ErrorLoginDoesNotExists=Korisnik %s nije pronađen.
ErrorLoginHasNoEmail=Korisnik nema mail adresu. Operacija otkazana.
ErrorBadValueForCode=Pogrešna vrednost za sigurnosni kod. Pokušajte ponovo sa novom vrednošću...
ErrorBothFieldCantBeNegative=Oba polja ne mogu oba biti negativna: %s i %s
-ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you want to add a discount line, just create the discount first with link %s on screen and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
+ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
ErrorQtyForCustomerInvoiceCantBeNegative=Količina za liniju na fakturi klijenta ne može biti negativna.
ErrorWebServerUserHasNotPermission=Korisnik %s nema prava za izvršavanje na web serveru
ErrorNoActivatedBarcode=Barcode tip nije aktiviran
@@ -224,6 +225,8 @@ ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to
ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
ErrorFieldRequiredForProduct=Field '%s' is required for product %s
+ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
+ErrorAddAtLeastOneLineFirst=Add at least one line first
# Warnings
WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
WarningPasswordSetWithNoAccount=Lozinka je podešena za ovog člana, ali korisnik nije kreiran. To znači da je lozinka sačuvana, ali se član ne može ulogovati na Dolibarr. Informaciju može koristiti neka eksterna komponenta, ali ako nemate potrebe da definišete korisnika/lozinku za članove, možete deaktivirati opciju "Upravljanje lozinkama za svakog člana" u podešavanjima modula Članovi. Ukoliko morate da kreirate login, ali Vam nije potrebna lozinka, ostavite ovo polje prazno da se ovo upozorenje ne bi prikazivalo. Napomena: email može biti korišćen kao login ako je član povezan sa korisnikom.
diff --git a/htdocs/langs/sr_RS/holiday.lang b/htdocs/langs/sr_RS/holiday.lang
index 39d356e03e1..b001e5f2437 100644
--- a/htdocs/langs/sr_RS/holiday.lang
+++ b/htdocs/langs/sr_RS/holiday.lang
@@ -39,8 +39,10 @@ TypeOfLeaveId=Type of leave ID
TypeOfLeaveCode=Type of leave code
TypeOfLeaveLabel=Type of leave label
NbUseDaysCP=Broj potrošenih dana od odmora
+NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary.
NbUseDaysCPShort=Days consumed
NbUseDaysCPShortInMonth=Days consumed in month
+DayIsANonWorkingDay=%s is a non working day
DateStartInMonth=Start date in month
DateEndInMonth=End date in month
EditCP=Izmeni
diff --git a/htdocs/langs/sr_RS/install.lang b/htdocs/langs/sr_RS/install.lang
index a4c5844df7d..357fbbe03ba 100644
--- a/htdocs/langs/sr_RS/install.lang
+++ b/htdocs/langs/sr_RS/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
PHPSupportCalendar=This PHP supports calendars extensions.
PHPSupportUTF8=This PHP supports UTF8 functions.
PHPSupportIntl=This PHP supports Intl functions.
+PHPSupport=This PHP supports %s functions.
PHPMemoryOK=Maksimalna memorija za sesije je %s. To bi trebalo biti dovoljno.
PHPMemoryTooLow=Your PHP max session memory is set to %s bytes. This is too low. Change your php.ini to set memory_limit parameter to at least %s bytes.
Recheck=Click here for a more detailed test
@@ -25,6 +26,7 @@ ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
+ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
ErrorDirDoesNotExists=Folder %s ne postoji.
ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
ErrorWrongValueForParameter=Verovatno ste uneli pogrešnu vrednost za parametar "%s"
diff --git a/htdocs/langs/sr_RS/main.lang b/htdocs/langs/sr_RS/main.lang
index 7aac7198dc8..da111188c02 100644
--- a/htdocs/langs/sr_RS/main.lang
+++ b/htdocs/langs/sr_RS/main.lang
@@ -471,7 +471,7 @@ TotalDuration=Ukupno trajanje
Summary=Rezime
DolibarrStateBoard=Database Statistics
DolibarrWorkBoard=Open Items
-NoOpenedElementToProcess=No opened element to process
+NoOpenedElementToProcess=No open element to process
Available=Dostupno
NotYetAvailable=Još uvek nedostupno
NotAvailable=Nedostupno
@@ -1005,7 +1005,7 @@ ContactDefault_contrat=Ugovor
ContactDefault_facture=Račun
ContactDefault_fichinter=Intervencija
ContactDefault_invoice_supplier=Supplier Invoice
-ContactDefault_order_supplier=Supplier Order
+ContactDefault_order_supplier=Purchase Order
ContactDefault_project=Projekat
ContactDefault_project_task=Zadatak
ContactDefault_propal=Ponuda
@@ -1013,3 +1013,6 @@ ContactDefault_supplier_proposal=Supplier Proposal
ContactDefault_ticketsup=Ticket
ContactAddedAutomatically=Contact added from contact thirdparty roles
More=More
+ShowDetails=Show details
+CustomReports=Custom reports
+SelectYourGraphOptionsFirst=Select your graph options to build a graph
diff --git a/htdocs/langs/sr_RS/orders.lang b/htdocs/langs/sr_RS/orders.lang
index fcd22b53171..81c0bc994b7 100644
--- a/htdocs/langs/sr_RS/orders.lang
+++ b/htdocs/langs/sr_RS/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Datum narudžbine
OrderDateShort=Datum porudžbine
OrderToProcess=Narudžbina za obradu
NewOrder=Nova narudžbina
+NewOrderSupplier=New Purchase Order
ToOrder=Kreiraj narudžbinu
MakeOrder=Kreiraj narudžbinu
SupplierOrder=Purchase order
@@ -25,6 +26,8 @@ OrdersToBill=Sales orders delivered
OrdersInProcess=Sales orders in process
OrdersToProcess=Sales orders to process
SuppliersOrdersToProcess=Purchase orders to process
+SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
+AwaitingReception=Awaiting reception
StatusOrderCanceledShort=Otkazano
StatusOrderDraftShort=Nacrt
StatusOrderValidatedShort=Odobreno
@@ -37,7 +40,6 @@ StatusOrderDeliveredShort=Isporučeno
StatusOrderToBillShort=Isporučeno
StatusOrderApprovedShort=Odobreno
StatusOrderRefusedShort=Odbijeno
-StatusOrderBilledShort=Naplaćeno
StatusOrderToProcessShort=Za obradu
StatusOrderReceivedPartiallyShort=Delimično primljeno
StatusOrderReceivedAllShort=Products received
@@ -50,7 +52,6 @@ StatusOrderProcessed=Obrađeno
StatusOrderToBill=Isporučeno
StatusOrderApproved=Odobreno
StatusOrderRefused=Odbijeno
-StatusOrderBilled=Naplaćeno
StatusOrderReceivedPartially=Delimično primljeno
StatusOrderReceivedAll=All products received
ShippingExist=Isporuka postoji
@@ -68,8 +69,9 @@ ValidateOrder=Odobri narudžbinu
UnvalidateOrder=Poništi odobrenje narudžbine
DeleteOrder=Obriši narudžbinu
CancelOrder=Otkaži narudžbinu
-OrderReopened= Narudžbina %s je ponovo otvorena
+OrderReopened= Order %s re-open
AddOrder=Kreiraj narudžbinu
+AddPurchaseOrder=Create purchase order
AddToDraftOrders=Dodaj draft narudžbini
ShowOrder=Pokaži narudžbinu
OrdersOpened=Narudžbine za obradu
@@ -139,10 +141,10 @@ OrderByEMail=Email
OrderByWWW=Online
OrderByPhone=Telefon
# Documents models
-PDFEinsteinDescription=Kompletan model narudžbine (logo...)
-PDFEratostheneDescription=Kompletan model narudžbine (logo...)
+PDFEinsteinDescription=A complete order model
+PDFEratostheneDescription=A complete order model
PDFEdisonDescription=Jednostavan model narudžbine
-PDFProformaDescription=Kompletan predračun (logo...)
+PDFProformaDescription=A complete Proforma invoice template
CreateInvoiceForThisCustomer=Naplata narudžbina
NoOrdersToInvoice=Nema naplativih narudžbina
CloseProcessedOrdersAutomatically=Označi sve selektovane narudžbine kao "Obrađene".
@@ -152,7 +154,35 @@ OrderCreated=Vaše narudžbine su kreirane
OrderFail=Došlo je do greške prilikom kreiranja Vaših narudžbina
CreateOrders=Kreiraj narudžbine
ToBillSeveralOrderSelectCustomer=Da biste kreirali fakturu za nekoliko narudžbina, prvo kliknite na klijenta, pa izaberite "%s"
-OptionToSetOrderBilledNotEnabled=Option (from module Workflow) to set order to 'Billed' automatically when invoice is validated is off, so you will have to set status of order to 'Billed' manually.
+OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
-CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
+CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
SetShippingMode=Set shipping mode
+WithReceptionFinished=With reception finished
+#### supplier orders status
+StatusSupplierOrderCanceledShort=Poništeno
+StatusSupplierOrderDraftShort=Nacrt
+StatusSupplierOrderValidatedShort=Potvrđen
+StatusSupplierOrderSentShort=U toku
+StatusSupplierOrderSent=Isporuka u toku
+StatusSupplierOrderOnProcessShort=Naručeno
+StatusSupplierOrderProcessedShort=Procesuirano
+StatusSupplierOrderDelivered=Isporučeno
+StatusSupplierOrderDeliveredShort=Isporučeno
+StatusSupplierOrderToBillShort=Isporučeno
+StatusSupplierOrderApprovedShort=Odobren
+StatusSupplierOrderRefusedShort=Odbijen
+StatusSupplierOrderToProcessShort=Za procesuiranje
+StatusSupplierOrderReceivedPartiallyShort=Delimično primljeno
+StatusSupplierOrderReceivedAllShort=Products received
+StatusSupplierOrderCanceled=Poništeno
+StatusSupplierOrderDraft=Nacrt (čeka na odobrenje)
+StatusSupplierOrderValidated=Potvrđen
+StatusSupplierOrderOnProcess=Naručeno - čeka se prijem
+StatusSupplierOrderOnProcessWithValidation=Naručeno - čeka se prijem ili odobrenje
+StatusSupplierOrderProcessed=Procesuirano
+StatusSupplierOrderToBill=Isporučeno
+StatusSupplierOrderApproved=Odobren
+StatusSupplierOrderRefused=Odbijen
+StatusSupplierOrderReceivedPartially=Delimično primljeno
+StatusSupplierOrderReceivedAll=All products received
diff --git a/htdocs/langs/sr_RS/other.lang b/htdocs/langs/sr_RS/other.lang
index 6bc27507fc0..31d8e3b3094 100644
--- a/htdocs/langs/sr_RS/other.lang
+++ b/htdocs/langs/sr_RS/other.lang
@@ -24,7 +24,7 @@ MessageOK=Message on the return page for a validated payment
MessageKO=Message on the return page for a canceled payment
ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
DeleteAlsoContentRecursively=Check to delete all content recursively
-
+PoweredBy=Powered by
YearOfInvoice=Year of invoice date
PreviousYearOfInvoice=Previous year of invoice date
NextYearOfInvoice=Following year of invoice date
@@ -104,7 +104,8 @@ DemoFundation=Upravljanje članovima fondacije
DemoFundation2=Upravljanje članovima i bankovnim računom fondacije
DemoCompanyServiceOnly=Company or freelance selling service only
DemoCompanyShopWithCashDesk=Upravljanje prodavnicom sa kasom
-DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
+DemoCompanyManufacturing=Company manufacturing products
DemoCompanyAll=Company with multiple activities (all main modules)
CreatedBy=Kreirao %s
ModifiedBy=Izmenio %s
@@ -267,7 +268,7 @@ WEBSITE_PAGEURL=URL stranice
WEBSITE_TITLE=Naslov
WEBSITE_DESCRIPTION=Opis
WEBSITE_IMAGE=Image
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITEKEY__ in the path if path depends on website name.
WEBSITE_KEYWORDS=Ključne reči
LinesToImport=Lines to import
diff --git a/htdocs/langs/sr_RS/projects.lang b/htdocs/langs/sr_RS/projects.lang
index 71926640dd4..2803813e68c 100644
--- a/htdocs/langs/sr_RS/projects.lang
+++ b/htdocs/langs/sr_RS/projects.lang
@@ -77,7 +77,7 @@ MyProjectsArea=Moja zona projekata
DurationEffective=Efektivno trajanje
ProgressDeclared=Prijavljeni napredak
TaskProgressSummary=Task progress
-CurentlyOpenedTasks=Curently opened tasks
+CurentlyOpenedTasks=Curently open tasks
TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
ProgressCalculated=Izračunati napredak
@@ -249,9 +249,13 @@ TimeSpentForInvoice=Provedeno vreme
OneLinePerUser=One line per user
ServiceToUseOnLines=Service to use on lines
InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets).
+ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
ProjectFollowOpportunity=Follow opportunity
ProjectFollowTasks=Follow tasks
UsageOpportunity=Usage: Opportunity
UsageTasks=Usage: Tasks
UsageBillTimeShort=Usage: Bill time
+InvoiceToUse=Draft invoice to use
+NewInvoice=Novi račun
+OneLinePerTask=One line per task
+OneLinePerPeriod=One line per period
diff --git a/htdocs/langs/sr_RS/propal.lang b/htdocs/langs/sr_RS/propal.lang
index 29e8be095de..1220ad99580 100644
--- a/htdocs/langs/sr_RS/propal.lang
+++ b/htdocs/langs/sr_RS/propal.lang
@@ -28,7 +28,7 @@ ShowPropal=Prikaži ponudu
PropalsDraft=Nacrt
PropalsOpened=Otvoreno
PropalStatusDraft=Nacrt (čeka odobrenje)
-PropalStatusValidated=Validated (proposal is opened)
+PropalStatusValidated=Odobrena (ponuda je otvorena)
PropalStatusSigned=Potpisana (za naplatu)
PropalStatusNotSigned=Nepotpisana (zatvorena)
PropalStatusBilled=Naplaćena
@@ -76,10 +76,11 @@ TypeContact_propal_external_BILLING=Kontakt sa računa klijenta
TypeContact_propal_external_CUSTOMER=Kontakt klijenta koji prati ponudu
TypeContact_propal_external_SHIPPING=Customer contact for delivery
# Document models
-DocModelAzurDescription=Kompletan model ponude (logo...)
-DocModelCyanDescription=Kompletan model ponude (logo...)
+DocModelAzurDescription=A complete proposal model
+DocModelCyanDescription=A complete proposal model
DefaultModelPropalCreate=Kreacija default modela
DefaultModelPropalToBill=Default model prilikom zatvaranja komercijalne ponude (za naplatu)
DefaultModelPropalClosed=Default model prilikom zatvaranja komercijalne ponude (nenaplaćen)
ProposalCustomerSignature=Pismeno odobrenje, pečat kompanije, datum i potpis
ProposalsStatisticsSuppliers=Vendor proposals statistics
+CaseFollowedBy=Case followed by
diff --git a/htdocs/langs/sr_RS/stocks.lang b/htdocs/langs/sr_RS/stocks.lang
index 2f4526281c4..adad9de00e3 100644
--- a/htdocs/langs/sr_RS/stocks.lang
+++ b/htdocs/langs/sr_RS/stocks.lang
@@ -143,6 +143,7 @@ InventoryCode=Promet ili inventarski kod
IsInPackage=Sadržan u paketu
WarehouseAllowNegativeTransfer=Stock can be negative
qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
+qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
ShowWarehouse=Prikaži magacin
MovementCorrectStock=Ispravka zalihe za proizvod %s
MovementTransferStock=Transfer zaliha proizvoda %s u drugi magacin
@@ -192,6 +193,7 @@ TheoricalQty=Theorique qty
TheoricalValue=Theorique qty
LastPA=Last BP
CurrentPA=Curent BP
+RecordedQty=Recorded Qty
RealQty=Real Qty
RealValue=Real Value
RegulatedQty=Regulated Qty
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index 0bce42d8d77..5ade1e31c95 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -519,7 +519,7 @@ Module25Desc=Försäljningsorderhantering
Module30Name=Fakturor
Module30Desc=Förvaltning av fakturor och kreditanteckningar för kunder. Förvaltning av fakturor och kreditanteckningar för leverantörer
Module40Name=Säljare
-Module40Desc=Leverantörer och inköpshantering (inköpsorder och fakturering)
+Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
Module42Name=Felsökningsloggar
Module42Desc=Loggningsfunktioner (fil, syslog, ...). Sådana loggar är för tekniska / debug-ändamål.
Module49Name=Redaktion
@@ -561,9 +561,9 @@ Module200Desc=LDAP-katalogsynkronisering
Module210Name=PostNuke
Module210Desc=PostNuke integration
Module240Name=Data export
-Module240Desc=Verktyg för att exportera Dolibarr-data (med assistenter)
+Module240Desc=Tool to export Dolibarr data (with assistance)
Module250Name=Data import
-Module250Desc=Verktyg för att importera data till Dolibarr (med assistenter)
+Module250Desc=Tool to import data into Dolibarr (with assistance)
Module310Name=Medlemmar
Module310Desc=Foundation i ledningen
Module320Name=RSS-flöde
@@ -878,7 +878,7 @@ Permission1251=Kör massiv import av externa data till databasen (data last)
Permission1321=Export kundfakturor, attribut och betalningar
Permission1322=Öppna en betald faktura igen
Permission1421=Exportera försäljningsorder och attribut
-Permission2401=Read actions (events or tasks) linked to his user account (if owner of event)
+Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
Permission2411=Läs åtgärder (händelser eller uppgifter) andras
@@ -1156,7 +1156,7 @@ NoEventOrNoAuditSetup=Ingen säkerhetshändelse har loggats. Detta är normalt o
NoEventFoundWithCriteria=Inga säkerhetshändelser har hittats för dessa sökkriterier.
SeeLocalSendMailSetup=Se din lokala sendmail inställning
BackupDesc=En komplett backup av en Dolibarr-installation kräver två steg.
-BackupDesc2=Säkerhetskopiera innehållet i "dokument" -katalogen ( %s ) som innehåller alla uppladdade och genererade filer. Detta kommer även att innehålla alla de dumpningsfiler som genereras i steg 1.
+BackupDesc2=Backup the contents of the "documents" directory (%s) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
BackupDesc3=Säkerhetskopiera strukturen och innehållet i din databas ( %s ) till en dumpfil. För detta kan du använda följande assistent.
BackupDescX=Den arkiverade katalogen ska lagras på ett säkert ställe.
BackupDescY=Den genererade dumpfilen bör förvaras på ett säkert ställe.
@@ -1167,6 +1167,7 @@ RestoreDesc3=Återställ databasstrukturen och data från en säkerhetskopiering
RestoreMySQL=MySQL import
ForcedToByAModule= Denna regel tvingas %s av en aktiverad modul
PreviousDumpFiles=Befintliga säkerhetskopieringsfiler
+PreviousArchiveFiles=Existing archive files
WeekStartOnDay=Första dagen i veckan
RunningUpdateProcessMayBeRequired=Att köra uppgraderingsprocessen verkar vara nödvändigt (Programversion %s skiljer sig från databasversionen %s)
YouMustRunCommandFromCommandLineAfterLoginToUser=Du måste köra det här kommandot från kommandoraden efter login till ett skal med användare %s.
@@ -1248,6 +1249,7 @@ AskForPreferredShippingMethod=Be om föredragen leveransmetod för tredje parter
FieldEdition=Edition av fält %s
FillThisOnlyIfRequired=Exempel: +2 (fyll endast om tidszon offset problem är erfarna)
GetBarCode=Få streckkod
+NumberingModules=Numbering models
##### Module password generation
PasswordGenerationStandard=Återgå ett lösenord som genererats enligt interna Dolibarr algoritm: 8 tecken som innehåller delade siffror och tecken med gemener.
PasswordGenerationNone=Föreslå inte ett genererat lösenord. Lösenordet måste skrivas in manuellt.
@@ -1711,8 +1713,9 @@ ChequeReceiptsNumberingModule=Kontrollera mottagningsnummereringsmodul
MultiCompanySetup=Multi-bolag modul inställning
##### Suppliers #####
SuppliersSetup=Inställning av leverantörsmodul
-SuppliersCommandModel=Komplett mall för inköpsorder (logotyp ...)
-SuppliersInvoiceModel=Komplett mall av leverantörsfaktura (logotyp ...)
+SuppliersCommandModel=Complete template of Purchase Order
+SuppliersCommandModelMuscadet=Complete template of Purchase Order
+SuppliersInvoiceModel=Complete template of Vendor Invoice
SuppliersInvoiceNumberingModel=Leverantörsfakturor nummereringsmodeller
IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
##### GeoIPMaxmind #####
@@ -1762,9 +1765,10 @@ ListOfNotificationsPerUser=List of automatic notifications per user*
ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
ListOfFixedNotifications=List of automatic fixed notifications
GoOntoUserCardToAddMore=Gå till fliken "Notifieringar" för en användare för att lägga till eller ta bort meddelanden för användare
-GoOntoContactCardToAddMore=Gå på fliken "Notifieringar" från en tredje part för att lägga till eller ta bort meddelanden för kontakter / adresser
+GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
Threshold=Tröskelvärde
-BackupDumpWizard=Trollkarl för att bygga säkerhetskopieringsfilen
+BackupDumpWizard=Wizard to build the database dump file
+BackupZipWizard=Wizard to build the archive of documents directory
SomethingMakeInstallFromWebNotPossible=Installation av extern modul är inte möjligt från webbgränssnittet av följande skäl:
SomethingMakeInstallFromWebNotPossible2=Av den anledningen är processen att uppgradera som beskrivs här en manuell process endast en privilegierad användare kan utföra.
InstallModuleFromWebHasBeenDisabledByFile=Installation av extern modul från ansökan har inaktiverats av administratören. Du måste be honom att ta bort filen% s för att tillåta denna funktion.
@@ -1953,6 +1957,8 @@ SmallerThan=Mindre än
LargerThan=Större än
IfTrackingIDFoundEventWillBeLinked=Observera att Om ett spårnings-ID finns i inkommande e-post, kopplas händelsen automatiskt till relaterade objekt.
WithGMailYouCanCreateADedicatedPassword=Med ett GMail-konto, om du aktiverade valet av 2 steg, rekommenderas att du skapar ett dedikerat andra lösenord för programmet istället för att använda ditt eget lösenordsord från https://myaccount.google.com/.
+EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set a value here to use this feature. Note that you must also use a read/write login account.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
EndPointFor=End point for %s : %s
DeleteEmailCollector=Delete email collector
ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang
index a069455078c..672e53691e7 100644
--- a/htdocs/langs/sv_SE/bills.lang
+++ b/htdocs/langs/sv_SE/bills.lang
@@ -416,7 +416,7 @@ PaymentConditionShort14D=14 dagar
PaymentCondition14D=14 dagar
PaymentConditionShort14DENDMONTH=14 dagar i månadsskiftet
PaymentCondition14DENDMONTH=Inom 14 dagar efter slutet av månaden
-FixAmount=Bestämd mängd
+FixAmount=Fixed amount - 1 line with label '%s'
VarAmount=Variabelt belopp (%% summa)
VarAmountOneLine=Variabel mängd (%% tot.) - 1 rad med etikett '%s'
# PaymentType
@@ -512,7 +512,7 @@ RevenueStamp=Intäkt stämpel
YouMustCreateInvoiceFromThird=Det här alternativet är endast tillgängligt när du skapar en faktura från fliken "Kund" från tredje part
YouMustCreateInvoiceFromSupplierThird=Det här alternativet är endast tillgängligt när du skapar en faktura från fliken "Leverantör" till tredje part
YouMustCreateStandardInvoiceFirstDesc=Du måste först skapa en standardfaktura och konvertera den till "mall" för att skapa en ny mallfaktura
-PDFCrabeDescription=Faktura modell Crabe. En fullständig faktura modell (Stöd moms alternativet, rabatter, betalningar villkor, logotyp, etc. ..)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template
PDFSpongeDescription=Faktura PDF mall Svamp. En komplett fakturamall
PDFCrevetteDescription=Faktura PDF-mall Crevette. En komplett faktura mall för lägesfakturor
TerreNumRefModelDesc1=Återger nummer med formatet %syymm-nnnn för standardfakturor och %syymm-NNNN för kreditnotor där yy är året, mm månaden och nnnn är en sekvens med ingen paus och ingen återgång till 0
diff --git a/htdocs/langs/sv_SE/categories.lang b/htdocs/langs/sv_SE/categories.lang
index 0052ad87a65..bc23355c4bb 100644
--- a/htdocs/langs/sv_SE/categories.lang
+++ b/htdocs/langs/sv_SE/categories.lang
@@ -7,7 +7,7 @@ NoCategoryYet=Ingen tagg / kategori av denna typ skapad
In=I
AddIn=Lägg till i
modify=modifiera
-Classify=Klassificera
+Classify=Märk
CategoriesArea=Taggar / kategorier område
ProductsCategoriesArea=Produkter / Tjänster taggar / kategorier område
SuppliersCategoriesArea=Leverantörer tags / kategorier område
@@ -62,6 +62,7 @@ ContactCategoriesShort=Kontakter taggar / kategorier
AccountsCategoriesShort=Kontokoder / kategorier
ProjectsCategoriesShort=Projekt taggar / kategorier
UsersCategoriesShort=Användare taggar / kategorier
+StockCategoriesShort=Warehouse tags/categories
ThisCategoryHasNoProduct=Denna kategori innehåller inte någon produkt.
ThisCategoryHasNoSupplier=Denna kategori innehåller ingen leverantör.
ThisCategoryHasNoCustomer=Denna kategori innehåller inte någon kund.
@@ -81,10 +82,13 @@ CatProdLinks=Länkar mellan produkter / tjänster och taggar / kategorier
CatProJectLinks=Länkar mellan projekt och taggar / kategorier
DeleteFromCat=Ta bort från taggar / kategori
ExtraFieldsCategories=Extra attibut
-CategoriesSetup=Taggar / kategorier setup
+CategoriesSetup=Taggar / kategorier inställning
CategorieRecursiv=Länk med moderkort / kategori automatiskt
CategorieRecursivHelp=Om alternativet är på, när du lägger till en produkt i en underkategori kommer produkten också att läggas till i kategorin förälder.
AddProductServiceIntoCategory=Lägg till följande produkt / tjänst
ShowCategory=Visa tagg / kategori
ByDefaultInList=Som standard i listan
ChooseCategory=Välj kategori
+StocksCategoriesArea=Warehouses Categories Area
+ActionCommCategoriesArea=Events Categories Area
+UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/sv_SE/companies.lang b/htdocs/langs/sv_SE/companies.lang
index c94ad9dae50..1061325c921 100644
--- a/htdocs/langs/sv_SE/companies.lang
+++ b/htdocs/langs/sv_SE/companies.lang
@@ -247,6 +247,12 @@ ProfId3US=-
ProfId4US=-
ProfId5US=-
ProfId6US=-
+ProfId1RO=Prof Id 1 (CUI)
+ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
+ProfId3RO=Prof Id 3 (CAEN)
+ProfId4RO=-
+ProfId5RO=Prof Id 5 (EUID)
+ProfId6RO=-
ProfId1RU=Prof Id 1 (OGRN)
ProfId2RU=Prof Id 2 (INN)
ProfId3RU=Prof Id 3 (KPP)
@@ -339,7 +345,7 @@ MyContacts=Mina kontakter
Capital=Kapital
CapitalOf=Kapital %s
EditCompany=Redigera företag
-ThisUserIsNot=Denna användare är inte en utsikter, kund eller leverantör
+ThisUserIsNot=This user is not a prospect, customer or vendor
VATIntraCheck=Kontrollera
VATIntraCheckDesc=Moms-ID måste innehålla land prefix. Länken %s använder den europeiska mervärdesskattjänsten (VIES) som kräver internetåtkomst från Dolibarr-servern.
VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -406,6 +412,13 @@ AllocateCommercial=Tilldelad försäljningsrepresentant
Organization=Organisation
FiscalYearInformation=Räkenskapsår
FiscalMonthStart=Första månad av verksamhetsåret
+SocialNetworksInformation=Social networks
+SocialNetworksFacebookURL=Facebook URL
+SocialNetworksTwitterURL=Twitter URL
+SocialNetworksLinkedinURL=Linkedin URL
+SocialNetworksInstagramURL=Instagram URL
+SocialNetworksYoutubeURL=Youtube URL
+SocialNetworksGithubURL=Github URL
YouMustAssignUserMailFirst=Du måste skapa ett mail för den här användaren innan du kan lägga till ett e-postmeddelande.
YouMustCreateContactFirst=För att kunna lägga till e-postmeddelanden måste du först definiera kontakter med giltiga e-postmeddelanden till tredjepart
ListSuppliersShort=Förteckning över leverantörer
diff --git a/htdocs/langs/sv_SE/compta.lang b/htdocs/langs/sv_SE/compta.lang
index c1db9089a98..18229edd1cf 100644
--- a/htdocs/langs/sv_SE/compta.lang
+++ b/htdocs/langs/sv_SE/compta.lang
@@ -63,7 +63,7 @@ LT2SupplierES=IRPF inköp
LT2CustomerIN=SGST-försäljningen
LT2SupplierIN=SGST-inköp
VATCollected=Momsintäkterna
-ToPay=Att betala
+StatusToPay=Att betala
SpecialExpensesArea=Område för alla special betalningar
SocialContribution=Social eller skattemässig skatt
SocialContributions=Sociala eller skattemässiga skatter
@@ -112,7 +112,7 @@ ShowVatPayment=Visa mervärdesskatteskäl
TotalToPay=Totalt att betala
BalanceVisibilityDependsOnSortAndFilters=Balans är endast synlig i den här listan om tabell sorteras stigande på %s och filtreras för 1 bankkonto
CustomerAccountancyCode=Kundbokföringskod
-SupplierAccountancyCode=leverantörens bokföringskod
+SupplierAccountancyCode=Vendor accounting code
CustomerAccountancyCodeShort=Cust. konto. koda
SupplierAccountancyCodeShort=Sup. konto. koda
AccountNumber=Kontonummer
@@ -254,3 +254,4 @@ ByVatRate=Med försäljningsskattesats
TurnoverbyVatrate=Omsättning fakturerad med försäljningsskattesats
TurnoverCollectedbyVatrate=Omsättning upptagen med försäljningsskattesats
PurchasebyVatrate=Inköp med försäljningsskattesats
+LabelToShow=Short label
diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index 53c75f45325..3aa31be0c07 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -117,7 +117,8 @@ ErrorLoginDoesNotExists=Användaren med inloggning %s kunde inte hittas.
ErrorLoginHasNoEmail=Denna användare har inga e-postadress. Process avbruten.
ErrorBadValueForCode=Dåligt värde typer för kod. Försök igen med ett nytt värde ...
ErrorBothFieldCantBeNegative=Fält %s och %s kan inte vara både negativt
-ErrorFieldCantBeNegativeOnInvoice=Fält %s kan inte vara negativt på denna typ av faktura. Om du vill lägga till en rabattlinje, skapa bara rabatten först med länken %s på skärmen och använd den på fakturan. Du kan också be din administratör om att ange alternativet FACTURE_ENABLE_NEGATIVE_LINES till 1 för att tillåta det gamla beteendet.
+ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
ErrorQtyForCustomerInvoiceCantBeNegative=Kvantitet för linje i kundfakturor kan inte vara negativt
ErrorWebServerUserHasNotPermission=Användarkonto %s användas för att exekvera webbserver har ingen behörighet för den
ErrorNoActivatedBarcode=Ingen streckkod typ aktiveras
@@ -224,6 +225,8 @@ ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to
ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
ErrorFieldRequiredForProduct=Field '%s' is required for product %s
+ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
+ErrorAddAtLeastOneLineFirst=Add at least one line first
# Warnings
WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
WarningPasswordSetWithNoAccount=Ett lösenord har ställts för den här medlemmen. Men inget användarkonto skapades. Så det här lösenordet är lagrat men kan inte användas för att logga in till Dolibarr. Den kan användas av en extern modul / gränssnitt men om du inte behöver definiera någon inloggning eller ett lösenord för en medlem kan du inaktivera alternativet "Hantera en inloggning för varje medlem" från inställningen av medlemsmodulen. Om du behöver hantera en inloggning men inte behöver något lösenord, kan du hålla fältet tomt för att undvika denna varning. Obs! Email kan också användas som inloggning om medlemmen är länkad till en användare.
diff --git a/htdocs/langs/sv_SE/holiday.lang b/htdocs/langs/sv_SE/holiday.lang
index d874b727b7f..938b8db59ef 100644
--- a/htdocs/langs/sv_SE/holiday.lang
+++ b/htdocs/langs/sv_SE/holiday.lang
@@ -39,8 +39,10 @@ TypeOfLeaveId=Typ av ledighet ID
TypeOfLeaveCode=Typ av ledighetskod
TypeOfLeaveLabel=Typ av lämnad etikett
NbUseDaysCP=Antal dagars semester konsumeras
+NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary.
NbUseDaysCPShort=Dagar konsumeras
NbUseDaysCPShortInMonth=Dagar konsumeras i månaden
+DayIsANonWorkingDay=%s is a non working day
DateStartInMonth=Startdatum i månaden
DateEndInMonth=Slutdatum i månaden
EditCP=Redigera
diff --git a/htdocs/langs/sv_SE/install.lang b/htdocs/langs/sv_SE/install.lang
index cad414de9af..433315fad2f 100644
--- a/htdocs/langs/sv_SE/install.lang
+++ b/htdocs/langs/sv_SE/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=Detta PHP stöder Curl.
PHPSupportCalendar=This PHP supports calendars extensions.
PHPSupportUTF8=Detta PHP stöder UTF8 funktioner.
PHPSupportIntl=Detta PHP stöder Intl-funktioner.
+PHPSupport=This PHP supports %s functions.
PHPMemoryOK=Din PHP max session minne är inställt på %s. Detta bör vara nog.
PHPMemoryTooLow=Ditt PHP max-sessionminne är inställt på %s bytes. Detta är för lågt. Ändra din php.ini för att ställa in memory_limit parameter till minst %s bytes.
Recheck=Klicka här för ett mer detaljerat test
@@ -25,6 +26,7 @@ ErrorPHPDoesNotSupportCurl=Din PHP-installation stöder inte Curl.
ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
ErrorPHPDoesNotSupportUTF8=Din PHP-installation stöder inte UTF8-funktioner. Dolibarr kan inte fungera korrekt. Lös det här innan du installerar Dolibarr.
ErrorPHPDoesNotSupportIntl=Din PHP-installation stöder inte Intl-funktioner.
+ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
ErrorDirDoesNotExists=Nummer %s finns inte.
ErrorGoBackAndCorrectParameters=Gå tillbaka och kontrollera / korrigera parametrarna.
ErrorWrongValueForParameter=Du kan ha skrivit fel värde för parametern "%s".
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index f2d678fa4f7..f3768dcf8ed 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -471,7 +471,7 @@ TotalDuration=Total längd
Summary=Sammanfattning
DolibarrStateBoard=Databasstatistik
DolibarrWorkBoard=Öppna föremål
-NoOpenedElementToProcess=Inget öppet element att bearbeta
+NoOpenedElementToProcess=No open element to process
Available=Tillgängliga
NotYetAvailable=Ännu inte tillgängligt
NotAvailable=Inte tillgänglig
@@ -1005,7 +1005,7 @@ ContactDefault_contrat=Kontrakt
ContactDefault_facture=Faktura
ContactDefault_fichinter=Insats
ContactDefault_invoice_supplier=Supplier Invoice
-ContactDefault_order_supplier=Supplier Order
+ContactDefault_order_supplier=Purchase Order
ContactDefault_project=Projekt
ContactDefault_project_task=Uppgift
ContactDefault_propal=Förslag
@@ -1013,3 +1013,6 @@ ContactDefault_supplier_proposal=Supplier Proposal
ContactDefault_ticketsup=Ticket
ContactAddedAutomatically=Contact added from contact thirdparty roles
More=More
+ShowDetails=Show details
+CustomReports=Custom reports
+SelectYourGraphOptionsFirst=Select your graph options to build a graph
diff --git a/htdocs/langs/sv_SE/modulebuilder.lang b/htdocs/langs/sv_SE/modulebuilder.lang
index 734d5ce3b8f..cc7bc6169ad 100644
--- a/htdocs/langs/sv_SE/modulebuilder.lang
+++ b/htdocs/langs/sv_SE/modulebuilder.lang
@@ -83,7 +83,7 @@ ListOfDictionariesEntries=List of dictionaries entries
ListOfPermissionsDefined=Lista över definierade behörigheter
SeeExamples=Se exempel här
EnabledDesc=Villkor att ha detta fält aktivt (Exempel: 1 eller $ conf-> global-> MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:
preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
($user->rights->holiday->define_holiday ? 1 : 0)
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:
preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
($user->rights->holiday->define_holiday ? 1 : 0)
IsAMeasureDesc=Kan värdet av fält ackumuleras för att få en total i listan? (Exempel: 1 eller 0)
SearchAllDesc=Är fältet används för att göra en sökning från snabbsökningsverktyget? (Exempel: 1 eller 0)
SpecDefDesc=Ange här all dokumentation du vill ge med din modul som inte redan är definierad av andra flikar. Du kan använda .md eller bättre, den rika .asciidoc-syntaxen.
@@ -135,3 +135,5 @@ CSSClass=CSS Class
NotEditable=Not editable
ForeignKey=Foreign key
TypeOfFieldsHelp=Type of fields:
varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
+AsciiToHtmlConverter=Ascii to HTML converter
+AsciiToPdfConverter=Ascii to PDF converter
diff --git a/htdocs/langs/sv_SE/mrp.lang b/htdocs/langs/sv_SE/mrp.lang
index cbbbe1359cd..7a91f262b9d 100644
--- a/htdocs/langs/sv_SE/mrp.lang
+++ b/htdocs/langs/sv_SE/mrp.lang
@@ -54,12 +54,15 @@ ToConsume=To consume
ToProduce=To produce
QtyAlreadyConsumed=Qty already consumed
QtyAlreadyProduced=Qty already produced
+ConsumeOrProduce=Consume or Produce
ConsumeAndProduceAll=Consume and Produce All
Manufactured=Manufactured
TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
ForAQuantityOf1=For a quantity to produce of 1
ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
-ProductionForRefAndDate=Production %s - %s
+ProductionForRef=Production of %s
AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
NoStockChangeOnServices=No stock change on services
+ProductQtyToConsumeByMO=Product quantity still to consume by open MO
+ProductQtyToProduceByMO=Product quentity still to produce by open MO
diff --git a/htdocs/langs/sv_SE/orders.lang b/htdocs/langs/sv_SE/orders.lang
index 0335bf85c99..089b388185c 100644
--- a/htdocs/langs/sv_SE/orders.lang
+++ b/htdocs/langs/sv_SE/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Beställ datum
OrderDateShort=Beställ datum
OrderToProcess=Att kunna bearbeta
NewOrder=Ny order
+NewOrderSupplier=New Purchase Order
ToOrder=Gör så
MakeOrder=Gör så
SupplierOrder=Inköpsorder
@@ -25,9 +26,11 @@ OrdersToBill=Försäljningsorder levereras
OrdersInProcess=Försäljningsorder pågår
OrdersToProcess=Försäljningsorder att bearbeta
SuppliersOrdersToProcess=Köp beställningar att bearbeta
+SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
+AwaitingReception=Awaiting reception
StatusOrderCanceledShort=Annullerad
StatusOrderDraftShort=Förslag
-StatusOrderValidatedShort=Validerad
+StatusOrderValidatedShort=Bekräftat
StatusOrderSentShort=I processen
StatusOrderSent=Sändning pågår
StatusOrderOnProcessShort=Beställda
@@ -37,20 +40,18 @@ StatusOrderDeliveredShort=Till Bill
StatusOrderToBillShort=Till Bill
StatusOrderApprovedShort=Godkänd
StatusOrderRefusedShort=Refused
-StatusOrderBilledShort=Fakturerade
StatusOrderToProcessShort=För att kunna behandla
StatusOrderReceivedPartiallyShort=Delvis fått
StatusOrderReceivedAllShort=Mottagna produkter
StatusOrderCanceled=Annullerad
-StatusOrderDraft=Utkast (måste valideras)
-StatusOrderValidated=Validerad
+StatusOrderDraft=Utkast (måste bekräftas)
+StatusOrderValidated=Bekräftat
StatusOrderOnProcess=Beställda, väntar på inleverans
-StatusOrderOnProcessWithValidation=Beställd - Avvakter mottagning eller validering
+StatusOrderOnProcessWithValidation=Beställd - Avvakter mottagning eller bekräftande
StatusOrderProcessed=Bearbetade
StatusOrderToBill=Till Bill
StatusOrderApproved=Godkänd
StatusOrderRefused=Refused
-StatusOrderBilled=Fakturerade
StatusOrderReceivedPartially=Delvis fått
StatusOrderReceivedAll=Alla produkter mottagna
ShippingExist=En sändning föreligger
@@ -65,11 +66,12 @@ RefuseOrder=Vägra att
ApproveOrder=Godkänn beställning
Approve2Order=Godkänn order (andra nivån)
ValidateOrder=Verifiera att
-UnvalidateOrder=Unvalidate För
+UnvalidateOrder=Märka ordrar från bekräftat->utkast
DeleteOrder=Radera order
CancelOrder=Avbryt för
-OrderReopened= Beställ %s Återöppnad
+OrderReopened= Order %s re-open
AddOrder=Skapa order
+AddPurchaseOrder=Create purchase order
AddToDraftOrders=Lägg till förlags order
ShowOrder=Visa att
OrdersOpened=Beställer att bearbeta
@@ -90,12 +92,12 @@ ListOfOrders=Lista över beställningar
CloseOrder=Stäng order
ConfirmCloseOrder=Är du säker på att du vill ställa in den här beställningen att levereras? När en beställning har levererats kan den ställas in för fakturering.
ConfirmDeleteOrder=Är du säker på att du vill radera den här beställningen?
-ConfirmValidateOrder=Är du säker på att du vill validera denna order under namnet %s ?
+ConfirmValidateOrder=Är du säker på att du vill bekräfta denna order under namnet %s ?
ConfirmUnvalidateOrder=Är du säker på att du vill återställa ordningen %s till utkastsstatus?
ConfirmCancelOrder=Är du säker på att du vill avbryta denna order?
ConfirmMakeOrder=Är du säker på att du vill bekräfta att du har gjort denna order på %s ?
GenerateBill=Skapa faktura
-ClassifyShipped=Klassificera levereras
+ClassifyShipped=Märk levererad
DraftOrders=Förslag till beslut
DraftSuppliersOrders=Utkast till beställningar
OnProcessOrders=I processen order
@@ -139,20 +141,48 @@ OrderByEMail=epost
OrderByWWW=Nätet
OrderByPhone=Telefonen
# Documents models
-PDFEinsteinDescription=En fullständig för-modellen (logo. ..)
-PDFEratostheneDescription=En fullständig för-modellen (logo. ..)
+PDFEinsteinDescription=A complete order model
+PDFEratostheneDescription=A complete order model
PDFEdisonDescription=En enkel ordermodell
-PDFProformaDescription=En fullständig proforma faktura (logo ...)
+PDFProformaDescription=A complete Proforma invoice template
CreateInvoiceForThisCustomer=Faktura order
NoOrdersToInvoice=Inga order fakturerbar
-CloseProcessedOrdersAutomatically=Klassificera "bearbetade" alla valda order.
+CloseProcessedOrdersAutomatically=Märk "bearbetade" alla valda order.
OrderCreation=Order skapning
Ordered=Beställt
OrderCreated=Din order har skapats
OrderFail=Ett fel inträffade under din order skapande
CreateOrders=Skapa order
ToBillSeveralOrderSelectCustomer=För att skapa en faktura för flera ordrar, klicka först på kunden och välj sedan "%s".
-OptionToSetOrderBilledNotEnabled=Alternativ (från modul Workflow) för att ställa in order att "Fakturas" automatiskt när fakturan är validerad är avstängd, så du måste ställa in orderstatus till "Fakturerade" manuellt.
-IfValidateInvoiceIsNoOrderStayUnbilled=Om fakturatvalidering är 'Nej', fortsätter ordern till status 'Unbilled' tills fakturan är validerad.
-CloseReceivedSupplierOrdersAutomatically=Stäng beställningen till "%s" automatiskt om alla produkter är mottagna.
+OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
+IfValidateInvoiceIsNoOrderStayUnbilled=Om fakturatbekräftande är 'Nej', fortsätter ordern till status 'Unbilled' tills fakturan är bekräftat.
+CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
SetShippingMode=Ställ in fraktläge
+WithReceptionFinished=With reception finished
+#### supplier orders status
+StatusSupplierOrderCanceledShort=Annullerad
+StatusSupplierOrderDraftShort=Utkast
+StatusSupplierOrderValidatedShort=Bekräftade
+StatusSupplierOrderSentShort=I processen
+StatusSupplierOrderSent=Sändning pågår
+StatusSupplierOrderOnProcessShort=Beställda
+StatusSupplierOrderProcessedShort=Bearbetad
+StatusSupplierOrderDelivered=Till Bill
+StatusSupplierOrderDeliveredShort=Till Bill
+StatusSupplierOrderToBillShort=Till Bill
+StatusSupplierOrderApprovedShort=Godkänd
+StatusSupplierOrderRefusedShort=Refused
+StatusSupplierOrderToProcessShort=För att kunna behandla
+StatusSupplierOrderReceivedPartiallyShort=Delvis fått
+StatusSupplierOrderReceivedAllShort=Products received
+StatusSupplierOrderCanceled=Annullerad
+StatusSupplierOrderDraft=Utkast (måste bekräftas)
+StatusSupplierOrderValidated=Bekräftade
+StatusSupplierOrderOnProcess=Beställda, väntar på inleverans
+StatusSupplierOrderOnProcessWithValidation=Beställd - Avvakter mottagning eller bekräftande
+StatusSupplierOrderProcessed=Bearbetad
+StatusSupplierOrderToBill=Till Bill
+StatusSupplierOrderApproved=Godkänd
+StatusSupplierOrderRefused=Refused
+StatusSupplierOrderReceivedPartially=Delvis fått
+StatusSupplierOrderReceivedAll=Alla produkter mottagna
diff --git a/htdocs/langs/sv_SE/other.lang b/htdocs/langs/sv_SE/other.lang
index 9e7e4bf3b58..28a1f847833 100644
--- a/htdocs/langs/sv_SE/other.lang
+++ b/htdocs/langs/sv_SE/other.lang
@@ -24,7 +24,7 @@ MessageOK=Meddelande på retursidan för en bekräftat betalning
MessageKO=Meddelande på retursidan för en avbokad betalning
ContentOfDirectoryIsNotEmpty=Innehållet i den här katalogen är inte tomt.
DeleteAlsoContentRecursively=Kontrollera att allt innehåll rekursivt raderas
-
+PoweredBy=Powered by
YearOfInvoice=År för fakturadatum
PreviousYearOfInvoice=Föregående år av fakturadatum
NextYearOfInvoice=Följande år med fakturadatum
@@ -104,7 +104,8 @@ DemoFundation=Hantera medlemmar av en stiftelse
DemoFundation2=Hantera medlemmar och bankkonto i en stiftelse
DemoCompanyServiceOnly=Endast företag eller frilansförsäljning
DemoCompanyShopWithCashDesk=Hantera en butik med en kassa
-DemoCompanyProductAndStocks=Företag som säljer produkter med en butik
+DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
+DemoCompanyManufacturing=Company manufacturing products
DemoCompanyAll=Företag med flera aktiviteter (alla huvudmoduler)
CreatedBy=Skapad av %s
ModifiedBy=Uppdaterad av %s
@@ -267,7 +268,7 @@ WEBSITE_PAGEURL=Webbadressen
WEBSITE_TITLE=Titel
WEBSITE_DESCRIPTION=Beskrivning
WEBSITE_IMAGE=Bild
-WEBSITE_IMAGEDesc=Relativ sökväg i bildmediet. Du kan hålla det tomt eftersom det här sällan används (det kan användas av dynamiskt innehåll för att visa en förhandsgranskning av en lista med blogginlägg).
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITEKEY__ in the path if path depends on website name.
WEBSITE_KEYWORDS=Nyckelord
LinesToImport=Rader att importera
diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang
index 5b8d2ff9e44..b894753691e 100644
--- a/htdocs/langs/sv_SE/projects.lang
+++ b/htdocs/langs/sv_SE/projects.lang
@@ -77,7 +77,7 @@ MyProjectsArea=Mina projektområde
DurationEffective=Effektiv längd
ProgressDeclared=Förklarades framsteg
TaskProgressSummary=Task progress
-CurentlyOpenedTasks=Curently opened tasks
+CurentlyOpenedTasks=Curently open tasks
TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
ProgressCalculated=Beräknat framsteg
@@ -249,9 +249,13 @@ TimeSpentForInvoice=Tid
OneLinePerUser=En rad per användare
ServiceToUseOnLines=Service att använda på linjer
InvoiceGeneratedFromTimeSpent=Faktura %s har genererats från tid till projekt
-ProjectBillTimeDescription=Kontrollera om du anger tidtabell för projektuppgifter OCH du planerar att generera faktura (er) från tidtabellen för att debitera kunden för projektet (kontrollera inte om du planerar att skapa en faktura som inte är baserad på angivna tidtabeller).
+ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
ProjectFollowOpportunity=Follow opportunity
ProjectFollowTasks=Follow tasks
UsageOpportunity=Usage: Opportunity
UsageTasks=Usage: Tasks
UsageBillTimeShort=Usage: Bill time
+InvoiceToUse=Draft invoice to use
+NewInvoice=Ny faktura
+OneLinePerTask=One line per task
+OneLinePerPeriod=One line per period
diff --git a/htdocs/langs/sv_SE/propal.lang b/htdocs/langs/sv_SE/propal.lang
index 294cc9e58fb..7dac5a9f015 100644
--- a/htdocs/langs/sv_SE/propal.lang
+++ b/htdocs/langs/sv_SE/propal.lang
@@ -3,7 +3,7 @@ Proposals=Kommersiella förslag
Proposal=Kommersiella förslag
ProposalShort=Förslag
ProposalsDraft=Utkast till kommersiella förslag
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=Öppna kommersiella förslag
CommercialProposal=Kommersiella förslag
PdfCommercialProposalTitle=Kommersiella förslag
ProposalCard=Förslaget kortet
@@ -11,29 +11,29 @@ NewProp=Nya kommersiella förslag
NewPropal=Nytt förslag
Prospect=Prospect
DeleteProp=Ta bort kommersiella förslag
-ValidateProp=Validate kommersiella förslag
+ValidateProp=Bekräfta kommersiella förslag
AddProp=Skapa förslag
-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
+ConfirmDeleteProp=Är du säker på att du vill radera det här kommersiella förslaget?
+ConfirmValidateProp=Är du säker på att du vill bekräfta detta kommersiella förslag under namnet %s ?
+LastPropals=Senaste %s-förslagen
LastModifiedProposals=Senaste %s ändrade förslag
AllPropals=Alla förslag
SearchAProposal=Sök ett förslag
-NoProposal=No proposal
+NoProposal=Inget förslag
ProposalsStatistics=Kommersiella förslag statistik
NumberOfProposalsByMonth=Antal per månad
-AmountOfProposalsByMonthHT=Amount by month (excl. tax)
+AmountOfProposalsByMonthHT=Belopp per månad (exkl. skatt)
NbOfProposals=Antal kommersiella förslag
ShowPropal=Visa förslag
PropalsDraft=Utkast
PropalsOpened=Öppen
-PropalStatusDraft=Utkast (måste valideras)
-PropalStatusValidated=Validated (proposal is opened)
+PropalStatusDraft=Utkast (måste bekräftas)
+PropalStatusValidated=Validerad (förslag är öppen)
PropalStatusSigned=Undertecknats (behov fakturering)
PropalStatusNotSigned=Inte undertecknat (stängt)
PropalStatusBilled=Fakturerade
PropalStatusDraftShort=Förslag
-PropalStatusValidatedShort=Validated (open)
+PropalStatusValidatedShort=Bekräftat (öppen)
PropalStatusClosedShort=Stängt
PropalStatusSignedShort=Signerad
PropalStatusNotSignedShort=Inte undertecknat
@@ -47,17 +47,17 @@ SendPropalByMail=Skicka kommersiella förslag per post
DatePropal=Datum för förslag
DateEndPropal=Datum sista giltighetsdag
ValidityDuration=Giltighet varaktighet
-CloseAs=Set status to
-SetAcceptedRefused=Set accepted/refused
+CloseAs=Ställ in status till
+SetAcceptedRefused=Set accepterad / vägrad
ErrorPropalNotFound=Propal %s hittades inte
AddToDraftProposals=Lägg till förslagsutkast
NoDraftProposals=Inga förslagsutkast
CopyPropalFrom=Skapa kommersiella förslag genom att kopiera befintliga förslaget
-CreateEmptyPropal=Create empty commercial proposal or from list of products/services
+CreateEmptyPropal=Skapa tomt kommersiellt förslag eller från listan över produkter / tjänster
DefaultProposalDurationValidity=Standard kommersiella förslag giltighet längd (i dagar)
-UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
-ConfirmClonePropal=Are you sure you want to clone the commercial proposal %s?
-ConfirmReOpenProp=Are you sure you want to open back the commercial proposal %s?
+UseCustomerContactAsPropalRecipientIfExist=Använd kontakt / adress med typ "Kontakt efterföljande förslag" om det definieras i stället för tredjepartsadress som mottagaradress för förslag
+ConfirmClonePropal=Är du säker på att du vill klona det kommersiella förslaget %s ?
+ConfirmReOpenProp=Är du säker på att du vill öppna tillbaka det kommersiella förslaget %s ?
ProposalsAndProposalsLines=Kommersiella förslag och linjer
ProposalLine=Förslag linje
AvailabilityPeriod=Tillgänglighet fördröjning
@@ -74,12 +74,13 @@ AvailabilityTypeAV_1M=1 månad
TypeContact_propal_internal_SALESREPFOLL=Representanten följa upp förslag
TypeContact_propal_external_BILLING=Kundfaktura kontakt
TypeContact_propal_external_CUSTOMER=Kundkontakt följa upp förslag
-TypeContact_propal_external_SHIPPING=Customer contact for delivery
+TypeContact_propal_external_SHIPPING=Kundkontakt för leverans
# Document models
-DocModelAzurDescription=Ett fullständigt förslag modell (logo. ..)
-DocModelCyanDescription=Ett fullständigt förslag modell (logo. ..)
+DocModelAzurDescription=A complete proposal model
+DocModelCyanDescription=A complete proposal model
DefaultModelPropalCreate=Skapa standardmodell
DefaultModelPropalToBill=Standardmall när ett affärsförslag sluts (att fakturera)
DefaultModelPropalClosed=Standardmall när ett affärsförslag sluts (ofakturerat)
-ProposalCustomerSignature=Written acceptance, company stamp, date and signature
-ProposalsStatisticsSuppliers=Vendor proposals statistics
+ProposalCustomerSignature=Skriftligt godkännande, företagsstämpel, datum och signatur
+ProposalsStatisticsSuppliers=Statistik för leverantörsförslag
+CaseFollowedBy=Case followed by
diff --git a/htdocs/langs/sv_SE/stocks.lang b/htdocs/langs/sv_SE/stocks.lang
index 07cf69b1952..85e246557bb 100644
--- a/htdocs/langs/sv_SE/stocks.lang
+++ b/htdocs/langs/sv_SE/stocks.lang
@@ -143,6 +143,7 @@ InventoryCode=Lagerrörelse- eller inventeringskod
IsInPackage=Ingår i förpackning
WarehouseAllowNegativeTransfer=Lager kan vara negativt
qtyToTranferIsNotEnough=Du har inte tillräckligt med lager från ditt källlager och din inställning tillåter inte negativa bestånd.
+qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
ShowWarehouse=Visa lagret
MovementCorrectStock=Lagerkorrigering för produkt %s
MovementTransferStock=Lagerförflyttning av produkt %s till ett annat lager
@@ -192,6 +193,7 @@ TheoricalQty=Teoretisk mängd
TheoricalValue=Teoretisk mängd
LastPA=Senaste BP
CurrentPA=Curent BP
+RecordedQty=Recorded Qty
RealQty=Verklig antal
RealValue=Riktigt värde
RegulatedQty=Reglerad mängd
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index 7989f355378..ee21120b982 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -519,7 +519,7 @@ Module25Desc=Sales order management
Module30Name=Invoices
Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
Module40Name=Vendors
-Module40Desc=Vendors and purchase management (purchase orders and billing)
+Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
Module42Name=Debug Logs
Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
Module49Name=Editors
@@ -561,9 +561,9 @@ Module200Desc=LDAP directory synchronization
Module210Name=PostNuke
Module210Desc=PostNuke integration
Module240Name=Data exports
-Module240Desc=Tool to export Dolibarr data (with assistants)
+Module240Desc=Tool to export Dolibarr data (with assistance)
Module250Name=Data imports
-Module250Desc=Tool to import data into Dolibarr (with assistants)
+Module250Desc=Tool to import data into Dolibarr (with assistance)
Module310Name=Members
Module310Desc=Foundation members management
Module320Name=RSS Feed
@@ -878,7 +878,7 @@ Permission1251=Run mass imports of external data into database (data load)
Permission1321=Export customer invoices, attributes and payments
Permission1322=Reopen a paid bill
Permission1421=Export sales orders and attributes
-Permission2401=Read actions (events or tasks) linked to his user account (if owner of event)
+Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
Permission2411=Read actions (events or tasks) of others
@@ -1156,7 +1156,7 @@ NoEventOrNoAuditSetup=No security event has been logged. This is normal if Audit
NoEventFoundWithCriteria=No security event has been found for this search criteria.
SeeLocalSendMailSetup=See your local sendmail setup
BackupDesc=A complete backup of a Dolibarr installation requires two steps.
-BackupDesc2=Backup the contents of the "documents" directory (%s) containing all uploaded and generated files. This will also include all the dump files generated in Step 1.
+BackupDesc2=Backup the contents of the "documents" directory (%s) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
BackupDesc3=Backup the structure and contents of your database (%s) into a dump file. For this, you can use the following assistant.
BackupDescX=The archived directory should be stored in a secure place.
BackupDescY=The generated dump file should be stored in a secure place.
@@ -1167,6 +1167,7 @@ RestoreDesc3=Restore the database structure and data from a backup dump file int
RestoreMySQL=MySQL import
ForcedToByAModule= This rule is forced to %s by an activated module
PreviousDumpFiles=Existing backup files
+PreviousArchiveFiles=Existing archive files
WeekStartOnDay=First day of the week
RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user %s or you must add -W option at end of command line to provide %s password.
@@ -1248,6 +1249,7 @@ AskForPreferredShippingMethod=Ask for preferred shipping method for Third Partie
FieldEdition=Edition of field %s
FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
GetBarCode=Get barcode
+NumberingModules=Numbering models
##### Module password generation
PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
@@ -1711,8 +1713,9 @@ ChequeReceiptsNumberingModule=Check Receipts Numbering Module
MultiCompanySetup=Multi-company module setup
##### Suppliers #####
SuppliersSetup=Vendor module setup
-SuppliersCommandModel=Complete template of purchase order (logo...)
-SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
+SuppliersCommandModel=Complete template of Purchase Order
+SuppliersCommandModelMuscadet=Complete template of Purchase Order
+SuppliersInvoiceModel=Complete template of Vendor Invoice
SuppliersInvoiceNumberingModel=Vendor invoices numbering models
IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
##### GeoIPMaxmind #####
@@ -1762,9 +1765,10 @@ ListOfNotificationsPerUser=List of automatic notifications per user*
ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
ListOfFixedNotifications=List of automatic fixed notifications
GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
Threshold=Threshold
-BackupDumpWizard=Wizard to build the backup file
+BackupDumpWizard=Wizard to build the database dump file
+BackupZipWizard=Wizard to build the archive of documents directory
SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file %s to allow this feature.
@@ -1953,6 +1957,8 @@ SmallerThan=Smaller than
LargerThan=Larger than
IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
+EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set a value here to use this feature. Note that you must also use a read/write login account.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
EndPointFor=End point for %s : %s
DeleteEmailCollector=Delete email collector
ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
diff --git a/htdocs/langs/sw_SW/bills.lang b/htdocs/langs/sw_SW/bills.lang
index e6ea4390fd8..7ce06448be4 100644
--- a/htdocs/langs/sw_SW/bills.lang
+++ b/htdocs/langs/sw_SW/bills.lang
@@ -416,7 +416,7 @@ PaymentConditionShort14D=14 days
PaymentCondition14D=14 days
PaymentConditionShort14DENDMONTH=14 days of month-end
PaymentCondition14DENDMONTH=Within 14 days following the end of the month
-FixAmount=Fixed amount
+FixAmount=Fixed amount - 1 line with label '%s'
VarAmount=Variable amount (%% tot.)
VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
# PaymentType
@@ -512,7 +512,7 @@ RevenueStamp=Revenue stamp
YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template
PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
diff --git a/htdocs/langs/sw_SW/categories.lang b/htdocs/langs/sw_SW/categories.lang
index a6c3ffa01b0..7207bbacc38 100644
--- a/htdocs/langs/sw_SW/categories.lang
+++ b/htdocs/langs/sw_SW/categories.lang
@@ -62,6 +62,7 @@ ContactCategoriesShort=Contacts tags/categories
AccountsCategoriesShort=Accounts tags/categories
ProjectsCategoriesShort=Projects tags/categories
UsersCategoriesShort=Users tags/categories
+StockCategoriesShort=Warehouse tags/categories
ThisCategoryHasNoProduct=This category does not contain any product.
ThisCategoryHasNoSupplier=This category does not contain any vendor.
ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -88,3 +89,6 @@ AddProductServiceIntoCategory=Add the following product/service
ShowCategory=Show tag/category
ByDefaultInList=By default in list
ChooseCategory=Choose category
+StocksCategoriesArea=Warehouses Categories Area
+ActionCommCategoriesArea=Events Categories Area
+UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/sw_SW/companies.lang b/htdocs/langs/sw_SW/companies.lang
index 7439972e906..c569a48c84a 100644
--- a/htdocs/langs/sw_SW/companies.lang
+++ b/htdocs/langs/sw_SW/companies.lang
@@ -247,6 +247,12 @@ ProfId3US=-
ProfId4US=-
ProfId5US=-
ProfId6US=-
+ProfId1RO=Prof Id 1 (CUI)
+ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
+ProfId3RO=Prof Id 3 (CAEN)
+ProfId4RO=-
+ProfId5RO=Prof Id 5 (EUID)
+ProfId6RO=-
ProfId1RU=Prof Id 1 (OGRN)
ProfId2RU=Prof Id 2 (INN)
ProfId3RU=Prof Id 3 (KPP)
@@ -339,7 +345,7 @@ MyContacts=My contacts
Capital=Capital
CapitalOf=Capital of %s
EditCompany=Edit company
-ThisUserIsNot=This user is not a prospect, customer nor vendor
+ThisUserIsNot=This user is not a prospect, customer or vendor
VATIntraCheck=Check
VATIntraCheckDesc=The VAT ID must include the country prefix. The link %s uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -406,6 +412,13 @@ AllocateCommercial=Assigned to sales representative
Organization=Organization
FiscalYearInformation=Fiscal Year
FiscalMonthStart=Starting month of the fiscal year
+SocialNetworksInformation=Social networks
+SocialNetworksFacebookURL=Facebook URL
+SocialNetworksTwitterURL=Twitter URL
+SocialNetworksLinkedinURL=Linkedin URL
+SocialNetworksInstagramURL=Instagram URL
+SocialNetworksYoutubeURL=Youtube URL
+SocialNetworksGithubURL=Github URL
YouMustAssignUserMailFirst=You must create an email for this user prior to being able to add an email notification.
YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
ListSuppliersShort=List of Vendors
diff --git a/htdocs/langs/sw_SW/compta.lang b/htdocs/langs/sw_SW/compta.lang
index 3f175b8b782..1de030a1905 100644
--- a/htdocs/langs/sw_SW/compta.lang
+++ b/htdocs/langs/sw_SW/compta.lang
@@ -63,7 +63,7 @@ LT2SupplierES=IRPF purchases
LT2CustomerIN=SGST sales
LT2SupplierIN=SGST purchases
VATCollected=VAT collected
-ToPay=To pay
+StatusToPay=To pay
SpecialExpensesArea=Area for all special payments
SocialContribution=Social or fiscal tax
SocialContributions=Social or fiscal taxes
@@ -112,7 +112,7 @@ ShowVatPayment=Show VAT payment
TotalToPay=Total to pay
BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=vendor accounting code
+SupplierAccountancyCode=Vendor accounting code
CustomerAccountancyCodeShort=Cust. account. code
SupplierAccountancyCodeShort=Sup. account. code
AccountNumber=Account number
@@ -254,3 +254,4 @@ ByVatRate=By sale tax rate
TurnoverbyVatrate=Turnover invoiced by sale tax rate
TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
PurchasebyVatrate=Purchase by sale tax rate
+LabelToShow=Short label
diff --git a/htdocs/langs/sw_SW/errors.lang b/htdocs/langs/sw_SW/errors.lang
index b070695736f..4edca737c66 100644
--- a/htdocs/langs/sw_SW/errors.lang
+++ b/htdocs/langs/sw_SW/errors.lang
@@ -117,7 +117,8 @@ ErrorLoginDoesNotExists=User with login %s could not be found.
ErrorLoginHasNoEmail=This user has no email address. Process aborted.
ErrorBadValueForCode=Bad value for security code. Try again with new value...
ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
-ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you want to add a discount line, just create the discount first with link %s on screen and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
+ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
ErrorWebServerUserHasNotPermission=User account %s used to execute web server has no permission for that
ErrorNoActivatedBarcode=No barcode type activated
@@ -224,6 +225,8 @@ ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to
ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
ErrorFieldRequiredForProduct=Field '%s' is required for product %s
+ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
+ErrorAddAtLeastOneLineFirst=Add at least one line first
# Warnings
WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/sw_SW/holiday.lang b/htdocs/langs/sw_SW/holiday.lang
index 69b6a698e1a..82de49f9c5f 100644
--- a/htdocs/langs/sw_SW/holiday.lang
+++ b/htdocs/langs/sw_SW/holiday.lang
@@ -39,8 +39,10 @@ TypeOfLeaveId=Type of leave ID
TypeOfLeaveCode=Type of leave code
TypeOfLeaveLabel=Type of leave label
NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary.
NbUseDaysCPShort=Days consumed
NbUseDaysCPShortInMonth=Days consumed in month
+DayIsANonWorkingDay=%s is a non working day
DateStartInMonth=Start date in month
DateEndInMonth=End date in month
EditCP=Edit
diff --git a/htdocs/langs/sw_SW/install.lang b/htdocs/langs/sw_SW/install.lang
index 708b3bac479..1b173656a47 100644
--- a/htdocs/langs/sw_SW/install.lang
+++ b/htdocs/langs/sw_SW/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
PHPSupportCalendar=This PHP supports calendars extensions.
PHPSupportUTF8=This PHP supports UTF8 functions.
PHPSupportIntl=This PHP supports Intl functions.
+PHPSupport=This PHP supports %s functions.
PHPMemoryOK=Your PHP max session memory is set to %s. This should be enough.
PHPMemoryTooLow=Your PHP max session memory is set to %s bytes. This is too low. Change your php.ini to set memory_limit parameter to at least %s bytes.
Recheck=Click here for a more detailed test
@@ -25,6 +26,7 @@ ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
+ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
ErrorDirDoesNotExists=Directory %s does not exist.
ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
diff --git a/htdocs/langs/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang
index ac411f56f3e..63d2698b9e6 100644
--- a/htdocs/langs/sw_SW/main.lang
+++ b/htdocs/langs/sw_SW/main.lang
@@ -471,7 +471,7 @@ TotalDuration=Total duration
Summary=Summary
DolibarrStateBoard=Database Statistics
DolibarrWorkBoard=Open Items
-NoOpenedElementToProcess=No opened element to process
+NoOpenedElementToProcess=No open element to process
Available=Available
NotYetAvailable=Not yet available
NotAvailable=Not available
@@ -1005,7 +1005,7 @@ ContactDefault_contrat=Contract
ContactDefault_facture=Invoice
ContactDefault_fichinter=Intervention
ContactDefault_invoice_supplier=Supplier Invoice
-ContactDefault_order_supplier=Supplier Order
+ContactDefault_order_supplier=Purchase Order
ContactDefault_project=Project
ContactDefault_project_task=Task
ContactDefault_propal=Proposal
@@ -1013,3 +1013,6 @@ ContactDefault_supplier_proposal=Supplier Proposal
ContactDefault_ticketsup=Ticket
ContactAddedAutomatically=Contact added from contact thirdparty roles
More=More
+ShowDetails=Show details
+CustomReports=Custom reports
+SelectYourGraphOptionsFirst=Select your graph options to build a graph
diff --git a/htdocs/langs/sw_SW/orders.lang b/htdocs/langs/sw_SW/orders.lang
index ad895845488..503955cf5f0 100644
--- a/htdocs/langs/sw_SW/orders.lang
+++ b/htdocs/langs/sw_SW/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Order date
OrderDateShort=Order date
OrderToProcess=Order to process
NewOrder=New order
+NewOrderSupplier=New Purchase Order
ToOrder=Make order
MakeOrder=Make order
SupplierOrder=Purchase order
@@ -25,6 +26,8 @@ OrdersToBill=Sales orders delivered
OrdersInProcess=Sales orders in process
OrdersToProcess=Sales orders to process
SuppliersOrdersToProcess=Purchase orders to process
+SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
+AwaitingReception=Awaiting reception
StatusOrderCanceledShort=Canceled
StatusOrderDraftShort=Draft
StatusOrderValidatedShort=Validated
@@ -37,7 +40,6 @@ StatusOrderDeliveredShort=Delivered
StatusOrderToBillShort=Delivered
StatusOrderApprovedShort=Approved
StatusOrderRefusedShort=Refused
-StatusOrderBilledShort=Billed
StatusOrderToProcessShort=To process
StatusOrderReceivedPartiallyShort=Partially received
StatusOrderReceivedAllShort=Products received
@@ -50,7 +52,6 @@ StatusOrderProcessed=Processed
StatusOrderToBill=Delivered
StatusOrderApproved=Approved
StatusOrderRefused=Refused
-StatusOrderBilled=Billed
StatusOrderReceivedPartially=Partially received
StatusOrderReceivedAll=All products received
ShippingExist=A shipment exists
@@ -68,8 +69,9 @@ ValidateOrder=Validate order
UnvalidateOrder=Unvalidate order
DeleteOrder=Delete order
CancelOrder=Cancel order
-OrderReopened= Order %s Reopened
+OrderReopened= Order %s re-open
AddOrder=Create order
+AddPurchaseOrder=Create purchase order
AddToDraftOrders=Add to draft order
ShowOrder=Show order
OrdersOpened=Orders to process
@@ -139,10 +141,10 @@ OrderByEMail=Email
OrderByWWW=Online
OrderByPhone=Phone
# Documents models
-PDFEinsteinDescription=A complete order model (logo...)
-PDFEratostheneDescription=A complete order model (logo...)
+PDFEinsteinDescription=A complete order model
+PDFEratostheneDescription=A complete order model
PDFEdisonDescription=A simple order model
-PDFProformaDescription=A complete proforma invoice (logo…)
+PDFProformaDescription=A complete Proforma invoice template
CreateInvoiceForThisCustomer=Bill orders
NoOrdersToInvoice=No orders billable
CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
@@ -152,7 +154,35 @@ OrderCreated=Your orders have been created
OrderFail=An error happened during your orders creation
CreateOrders=Create orders
ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
-OptionToSetOrderBilledNotEnabled=Option (from module Workflow) to set order to 'Billed' automatically when invoice is validated is off, so you will have to set status of order to 'Billed' manually.
+OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
-CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
+CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
SetShippingMode=Set shipping mode
+WithReceptionFinished=With reception finished
+#### supplier orders status
+StatusSupplierOrderCanceledShort=Canceled
+StatusSupplierOrderDraftShort=Draft
+StatusSupplierOrderValidatedShort=Validated
+StatusSupplierOrderSentShort=In process
+StatusSupplierOrderSent=Shipment in process
+StatusSupplierOrderOnProcessShort=Ordered
+StatusSupplierOrderProcessedShort=Processed
+StatusSupplierOrderDelivered=Delivered
+StatusSupplierOrderDeliveredShort=Delivered
+StatusSupplierOrderToBillShort=Delivered
+StatusSupplierOrderApprovedShort=Approved
+StatusSupplierOrderRefusedShort=Refused
+StatusSupplierOrderToProcessShort=To process
+StatusSupplierOrderReceivedPartiallyShort=Partially received
+StatusSupplierOrderReceivedAllShort=Products received
+StatusSupplierOrderCanceled=Canceled
+StatusSupplierOrderDraft=Draft (needs to be validated)
+StatusSupplierOrderValidated=Validated
+StatusSupplierOrderOnProcess=Ordered - Standby reception
+StatusSupplierOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusSupplierOrderProcessed=Processed
+StatusSupplierOrderToBill=Delivered
+StatusSupplierOrderApproved=Approved
+StatusSupplierOrderRefused=Refused
+StatusSupplierOrderReceivedPartially=Partially received
+StatusSupplierOrderReceivedAll=All products received
diff --git a/htdocs/langs/sw_SW/other.lang b/htdocs/langs/sw_SW/other.lang
index 7ee672f089b..46424590f31 100644
--- a/htdocs/langs/sw_SW/other.lang
+++ b/htdocs/langs/sw_SW/other.lang
@@ -24,7 +24,7 @@ MessageOK=Message on the return page for a validated payment
MessageKO=Message on the return page for a canceled payment
ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
DeleteAlsoContentRecursively=Check to delete all content recursively
-
+PoweredBy=Powered by
YearOfInvoice=Year of invoice date
PreviousYearOfInvoice=Previous year of invoice date
NextYearOfInvoice=Following year of invoice date
@@ -104,7 +104,8 @@ DemoFundation=Manage members of a foundation
DemoFundation2=Manage members and bank account of a foundation
DemoCompanyServiceOnly=Company or freelance selling service only
DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
-DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
+DemoCompanyManufacturing=Company manufacturing products
DemoCompanyAll=Company with multiple activities (all main modules)
CreatedBy=Created by %s
ModifiedBy=Modified by %s
@@ -267,7 +268,7 @@ WEBSITE_PAGEURL=URL of page
WEBSITE_TITLE=Title
WEBSITE_DESCRIPTION=Description
WEBSITE_IMAGE=Image
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITEKEY__ in the path if path depends on website name.
WEBSITE_KEYWORDS=Keywords
LinesToImport=Lines to import
diff --git a/htdocs/langs/sw_SW/projects.lang b/htdocs/langs/sw_SW/projects.lang
index 868a696c20a..e9a559f6140 100644
--- a/htdocs/langs/sw_SW/projects.lang
+++ b/htdocs/langs/sw_SW/projects.lang
@@ -77,7 +77,7 @@ MyProjectsArea=My projects Area
DurationEffective=Effective duration
ProgressDeclared=Declared progress
TaskProgressSummary=Task progress
-CurentlyOpenedTasks=Curently opened tasks
+CurentlyOpenedTasks=Curently open tasks
TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
ProgressCalculated=Calculated progress
@@ -249,9 +249,13 @@ TimeSpentForInvoice=Time spent
OneLinePerUser=One line per user
ServiceToUseOnLines=Service to use on lines
InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets).
+ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
ProjectFollowOpportunity=Follow opportunity
ProjectFollowTasks=Follow tasks
UsageOpportunity=Usage: Opportunity
UsageTasks=Usage: Tasks
UsageBillTimeShort=Usage: Bill time
+InvoiceToUse=Draft invoice to use
+NewInvoice=New invoice
+OneLinePerTask=One line per task
+OneLinePerPeriod=One line per period
diff --git a/htdocs/langs/sw_SW/propal.lang b/htdocs/langs/sw_SW/propal.lang
index 7fce5107356..39bfdea31c8 100644
--- a/htdocs/langs/sw_SW/propal.lang
+++ b/htdocs/langs/sw_SW/propal.lang
@@ -28,7 +28,7 @@ ShowPropal=Show proposal
PropalsDraft=Drafts
PropalsOpened=Open
PropalStatusDraft=Draft (needs to be validated)
-PropalStatusValidated=Validated (proposal is opened)
+PropalStatusValidated=Validated (proposal is open)
PropalStatusSigned=Signed (needs billing)
PropalStatusNotSigned=Not signed (closed)
PropalStatusBilled=Billed
@@ -76,10 +76,11 @@ TypeContact_propal_external_BILLING=Customer invoice contact
TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
TypeContact_propal_external_SHIPPING=Customer contact for delivery
# Document models
-DocModelAzurDescription=A complete proposal model (logo...)
-DocModelCyanDescription=A complete proposal model (logo...)
+DocModelAzurDescription=A complete proposal model
+DocModelCyanDescription=A complete proposal model
DefaultModelPropalCreate=Default model creation
DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
ProposalCustomerSignature=Written acceptance, company stamp, date and signature
ProposalsStatisticsSuppliers=Vendor proposals statistics
+CaseFollowedBy=Case followed by
diff --git a/htdocs/langs/sw_SW/stocks.lang b/htdocs/langs/sw_SW/stocks.lang
index 2e207e63b39..9856649b834 100644
--- a/htdocs/langs/sw_SW/stocks.lang
+++ b/htdocs/langs/sw_SW/stocks.lang
@@ -143,6 +143,7 @@ InventoryCode=Movement or inventory code
IsInPackage=Contained into package
WarehouseAllowNegativeTransfer=Stock can be negative
qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
+qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
@@ -192,6 +193,7 @@ TheoricalQty=Theorique qty
TheoricalValue=Theorique qty
LastPA=Last BP
CurrentPA=Curent BP
+RecordedQty=Recorded Qty
RealQty=Real Qty
RealValue=Real Value
RegulatedQty=Regulated Qty
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index 404dbc92a15..ce0012acec8 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -519,7 +519,7 @@ Module25Desc=Sales order management
Module30Name=ใบแจ้งหนี้
Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
Module40Name=Vendors
-Module40Desc=Vendors and purchase management (purchase orders and billing)
+Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
Module42Name=Debug Logs
Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
Module49Name=บรรณาธิการ
@@ -561,9 +561,9 @@ Module200Desc=LDAP directory synchronization
Module210Name=PostNuke
Module210Desc=บูรณาการ PostNuke
Module240Name=ข้อมูลการส่งออก
-Module240Desc=Tool to export Dolibarr data (with assistants)
+Module240Desc=Tool to export Dolibarr data (with assistance)
Module250Name=การนำเข้าข้อมูล
-Module250Desc=Tool to import data into Dolibarr (with assistants)
+Module250Desc=Tool to import data into Dolibarr (with assistance)
Module310Name=สมาชิก
Module310Desc=มูลนิธิการจัดการสมาชิก
Module320Name=RSS Feed
@@ -878,7 +878,7 @@ Permission1251=เรียกมวลของการนำเข้าข
Permission1321=ส่งออกใบแจ้งหนี้ของลูกค้าคุณลักษณะและการชำระเงิน
Permission1322=Reopen a paid bill
Permission1421=Export sales orders and attributes
-Permission2401=Read actions (events or tasks) linked to his user account (if owner of event)
+Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
Permission2411=อ่านการกระทำ (เหตุการณ์หรืองาน) ของบุคคลอื่น
@@ -1156,7 +1156,7 @@ NoEventOrNoAuditSetup=No security event has been logged. This is normal if Audit
NoEventFoundWithCriteria=No security event has been found for this search criteria.
SeeLocalSendMailSetup=ดูการตั้งค่าของคุณ sendmail ท้องถิ่น
BackupDesc=A complete backup of a Dolibarr installation requires two steps.
-BackupDesc2=Backup the contents of the "documents" directory (%s) containing all uploaded and generated files. This will also include all the dump files generated in Step 1.
+BackupDesc2=Backup the contents of the "documents" directory (%s) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
BackupDesc3=Backup the structure and contents of your database (%s) into a dump file. For this, you can use the following assistant.
BackupDescX=The archived directory should be stored in a secure place.
BackupDescY=สร้างแฟ้มการถ่ายโอนควรเก็บไว้ในสถานที่ที่ปลอดภัย
@@ -1167,6 +1167,7 @@ RestoreDesc3=Restore the database structure and data from a backup dump file int
RestoreMySQL=นำเข้า MySQL
ForcedToByAModule= กฎนี้ถูกบังคับให้% โดยการเปิดใช้งานโมดูล
PreviousDumpFiles=Existing backup files
+PreviousArchiveFiles=Existing archive files
WeekStartOnDay=First day of the week
RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
YouMustRunCommandFromCommandLineAfterLoginToUser=คุณต้องเรียกใช้คำสั่งจากบรรทัดคำสั่งนี้หลังจากที่เข้าสู่ระบบไปยังเปลือกกับผู้ใช้% s หรือคุณต้องเพิ่มตัวเลือก -W ที่ท้ายบรรทัดคำสั่งที่จะให้รหัสผ่าน% s
@@ -1248,6 +1249,7 @@ AskForPreferredShippingMethod=Ask for preferred shipping method for Third Partie
FieldEdition=ฉบับของสนาม% s
FillThisOnlyIfRequired=ตัวอย่าง: 2 (กรอกข้อมูลเฉพาะในกรณีที่เขตเวลาชดเชยปัญหาที่มีประสบการณ์)
GetBarCode=รับบาร์โค้ด
+NumberingModules=Numbering models
##### Module password generation
PasswordGenerationStandard=กลับสร้างรหัสผ่านตามขั้นตอนวิธี Dolibarr ภายใน: 8 ตัวอักษรที่ใช้ร่วมกันที่มีตัวเลขและตัวอักษรตัวพิมพ์เล็ก
PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
@@ -1711,8 +1713,9 @@ ChequeReceiptsNumberingModule=Check Receipts Numbering Module
MultiCompanySetup=หลาย บริษัท ติดตั้งโมดูล
##### Suppliers #####
SuppliersSetup=Vendor module setup
-SuppliersCommandModel=Complete template of purchase order (logo...)
-SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
+SuppliersCommandModel=Complete template of Purchase Order
+SuppliersCommandModelMuscadet=Complete template of Purchase Order
+SuppliersInvoiceModel=Complete template of Vendor Invoice
SuppliersInvoiceNumberingModel=Vendor invoices numbering models
IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
##### GeoIPMaxmind #####
@@ -1762,9 +1765,10 @@ ListOfNotificationsPerUser=List of automatic notifications per user*
ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
ListOfFixedNotifications=List of automatic fixed notifications
GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
Threshold=ธรณีประตู
-BackupDumpWizard=Wizard to build the backup file
+BackupDumpWizard=Wizard to build the database dump file
+BackupZipWizard=Wizard to build the archive of documents directory
SomethingMakeInstallFromWebNotPossible=การติดตั้งโมดูลภายนอกเป็นไปไม่ได้จากอินเตอร์เฟซเว็บด้วยเหตุผลต่อไปนี้:
SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
InstallModuleFromWebHasBeenDisabledByFile=ติดตั้งโมดูลภายนอกจากโปรแกรมที่ได้รับการปิดใช้งานโดยผู้ดูแลระบบ คุณต้องขอให้เขาลบไฟล์% s เพื่อให้คุณลักษณะนี้
@@ -1953,6 +1957,8 @@ SmallerThan=Smaller than
LargerThan=Larger than
IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
+EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set a value here to use this feature. Note that you must also use a read/write login account.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
EndPointFor=End point for %s : %s
DeleteEmailCollector=Delete email collector
ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
diff --git a/htdocs/langs/th_TH/bills.lang b/htdocs/langs/th_TH/bills.lang
index dbe7f27de0e..6bc125c01d8 100644
--- a/htdocs/langs/th_TH/bills.lang
+++ b/htdocs/langs/th_TH/bills.lang
@@ -416,7 +416,7 @@ PaymentConditionShort14D=14 days
PaymentCondition14D=14 days
PaymentConditionShort14DENDMONTH=14 days of month-end
PaymentCondition14DENDMONTH=Within 14 days following the end of the month
-FixAmount=Fixed amount
+FixAmount=Fixed amount - 1 line with label '%s'
VarAmount=ปริมาณ (ทีโอที %%.)
VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
# PaymentType
@@ -512,7 +512,7 @@ RevenueStamp=อากรแสตมป์
YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=ใบแจ้งหนี้แม่แบบ PDF Crabe แม่แบบใบแจ้งหนี้ฉบับสมบูรณ์ (แนะนำ Template)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template
PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
TerreNumRefModelDesc1=จำนวนกลับมาพร้อมกับรูปแบบ% syymm-nnnn สำหรับใบแจ้งหนี้และมาตรฐาน% syymm-nnnn สำหรับการบันทึกเครดิตที่ yy เป็นปีเป็นเดือนมิลลิเมตรและ nnnn เป็นลำดับที่มีการหยุดพักและกลับไปที่ 0 ไม่มี
diff --git a/htdocs/langs/th_TH/categories.lang b/htdocs/langs/th_TH/categories.lang
index 0007d27abe7..2e7a36e11e3 100644
--- a/htdocs/langs/th_TH/categories.lang
+++ b/htdocs/langs/th_TH/categories.lang
@@ -62,6 +62,7 @@ ContactCategoriesShort=แท็กติดต่อ / ประเภท
AccountsCategoriesShort=Accounts tags/categories
ProjectsCategoriesShort=Projects tags/categories
UsersCategoriesShort=Users tags/categories
+StockCategoriesShort=Warehouse tags/categories
ThisCategoryHasNoProduct=ประเภทนี้ไม่ได้มีผลิตภัณฑ์ใด ๆ
ThisCategoryHasNoSupplier=This category does not contain any vendor.
ThisCategoryHasNoCustomer=ประเภทนี้ไม่ได้มีลูกค้า
@@ -88,3 +89,6 @@ AddProductServiceIntoCategory=เพิ่มสินค้า / บริก
ShowCategory=แสดงแท็ก / หมวดหมู่
ByDefaultInList=โดยค่าเริ่มต้นในรายการ
ChooseCategory=Choose category
+StocksCategoriesArea=Warehouses Categories Area
+ActionCommCategoriesArea=Events Categories Area
+UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/th_TH/companies.lang b/htdocs/langs/th_TH/companies.lang
index a1c75d0eeb9..7bfd0bcff28 100644
--- a/htdocs/langs/th_TH/companies.lang
+++ b/htdocs/langs/th_TH/companies.lang
@@ -247,6 +247,12 @@ ProfId3US=-
ProfId4US=-
ProfId5US=-
ProfId6US=-
+ProfId1RO=Prof Id 1 (CUI)
+ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
+ProfId3RO=Prof Id 3 (CAEN)
+ProfId4RO=-
+ProfId5RO=Prof Id 5 (EUID)
+ProfId6RO=-
ProfId1RU=ศหมายเลข 1 (OGRN)
ProfId2RU=ศหมายเลข 2 (INN)
ProfId3RU=ศหมายเลข 3 (KPP)
@@ -339,7 +345,7 @@ MyContacts=รายชื่อของฉัน
Capital=เมืองหลวง
CapitalOf=เมืองหลวงของ% s
EditCompany=แก้ไข บริษัท
-ThisUserIsNot=This user is not a prospect, customer nor vendor
+ThisUserIsNot=This user is not a prospect, customer or vendor
VATIntraCheck=ตรวจสอบ
VATIntraCheckDesc=The VAT ID must include the country prefix. The link %s uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -406,6 +412,13 @@ AllocateCommercial=Assigned to sales representative
Organization=องค์กร
FiscalYearInformation=Fiscal Year
FiscalMonthStart=เริ่มต้นเดือนของปีงบประมาณ
+SocialNetworksInformation=Social networks
+SocialNetworksFacebookURL=Facebook URL
+SocialNetworksTwitterURL=Twitter URL
+SocialNetworksLinkedinURL=Linkedin URL
+SocialNetworksInstagramURL=Instagram URL
+SocialNetworksYoutubeURL=Youtube URL
+SocialNetworksGithubURL=Github URL
YouMustAssignUserMailFirst=You must create an email for this user prior to being able to add an email notification.
YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
ListSuppliersShort=List of Vendors
diff --git a/htdocs/langs/th_TH/compta.lang b/htdocs/langs/th_TH/compta.lang
index 675fddaa40f..5d8340365f7 100644
--- a/htdocs/langs/th_TH/compta.lang
+++ b/htdocs/langs/th_TH/compta.lang
@@ -63,7 +63,7 @@ LT2SupplierES=การซื้อสินค้า IRPF
LT2CustomerIN=SGST sales
LT2SupplierIN=SGST purchases
VATCollected=ภาษีมูลค่าเพิ่มที่จัดเก็บ
-ToPay=ที่จะต้องจ่าย
+StatusToPay=ที่จะต้องจ่าย
SpecialExpensesArea=พื้นที่สำหรับการชำระเงินพิเศษทั้งหมด
SocialContribution=ภาษีทางสังคมหรือทางการคลัง
SocialContributions=ภาษีทางสังคมหรือทางการคลัง
@@ -112,7 +112,7 @@ ShowVatPayment=แสดงการชำระเงินภาษีมู
TotalToPay=ทั้งหมดที่จะต้องจ่าย
BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=vendor accounting code
+SupplierAccountancyCode=Vendor accounting code
CustomerAccountancyCodeShort=Cust. account. code
SupplierAccountancyCodeShort=Sup. account. code
AccountNumber=เลขที่บัญชี
@@ -254,3 +254,4 @@ ByVatRate=By sale tax rate
TurnoverbyVatrate=Turnover invoiced by sale tax rate
TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
PurchasebyVatrate=Purchase by sale tax rate
+LabelToShow=ป้ายสั้น
diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang
index b3ef3a672e9..6d7165b167f 100644
--- a/htdocs/langs/th_TH/errors.lang
+++ b/htdocs/langs/th_TH/errors.lang
@@ -117,7 +117,8 @@ ErrorLoginDoesNotExists=ผู้ใช้ที่มี s% เข้า
ErrorLoginHasNoEmail=ผู้ใช้นี้ไม่มีที่อยู่อีเมล ขั้นตอนการยกเลิก
ErrorBadValueForCode=ค่าร้ายสำหรับรหัสรักษาความปลอดภัย ลองอีกครั้งด้วยค่าใหม่ ...
ErrorBothFieldCantBeNegative=ทุ่ง% s% และไม่สามารถเป็นได้ทั้งในเชิงลบ
-ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you want to add a discount line, just create the discount first with link %s on screen and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
+ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
ErrorQtyForCustomerInvoiceCantBeNegative=จำนวนบรรทัดลงในใบแจ้งหนี้ของลูกค้าที่ไม่สามารถเป็นเชิงลบ
ErrorWebServerUserHasNotPermission=บัญชีผู้ใช้% s ใช้ในการดำเนินการเว็บเซิร์ฟเวอร์มีสิทธิ์ในการที่ไม่มี
ErrorNoActivatedBarcode=ประเภทไม่มีการเปิดใช้งานบาร์โค้ด
@@ -224,6 +225,8 @@ ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to
ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
ErrorFieldRequiredForProduct=Field '%s' is required for product %s
+ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
+ErrorAddAtLeastOneLineFirst=Add at least one line first
# Warnings
WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/th_TH/holiday.lang b/htdocs/langs/th_TH/holiday.lang
index 2b91abcc12c..3a49512b25e 100644
--- a/htdocs/langs/th_TH/holiday.lang
+++ b/htdocs/langs/th_TH/holiday.lang
@@ -39,8 +39,10 @@ TypeOfLeaveId=Type of leave ID
TypeOfLeaveCode=Type of leave code
TypeOfLeaveLabel=Type of leave label
NbUseDaysCP=จำนวนวันของวันหยุดบริโภค
+NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary.
NbUseDaysCPShort=Days consumed
NbUseDaysCPShortInMonth=Days consumed in month
+DayIsANonWorkingDay=%s is a non working day
DateStartInMonth=Start date in month
DateEndInMonth=End date in month
EditCP=แก้ไข
diff --git a/htdocs/langs/th_TH/install.lang b/htdocs/langs/th_TH/install.lang
index 0e125f8f1ab..5b41494b75b 100644
--- a/htdocs/langs/th_TH/install.lang
+++ b/htdocs/langs/th_TH/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
PHPSupportCalendar=This PHP supports calendars extensions.
PHPSupportUTF8=This PHP supports UTF8 functions.
PHPSupportIntl=This PHP supports Intl functions.
+PHPSupport=This PHP supports %s functions.
PHPMemoryOK=หน่วยความจำสูงสุด PHP เซสชั่นของคุณตั้ง% s นี้ควรจะเพียงพอ
PHPMemoryTooLow=Your PHP max session memory is set to %s bytes. This is too low. Change your php.ini to set memory_limit parameter to at least %s bytes.
Recheck=Click here for a more detailed test
@@ -25,6 +26,7 @@ ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
+ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
ErrorDirDoesNotExists=สารบบ% s ไม่ได้อยู่
ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
ErrorWrongValueForParameter=คุณอาจจะพิมพ์ค่าที่ไม่ถูกต้องสำหรับพารามิเตอร์ '% s'
diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang
index 483c57dcd93..86a3ef037ab 100644
--- a/htdocs/langs/th_TH/main.lang
+++ b/htdocs/langs/th_TH/main.lang
@@ -471,7 +471,7 @@ TotalDuration=ระยะเวลารวม
Summary=ย่อ
DolibarrStateBoard=Database Statistics
DolibarrWorkBoard=Open Items
-NoOpenedElementToProcess=No opened element to process
+NoOpenedElementToProcess=No open element to process
Available=มีจำหน่าย
NotYetAvailable=ยังไม่สามารถใช้ได้
NotAvailable=ไม่พร้อม
@@ -1005,7 +1005,7 @@ ContactDefault_contrat=สัญญา
ContactDefault_facture=ใบกำกับสินค้า
ContactDefault_fichinter=การแทรกแซง
ContactDefault_invoice_supplier=Supplier Invoice
-ContactDefault_order_supplier=Supplier Order
+ContactDefault_order_supplier=Purchase Order
ContactDefault_project=โครงการ
ContactDefault_project_task=งาน
ContactDefault_propal=ข้อเสนอ
@@ -1013,3 +1013,6 @@ ContactDefault_supplier_proposal=Supplier Proposal
ContactDefault_ticketsup=Ticket
ContactAddedAutomatically=Contact added from contact thirdparty roles
More=More
+ShowDetails=Show details
+CustomReports=Custom reports
+SelectYourGraphOptionsFirst=Select your graph options to build a graph
diff --git a/htdocs/langs/th_TH/modulebuilder.lang b/htdocs/langs/th_TH/modulebuilder.lang
index 5e2ae72a85a..a79b4549045 100644
--- a/htdocs/langs/th_TH/modulebuilder.lang
+++ b/htdocs/langs/th_TH/modulebuilder.lang
@@ -83,7 +83,7 @@ ListOfDictionariesEntries=List of dictionaries entries
ListOfPermissionsDefined=List of defined permissions
SeeExamples=See examples here
EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:
preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
($user->rights->holiday->define_holiday ? 1 : 0)
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:
preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
($user->rights->holiday->define_holiday ? 1 : 0)
IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
@@ -135,3 +135,5 @@ CSSClass=CSS Class
NotEditable=Not editable
ForeignKey=Foreign key
TypeOfFieldsHelp=Type of fields:
varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
+AsciiToHtmlConverter=Ascii to HTML converter
+AsciiToPdfConverter=Ascii to PDF converter
diff --git a/htdocs/langs/th_TH/mrp.lang b/htdocs/langs/th_TH/mrp.lang
index ad612115268..11c6915a25c 100644
--- a/htdocs/langs/th_TH/mrp.lang
+++ b/htdocs/langs/th_TH/mrp.lang
@@ -54,12 +54,15 @@ ToConsume=To consume
ToProduce=To produce
QtyAlreadyConsumed=Qty already consumed
QtyAlreadyProduced=Qty already produced
+ConsumeOrProduce=Consume or Produce
ConsumeAndProduceAll=Consume and Produce All
Manufactured=Manufactured
TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
ForAQuantityOf1=For a quantity to produce of 1
ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
-ProductionForRefAndDate=Production %s - %s
+ProductionForRef=Production of %s
AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
NoStockChangeOnServices=No stock change on services
+ProductQtyToConsumeByMO=Product quantity still to consume by open MO
+ProductQtyToProduceByMO=Product quentity still to produce by open MO
diff --git a/htdocs/langs/th_TH/orders.lang b/htdocs/langs/th_TH/orders.lang
index c740ae9ee50..256288586d6 100644
--- a/htdocs/langs/th_TH/orders.lang
+++ b/htdocs/langs/th_TH/orders.lang
@@ -11,6 +11,7 @@ OrderDate=วันที่สั่งซื้อ
OrderDateShort=วันที่สั่งซื้อ
OrderToProcess=เพื่อที่จะดำเนินการ
NewOrder=คำสั่งซื้อใหม่
+NewOrderSupplier=New Purchase Order
ToOrder=ทำให้การสั่งซื้อ
MakeOrder=ทำให้การสั่งซื้อ
SupplierOrder=Purchase order
@@ -25,6 +26,8 @@ OrdersToBill=Sales orders delivered
OrdersInProcess=Sales orders in process
OrdersToProcess=Sales orders to process
SuppliersOrdersToProcess=Purchase orders to process
+SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
+AwaitingReception=Awaiting reception
StatusOrderCanceledShort=ยกเลิก
StatusOrderDraftShort=ร่าง
StatusOrderValidatedShort=ผ่านการตรวจสอบ
@@ -37,7 +40,6 @@ StatusOrderDeliveredShort=จัดส่ง
StatusOrderToBillShort=จัดส่ง
StatusOrderApprovedShort=ได้รับการอนุมัติ
StatusOrderRefusedShort=ปฏิเสธ
-StatusOrderBilledShort=การเรียกเก็บเงิน
StatusOrderToProcessShort=ในการประมวลผล
StatusOrderReceivedPartiallyShort=ได้รับบางส่วน
StatusOrderReceivedAllShort=Products received
@@ -50,7 +52,6 @@ StatusOrderProcessed=การประมวลผล
StatusOrderToBill=จัดส่ง
StatusOrderApproved=ได้รับการอนุมัติ
StatusOrderRefused=ปฏิเสธ
-StatusOrderBilled=การเรียกเก็บเงิน
StatusOrderReceivedPartially=ได้รับบางส่วน
StatusOrderReceivedAll=All products received
ShippingExist=การจัดส่งสินค้าที่มีอยู่
@@ -68,8 +69,9 @@ ValidateOrder=ตรวจสอบการสั่งซื้อ
UnvalidateOrder=เพื่อ Unvalidate
DeleteOrder=เพื่อลบ
CancelOrder=ยกเลิกคำสั่งซื้อ
-OrderReopened= Order %s Reopened
+OrderReopened= Order %s re-open
AddOrder=สร้างใบสั่ง
+AddPurchaseOrder=Create purchase order
AddToDraftOrders=เพิ่มลงในร่างคำสั่ง
ShowOrder=เพื่อแสดง
OrdersOpened=คำสั่งในการประมวลผล
@@ -139,10 +141,10 @@ OrderByEMail=อีเมล์
OrderByWWW=ออนไลน์
OrderByPhone=โทรศัพท์
# Documents models
-PDFEinsteinDescription=รูปแบบการสั่งซื้อฉบับสมบูรณ์ (โลโก้ ... )
-PDFEratostheneDescription=รูปแบบการสั่งซื้อฉบับสมบูรณ์ (โลโก้ ... )
+PDFEinsteinDescription=A complete order model
+PDFEratostheneDescription=A complete order model
PDFEdisonDescription=รูปแบบการสั่งซื้อที่ง่าย
-PDFProformaDescription=ใบแจ้งหนี้เสมือนฉบับสมบูรณ์ (โลโก้ ... )
+PDFProformaDescription=A complete Proforma invoice template
CreateInvoiceForThisCustomer=บิลสั่งซื้อ
NoOrdersToInvoice=ไม่มีการเรียกเก็บเงินการสั่งซื้อ
CloseProcessedOrdersAutomatically=จำแนก "แปรรูป" คำสั่งที่เลือกทั้งหมด
@@ -152,7 +154,35 @@ OrderCreated=คำสั่งของคุณได้ถูกสร้า
OrderFail=ข้อผิดพลาดที่เกิดขึ้นในระหว่างการสร้างคำสั่งของคุณ
CreateOrders=สร้างคำสั่งซื้อ
ToBillSeveralOrderSelectCustomer=การสร้างใบแจ้งหนี้สำหรับการสั่งซื้อหลายคลิกแรกบนลูกค้าแล้วเลือก "% s"
-OptionToSetOrderBilledNotEnabled=Option (from module Workflow) to set order to 'Billed' automatically when invoice is validated is off, so you will have to set status of order to 'Billed' manually.
+OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
-CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
+CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
SetShippingMode=Set shipping mode
+WithReceptionFinished=With reception finished
+#### supplier orders status
+StatusSupplierOrderCanceledShort=ยกเลิก
+StatusSupplierOrderDraftShort=ร่าง
+StatusSupplierOrderValidatedShort=ผ่านการตรวจสอบ
+StatusSupplierOrderSentShort=ในกระบวนการ
+StatusSupplierOrderSent=ในขั้นตอนการจัดส่ง
+StatusSupplierOrderOnProcessShort=ได้รับคำสั่ง
+StatusSupplierOrderProcessedShort=การประมวลผล
+StatusSupplierOrderDelivered=จัดส่ง
+StatusSupplierOrderDeliveredShort=จัดส่ง
+StatusSupplierOrderToBillShort=จัดส่ง
+StatusSupplierOrderApprovedShort=ได้รับการอนุมัติ
+StatusSupplierOrderRefusedShort=ปฏิเสธ
+StatusSupplierOrderToProcessShort=ในการประมวลผล
+StatusSupplierOrderReceivedPartiallyShort=ได้รับบางส่วน
+StatusSupplierOrderReceivedAllShort=Products received
+StatusSupplierOrderCanceled=ยกเลิก
+StatusSupplierOrderDraft=ร่าง (จะต้องมีการตรวจสอบ)
+StatusSupplierOrderValidated=ผ่านการตรวจสอบ
+StatusSupplierOrderOnProcess=ได้รับคำสั่ง - พนักงานต้อนรับสแตนด์บาย
+StatusSupplierOrderOnProcessWithValidation=ได้รับคำสั่ง - พนักงานต้อนรับสแตนด์บายหรือการตรวจสอบ
+StatusSupplierOrderProcessed=การประมวลผล
+StatusSupplierOrderToBill=จัดส่ง
+StatusSupplierOrderApproved=ได้รับการอนุมัติ
+StatusSupplierOrderRefused=ปฏิเสธ
+StatusSupplierOrderReceivedPartially=ได้รับบางส่วน
+StatusSupplierOrderReceivedAll=All products received
diff --git a/htdocs/langs/th_TH/other.lang b/htdocs/langs/th_TH/other.lang
index 1fc828a21be..8eddc0a2ef5 100644
--- a/htdocs/langs/th_TH/other.lang
+++ b/htdocs/langs/th_TH/other.lang
@@ -24,7 +24,7 @@ MessageOK=Message on the return page for a validated payment
MessageKO=Message on the return page for a canceled payment
ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
DeleteAlsoContentRecursively=Check to delete all content recursively
-
+PoweredBy=Powered by
YearOfInvoice=Year of invoice date
PreviousYearOfInvoice=Previous year of invoice date
NextYearOfInvoice=Following year of invoice date
@@ -104,7 +104,8 @@ DemoFundation=จัดการสมาชิกของมูลนิธิ
DemoFundation2=จัดการสมาชิกและบัญชีธนาคารของมูลนิธิ
DemoCompanyServiceOnly=Company or freelance selling service only
DemoCompanyShopWithCashDesk=บริหารจัดการร้านค้าพร้อมโต๊ะเงินสด
-DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
+DemoCompanyManufacturing=Company manufacturing products
DemoCompanyAll=Company with multiple activities (all main modules)
CreatedBy=สร้างโดย% s
ModifiedBy=ดัดแปลงโดย% s
@@ -267,7 +268,7 @@ WEBSITE_PAGEURL=URL of page
WEBSITE_TITLE=ชื่อเรื่อง
WEBSITE_DESCRIPTION=ลักษณะ
WEBSITE_IMAGE=Image
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITEKEY__ in the path if path depends on website name.
WEBSITE_KEYWORDS=Keywords
LinesToImport=Lines to import
diff --git a/htdocs/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang
index e7f3c5c92ae..5e34d082bd7 100644
--- a/htdocs/langs/th_TH/projects.lang
+++ b/htdocs/langs/th_TH/projects.lang
@@ -77,7 +77,7 @@ MyProjectsArea=My projects Area
DurationEffective=ระยะเวลาที่มีประสิทธิภาพ
ProgressDeclared=ความคืบหน้าการประกาศ
TaskProgressSummary=Task progress
-CurentlyOpenedTasks=Curently opened tasks
+CurentlyOpenedTasks=Curently open tasks
TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
ProgressCalculated=ความคืบหน้าของการคำนวณ
@@ -249,9 +249,13 @@ TimeSpentForInvoice=เวลาที่ใช้
OneLinePerUser=One line per user
ServiceToUseOnLines=Service to use on lines
InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets).
+ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
ProjectFollowOpportunity=Follow opportunity
ProjectFollowTasks=Follow tasks
UsageOpportunity=Usage: Opportunity
UsageTasks=Usage: Tasks
UsageBillTimeShort=Usage: Bill time
+InvoiceToUse=Draft invoice to use
+NewInvoice=ใบแจ้งหนี้ใหม่
+OneLinePerTask=One line per task
+OneLinePerPeriod=One line per period
diff --git a/htdocs/langs/th_TH/propal.lang b/htdocs/langs/th_TH/propal.lang
index 69d31c445dc..83d354b2105 100644
--- a/htdocs/langs/th_TH/propal.lang
+++ b/htdocs/langs/th_TH/propal.lang
@@ -28,7 +28,7 @@ ShowPropal=แสดงข้อเสนอ
PropalsDraft=ร่าง
PropalsOpened=เปิด
PropalStatusDraft=ร่าง (จะต้องมีการตรวจสอบ)
-PropalStatusValidated=Validated (proposal is opened)
+PropalStatusValidated=การตรวจสอบ (ข้อเสนอเปิด)
PropalStatusSigned=ลงนาม (ความต้องการของการเรียกเก็บเงิน)
PropalStatusNotSigned=ไม่ได้ลงชื่อ (ปิด)
PropalStatusBilled=การเรียกเก็บเงิน
@@ -76,10 +76,11 @@ TypeContact_propal_external_BILLING=ติดต่อใบแจ้งหน
TypeContact_propal_external_CUSTOMER=การติดต่อกับลูกค้าข้อเสนอดังต่อไปนี้ขึ้น
TypeContact_propal_external_SHIPPING=Customer contact for delivery
# Document models
-DocModelAzurDescription=รูปแบบข้อเสนอฉบับสมบูรณ์ (โลโก้ ... )
-DocModelCyanDescription=รูปแบบข้อเสนอฉบับสมบูรณ์ (โลโก้ ... )
+DocModelAzurDescription=A complete proposal model
+DocModelCyanDescription=A complete proposal model
DefaultModelPropalCreate=เริ่มต้นการสร้างแบบจำลอง
DefaultModelPropalToBill=แม่แบบเริ่มต้นเมื่อปิดข้อเสนอทางธุรกิจ (ที่จะออกใบแจ้งหนี้)
DefaultModelPropalClosed=แม่แบบเริ่มต้นเมื่อปิดข้อเสนอทางธุรกิจ (ยังไม่เรียกเก็บ)
ProposalCustomerSignature=ยอมรับเขียนประทับ บริษัท วันและลายเซ็น
ProposalsStatisticsSuppliers=Vendor proposals statistics
+CaseFollowedBy=Case followed by
diff --git a/htdocs/langs/th_TH/stocks.lang b/htdocs/langs/th_TH/stocks.lang
index 750acf27778..cfdf69f2f7e 100644
--- a/htdocs/langs/th_TH/stocks.lang
+++ b/htdocs/langs/th_TH/stocks.lang
@@ -143,6 +143,7 @@ InventoryCode=การเคลื่อนไหวหรือรหัสส
IsInPackage=เป็นแพคเกจที่มีอยู่
WarehouseAllowNegativeTransfer=Stock can be negative
qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
+qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
ShowWarehouse=แสดงคลังสินค้า
MovementCorrectStock=แก้ไขหุ้นสำหรับผลิตภัณฑ์% s
MovementTransferStock=การโอนหุ้นของผลิตภัณฑ์% s เข้าไปในโกดังอีก
@@ -192,6 +193,7 @@ TheoricalQty=Theorique qty
TheoricalValue=Theorique qty
LastPA=Last BP
CurrentPA=Curent BP
+RecordedQty=Recorded Qty
RealQty=Real Qty
RealValue=Real Value
RegulatedQty=Regulated Qty
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index bb183ac8cc7..538229bfd16 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -519,7 +519,7 @@ Module25Desc=Müşteri siparişi yönetimi
Module30Name=Faturalar
Module30Desc=Müşteriler için fatura ve alacak dekontlarının yönetimi. Tedarikçiler için fatura ve alacak dekontlarının yönetimi
Module40Name=Tedarikçiler
-Module40Desc=Tedarikçiler ve satın alma yönetimi (tedarikçi siparişleri ve faturalandırma)
+Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
Module42Name=Hata Ayıklama Günlükleri
Module42Desc=Günlükleme araçları (dosya, syslog, ...). Bu gibi günlükler teknik/hata ayıklama amaçları içindir.
Module49Name=Düzenleyiciler
@@ -561,9 +561,9 @@ Module200Desc=LDAP dizin senkronizasyonu
Module210Name=PostNuke
Module210Desc=PostNuke entegrasyonu
Module240Name=Veri dışa aktarma
-Module240Desc=Dolibarr verilerini dışa aktarma aracı (asistanlar ile)
+Module240Desc=Tool to export Dolibarr data (with assistance)
Module250Name=Veri içe aktarma
-Module250Desc=Verileri Dolibarr'a aktarma aracı (asistanlar ile)
+Module250Desc=Tool to import data into Dolibarr (with assistance)
Module310Name=Üyeler
Module310Desc=Dernek üyeleri yönetimi
Module320Name=RSS Besleme
@@ -878,7 +878,7 @@ Permission1251=Dış verilerin veritabanına toplu olarak alınmasını çalış
Permission1321=Müşteri faturalarını, özniteliklerini ve ödemelerini dışa aktar
Permission1322=Ödenmiş bir faturayı yeniden aç
Permission1421=Müşteri siparişleri ve niteliklerini dışa aktar
-Permission2401=Read actions (events or tasks) linked to his user account (if owner of event)
+Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
Permission2411=Başkalarının eylemlerini (etkinliklerini veya görevlerini) oku
@@ -1156,7 +1156,7 @@ NoEventOrNoAuditSetup=Hiçbir güvenlik etkinliği kaydedilmedi. Eğer "Ayarlar
NoEventFoundWithCriteria=Bu arama kriterleri için hiçbir güvenlik etkinliği bulunamadı
SeeLocalSendMailSetup=Yerel postagönder kurulumunuza bakın
BackupDesc=Bir Dolibarr kurulumunun komple yedeklenmesi iki adım gerektirir.
-BackupDesc2=Yüklenen ve oluşturulan tüm dosyaları içeren "documents" dizininin (%s) içeriğini yedekleyin. Bu, 1. Adımda oluşturulan tüm döküm dosyalarını da kapsayacaktır.
+BackupDesc2=Backup the contents of the "documents" directory (%s) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
BackupDesc3=Veri tabanınızın yapısını ve içeriğini (%s) bir döküm dosyasına yedekleyin. Bunun için aşağıdaki asistanı kullanabilirsiniz.
BackupDescX=Arşivlenen dizin güvenli bir yerde saklanmalıdır.
BackupDescY=Üretilen bilgi döküm dosyası güvenli bir yerde korunmalıdır.
@@ -1167,6 +1167,7 @@ RestoreDesc3=Yedeklenmiş bir döküm dosyasındaki veritabanı yapısını ve v
RestoreMySQL=MySQL içeaktar
ForcedToByAModule= Bu kural bir aktif modül tarafından s ye zorlanır
PreviousDumpFiles=Mevcut yedekleme dosyaları
+PreviousArchiveFiles=Existing archive files
WeekStartOnDay=Haftanın ilk günü
RunningUpdateProcessMayBeRequired=Yükseltme işlemini gerçekleştirmek gerekli gibi görünüyor (%s olan program sürümü %s olan Veri tabanı sürümünden farklı görünüyor)
YouMustRunCommandFromCommandLineAfterLoginToUser=Bu komutu %s kullanıcısı ile bir kabuğa giriş yaptıktan sonra komut satırından çalıştırabilir ya da parolayı %s elde etmek için komut satırının sonuna –W seçeneğini ekleyebilirsiniz.
@@ -1248,6 +1249,7 @@ AskForPreferredShippingMethod=Üçüncü Partiler için tercih edilen gönderme
FieldEdition=%s Alanının düzenlenmesi
FillThisOnlyIfRequired=Örnek: +2 (saat dilimi farkını yalnız zaman farkı sorunları yaşıyorsanız kullanın)
GetBarCode=Barkovizyon al
+NumberingModules=Numbering models
##### Module password generation
PasswordGenerationStandard=Dolibarr iç algoritmasına göre bir şifre girin: 8 karakterli sayı ve küçük harf içeren.
PasswordGenerationNone=Oluşturulan bir parola önerme. Parola manuel olarak yazılmalıdır.
@@ -1711,8 +1713,9 @@ ChequeReceiptsNumberingModule=Çek Makbuzları Numaralandırma Modülü
MultiCompanySetup=Çoklu şirket modülü kurulumu
##### Suppliers #####
SuppliersSetup=Tedarikçi modülü ayarları
-SuppliersCommandModel=Tedarikçi siparişinin tam şablonu (logo...)
-SuppliersInvoiceModel=Tedarikçi faturasının eksiksiz şablonu (logo...)
+SuppliersCommandModel=Complete template of Purchase Order
+SuppliersCommandModelMuscadet=Complete template of Purchase Order
+SuppliersInvoiceModel=Complete template of Vendor Invoice
SuppliersInvoiceNumberingModel=Tedarikçi faturaları numaralandırma modelleri
IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
##### GeoIPMaxmind #####
@@ -1762,9 +1765,10 @@ ListOfNotificationsPerUser=List of automatic notifications per user*
ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
ListOfFixedNotifications=List of automatic fixed notifications
GoOntoUserCardToAddMore=Kullanıcılar için bildirim eklemek veya silmek için kullanıcının "Bildirimler" sekmesine gidin
-GoOntoContactCardToAddMore=Kişilerden/adreslerden bildirimleri eklemek ya da kaldırmak için üçüncü taraf kişileri "Bildirimler" sekmesine git
+GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
Threshold=Sınır
-BackupDumpWizard=Yedek dosyayı oluşturmak için sihirbaz
+BackupDumpWizard=Wizard to build the database dump file
+BackupZipWizard=Wizard to build the archive of documents directory
SomethingMakeInstallFromWebNotPossible=Web arayüzünden dış modül kurulumu aşağıdaki nedenden ötürü olanaksızdır:
SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
InstallModuleFromWebHasBeenDisabledByFile=Dış modülün uygulama içerisinden kurulumu yöneticiniz tarafından engellenmiştir. Bu özelliğe izin verilmesi için ondan %s dosyasını kaldırmasını istemelisiniz.
@@ -1953,6 +1957,8 @@ SmallerThan=Smaller than
LargerThan=Larger than
IfTrackingIDFoundEventWillBeLinked=Eğer gelen e-posta içerisinde bir takip numarası bulunuyorsa, etkinliğin otomatik olarak ilgili nesnelere bağlanacağını unutmayınız.
WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
+EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set a value here to use this feature. Note that you must also use a read/write login account.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
EndPointFor=%s için bitiş noktası: %s
DeleteEmailCollector=Delete email collector
ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang
index ed36ff01ab6..8707e0eaeb2 100644
--- a/htdocs/langs/tr_TR/bills.lang
+++ b/htdocs/langs/tr_TR/bills.lang
@@ -416,7 +416,7 @@ PaymentConditionShort14D=14 gün
PaymentCondition14D=14 gün
PaymentConditionShort14DENDMONTH=14 days of month-end
PaymentCondition14DENDMONTH=Within 14 days following the end of the month
-FixAmount=Sabit tutar
+FixAmount=Fixed amount - 1 line with label '%s'
VarAmount=Değişken tutar (%% top.)
VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
# PaymentType
@@ -512,7 +512,7 @@ RevenueStamp=Bandrol
YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
YouMustCreateStandardInvoiceFirstDesc=Yeni bir fatura şablonu oluşturmak için önce bir standart fatura oluşturmalı ve onu "şablona" dönüştürmelisiniz
-PDFCrabeDescription=Fatura PDF şablonu Crabe. Tam fatura şablonu (Önerilen şablon)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template
PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
PDFCrevetteDescription=Fatura PDF şablonu Crevette. Durum faturaları için eksiksiz bir fatura şablonu
TerreNumRefModelDesc1=Standart faturalar için numarayı %syymm-nnnn biçiminde ve iade faturaları için %syymm-nnnn biçiminde göster, yy yıl, mm ay ve nnnn boşluksuz ve 0 olmayan bir dizidir.
diff --git a/htdocs/langs/tr_TR/categories.lang b/htdocs/langs/tr_TR/categories.lang
index 6f5961fbd7c..6a1bb4e7c8c 100644
--- a/htdocs/langs/tr_TR/categories.lang
+++ b/htdocs/langs/tr_TR/categories.lang
@@ -90,4 +90,5 @@ ShowCategory=Etiketi/kategoriyi göster
ByDefaultInList=B listede varsayılana göre
ChooseCategory=Kategori seç
StocksCategoriesArea=Depo Kategorileri Alanı
+ActionCommCategoriesArea=Events Categories Area
UseOrOperatorForCategories=Kategoriler için veya operatör kullanın
diff --git a/htdocs/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang
index 381db30ffa8..ba12f3799a1 100644
--- a/htdocs/langs/tr_TR/companies.lang
+++ b/htdocs/langs/tr_TR/companies.lang
@@ -247,6 +247,12 @@ ProfId3US=-
ProfId4US=-
ProfId5US=-
ProfId6US=-
+ProfId1RO=Prof Id 1 (CUI)
+ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
+ProfId3RO=Prof Id 3 (CAEN)
+ProfId4RO=-
+ProfId5RO=Prof Id 5 (EUID)
+ProfId6RO=-
ProfId1RU=Prof Id 1 (OGRN)
ProfId2RU=Prof Id 2 (INN)
ProfId3RU=Prof Id 3 (KPP)
@@ -339,7 +345,7 @@ MyContacts=Kişilerim
Capital=Sermaye
CapitalOf=Sermaye %s
EditCompany=Firma düzenle
-ThisUserIsNot=Bu kullanıcı bir aday, müşteri veya tedarikçi değildir
+ThisUserIsNot=This user is not a prospect, customer or vendor
VATIntraCheck=Denetle
VATIntraCheckDesc=Bu Vergi Numarası ülke önekini içermelidir. %s linki, Dolibarr sunucusundan internet erişimi gerektiren Avrupa KDV kontrol hizmetini (VIES) kullanır.
VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -406,6 +412,13 @@ AllocateCommercial=Atanmış satış temsilcileri
Organization=Kuruluş
FiscalYearInformation=Mali Yıl
FiscalMonthStart=Mali yılın başlangıç ayı
+SocialNetworksInformation=Social networks
+SocialNetworksFacebookURL=Facebook URL
+SocialNetworksTwitterURL=Twitter URL
+SocialNetworksLinkedinURL=Linkedin URL
+SocialNetworksInstagramURL=Instagram URL
+SocialNetworksYoutubeURL=Youtube URL
+SocialNetworksGithubURL=Github URL
YouMustAssignUserMailFirst=Bir e-posta bildirimi ekleyebilmek için öncelikle bu kullanıcıya bir e-posta oluşturmanız gerekir.
YouMustCreateContactFirst=E-posta bildirimleri ekleyebilmek için önce geçerli e-postası olan üçüncü taraf kişisi oluşturmanız gerekir.
ListSuppliersShort=Tedarikçi Listesi
@@ -439,6 +452,6 @@ PaymentTypeCustomer=Ödeme Türü - Müşteri
PaymentTermsCustomer=Ödeme Koşulları - Müşteri
PaymentTypeSupplier=Ödeme Türü - Tedarikçi
PaymentTermsSupplier=Ödeme Koşulları - Tedarikçi
-PaymentTypeBoth=Payment Type - Customer and Vendor
+PaymentTypeBoth=Ödeme Şekli - Müşteri ve Satıcı
MulticurrencyUsed=Çoklu Para Birimi Kullan
MulticurrencyCurrency=Para birimi
diff --git a/htdocs/langs/tr_TR/compta.lang b/htdocs/langs/tr_TR/compta.lang
index b25063d0875..8f49b0d36b6 100644
--- a/htdocs/langs/tr_TR/compta.lang
+++ b/htdocs/langs/tr_TR/compta.lang
@@ -63,7 +63,7 @@ LT2SupplierES=IRPF alışlar
LT2CustomerIN=SGST sales
LT2SupplierIN=SGST purchases
VATCollected=KDV alınan
-ToPay=Ödenecek
+StatusToPay=Ödenecek
SpecialExpensesArea=Tüm özel ödemeler alanı
SocialContribution=Sosyal ya da mali vergi
SocialContributions=Sosyal ya da mali vergiler
@@ -112,7 +112,7 @@ ShowVatPayment=KDV ödemesi göster
TotalToPay=Ödenecek toplam
BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
CustomerAccountancyCode=Müşteri muhasebe kodu
-SupplierAccountancyCode=Tedarikçi muhasebe kodu
+SupplierAccountancyCode=Vendor accounting code
CustomerAccountancyCodeShort=Müşt. hesap kodu
SupplierAccountancyCodeShort=Ted. hesap kodu
AccountNumber=Hesap numarası
@@ -254,3 +254,4 @@ ByVatRate=By sale tax rate
TurnoverbyVatrate=Turnover invoiced by sale tax rate
TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
PurchasebyVatrate=Purchase by sale tax rate
+LabelToShow=Kısa etiket
diff --git a/htdocs/langs/tr_TR/donations.lang b/htdocs/langs/tr_TR/donations.lang
index 39d502ac1c2..071b6016673 100644
--- a/htdocs/langs/tr_TR/donations.lang
+++ b/htdocs/langs/tr_TR/donations.lang
@@ -17,6 +17,7 @@ DonationStatusPromiseNotValidatedShort=Taslak
DonationStatusPromiseValidatedShort=Doğrulanmış
DonationStatusPaidShort=Alınan
DonationTitle=Bağış makbuzu
+DonationDate=Bağış tarihi
DonationDatePayment=Ödeme tarihi
ValidPromess=Söz doğrula
DonationReceipt=Bağış makbuzu
@@ -31,4 +32,4 @@ DONATION_ART200=Eğer ilgileniyorsanız CGI den 200 öğe göster
DONATION_ART238=Eğer ilgileniyorsanız CGI den 238 öğe göster
DONATION_ART885=Show article 885 from CGI if you are concerned
DonationPayment=Bağış ödemesi
-DonationValidated=Donation %s validated
+DonationValidated=Bağış %s doğrulandı
diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
index 40544baba84..9a43456e1ce 100644
--- a/htdocs/langs/tr_TR/errors.lang
+++ b/htdocs/langs/tr_TR/errors.lang
@@ -117,7 +117,8 @@ ErrorLoginDoesNotExists=%s kullanıcı adlı kullanıcı bulunamadı.
ErrorLoginHasNoEmail=Bu kullanıcının e-posta adresi yoktur. İşlem iptal edildi.
ErrorBadValueForCode=Güvenlik kodu için hatalı değer. Yeni değer ile tekrar deneyin...
ErrorBothFieldCantBeNegative=%s ve %s alanlarının ikisi birden eksi olamaz
-ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you want to add a discount line, just create the discount first with link %s on screen and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
+ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
ErrorQtyForCustomerInvoiceCantBeNegative=Müşteri faturasındaki kalem miktarı eksi olamaz
ErrorWebServerUserHasNotPermission=Web sunucusunu çalıştırmak için kullanılan %s kullanıcı hesabnın bunun için izni yok
ErrorNoActivatedBarcode=Etkinleştirilmiş barkod türü yok
@@ -224,6 +225,8 @@ ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to
ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
ErrorFieldRequiredForProduct=Field '%s' is required for product %s
+ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
+ErrorAddAtLeastOneLineFirst=Add at least one line first
# Warnings
WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP'nizdeki upload_max_filesize (%s) parametresi, post_max_size (%s) PHP parametresinden daha yüksek. Bu tutarlı bir kurulum değil.
WarningPasswordSetWithNoAccount=Bu üye için bir parola ayarlıdır. Ancak, hiçbir kullanıcı hesabı oluşturulmamıştır. Yani bu şifre saklanır ama Dolibarr'a giriş için kullanılamaz. Dış bir modül/arayüz tarafından kullanılıyor olabilir, ama bir üye için ne bir kullanıcı adı ne de parola tanımlamanız gerekmiyorsa "Her üye için bir kullanıcı adı yönet" seçeneğini devre dışı bırakabilirsiniz. Bir kullanıcı adı yönetmeniz gerekiyorsa ama herhangi bir parolaya gereksinim duymuyorsanız bu uyarıyı engellemek için bu alanı boş bırakabilirsiniz. Not: Eğer bir üye bir kullanıcıya bağlıysa kullanıcı adı olarak e-posta adresi de kullanılabilir.
diff --git a/htdocs/langs/tr_TR/holiday.lang b/htdocs/langs/tr_TR/holiday.lang
index f82a2e8f365..56b648e76f0 100644
--- a/htdocs/langs/tr_TR/holiday.lang
+++ b/htdocs/langs/tr_TR/holiday.lang
@@ -39,8 +39,10 @@ TypeOfLeaveId=İzin Kimlik türü
TypeOfLeaveCode=İzin kod türü
TypeOfLeaveLabel=İzin etiketi türü
NbUseDaysCP=Tüketilen tatil gün sayısı
+NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary.
NbUseDaysCPShort=Tüketilen gün
NbUseDaysCPShortInMonth=Days consumed in month
+DayIsANonWorkingDay=%s is a non working day
DateStartInMonth=Start date in month
DateEndInMonth=End date in month
EditCP=Düzenle
diff --git a/htdocs/langs/tr_TR/install.lang b/htdocs/langs/tr_TR/install.lang
index 014a002d62c..b9a4c8f8dec 100644
--- a/htdocs/langs/tr_TR/install.lang
+++ b/htdocs/langs/tr_TR/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=Bu PHP, Curl'u destekliyor.
PHPSupportCalendar=This PHP supports calendars extensions.
PHPSupportUTF8=Bu PHP, UTF8 işlevlerini destekliyor.
PHPSupportIntl=Bu PHP, Intl fonksiyonlarını destekliyor.
+PHPSupport=This PHP supports %s functions.
PHPMemoryOK=PHP nizin ençok oturum belleği %s olarak ayarlanmış. Bu yeterli olacaktır.
PHPMemoryTooLow=Your PHP max session memory is set to %s bytes. This is too low. Change your php.ini to set memory_limit parameter to at least %s bytes.
Recheck=Daha detaylı bir test için buraya tıklayın
@@ -25,6 +26,7 @@ ErrorPHPDoesNotSupportCurl=PHP kurulumunuz Curl. desteklemiyor
ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
ErrorPHPDoesNotSupportUTF8=PHP kurulumunuz UTF8 işlevlerini desteklemiyor. Dolibarr düzgün çalışamaz. Dolibarr'ı yüklemeden önce bunu çözün.
ErrorPHPDoesNotSupportIntl=PHP kurulumunuz Intl fonksiyonlarını desteklemiyor.
+ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
ErrorDirDoesNotExists=%s Dizini yoktur.
ErrorGoBackAndCorrectParameters=Geri gidin ve parametreleri kontrol edin/düzeltin.
ErrorWrongValueForParameter=Parametresi '%s' için yanlış değer yazmış olabilirsiniz'.
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index 1491ff91ed7..5086b091162 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -170,7 +170,7 @@ ToValidate=Doğrulanacak
NotValidated=Doğrulanmadı
Save=Kaydet
SaveAs=Farklı kaydet
-SaveAndStay=Save and stay
+SaveAndStay=Kaydet ve kal
SaveAndNew=Save and new
TestConnection=Deneme bağlantısı
ToClone=Kopyasını oluştur
@@ -471,7 +471,7 @@ TotalDuration=Toplam süre
Summary=Özet
DolibarrStateBoard=Veritabanı İstatistikleri
DolibarrWorkBoard=Bekleyen İşlemler
-NoOpenedElementToProcess=İşlenecek hiçbir açık öğe yok
+NoOpenedElementToProcess=No open element to process
Available=Mevcut
NotYetAvailable=Henüz mevcut değil
NotAvailable=Uygun değil
@@ -1005,7 +1005,7 @@ ContactDefault_contrat=Sözleşme
ContactDefault_facture=Fatura
ContactDefault_fichinter=Müdahale
ContactDefault_invoice_supplier=Supplier Invoice
-ContactDefault_order_supplier=Supplier Order
+ContactDefault_order_supplier=Purchase Order
ContactDefault_project=Proje
ContactDefault_project_task=Görev
ContactDefault_propal=Teklif
@@ -1013,3 +1013,6 @@ ContactDefault_supplier_proposal=Supplier Proposal
ContactDefault_ticketsup=Destek Bildirimi
ContactAddedAutomatically=Contact added from contact thirdparty roles
More=More
+ShowDetails=Show details
+CustomReports=Custom reports
+SelectYourGraphOptionsFirst=Select your graph options to build a graph
diff --git a/htdocs/langs/tr_TR/modulebuilder.lang b/htdocs/langs/tr_TR/modulebuilder.lang
index c713ef9ed4e..641bddb5b3f 100644
--- a/htdocs/langs/tr_TR/modulebuilder.lang
+++ b/htdocs/langs/tr_TR/modulebuilder.lang
@@ -60,8 +60,8 @@ HooksFile=File for hooks code
ArrayOfKeyValues=Array of key-val
ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
WidgetFile=Ekran etiket dosyası
-CSSFile=CSS file
-JSFile=Javascript file
+CSSFile=CSS dosyası
+JSFile=Javascript dosyası
ReadmeFile=Benioku dosyası
ChangeLog=ChangeLog dosyası
TestClassFile=PHP Unit Test sınıfı için dosya
@@ -79,11 +79,11 @@ NoTrigger=No trigger
NoWidget=Ekran etiketi yok
GoToApiExplorer=API gezginine git
ListOfMenusEntries=Menü kayıtlarının listesi
-ListOfDictionariesEntries=List of dictionaries entries
+ListOfDictionariesEntries=Sözlük girişlerinin listesi
ListOfPermissionsDefined=Tanımlanan izinlerin listesi
SeeExamples=Burada örneklere bakın
EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:
preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
($user->rights->holiday->define_holiday ? 1 : 0)
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:
preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
($user->rights->holiday->define_holiday ? 1 : 0)
IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
@@ -127,7 +127,7 @@ UseSpecificVersion = Use a specific initial version
ModuleMustBeEnabled=Önce modül/uygulama etkinleştirilmelidir
IncludeRefGeneration=The reference of object must be generated automatically
IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
-IncludeDocGeneration=I want to generate some documents from the object
+IncludeDocGeneration=Nesneden bazı belgeler oluşturmak istiyorum
IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
ShowOnCombobox=Show value into combobox
KeyForTooltip=Key for tooltip
@@ -135,3 +135,5 @@ CSSClass=CSS Class
NotEditable=Not editable
ForeignKey=Foreign key
TypeOfFieldsHelp=Type of fields:
varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
+AsciiToHtmlConverter=Ascii to HTML converter
+AsciiToPdfConverter=Ascii to PDF converter
diff --git a/htdocs/langs/tr_TR/mrp.lang b/htdocs/langs/tr_TR/mrp.lang
index 886a40c3f0d..494958c735d 100644
--- a/htdocs/langs/tr_TR/mrp.lang
+++ b/htdocs/langs/tr_TR/mrp.lang
@@ -42,24 +42,27 @@ ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to u
ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
StatusMOProduced=Produced
QtyFrozen=Frozen Qty
-QuantityFrozen=Frozen Quantity
+QuantityFrozen=Dondurulmuş Miktar
QuantityConsumedInvariable=When this flag is set, the quantity consumed is always the value defined and is not relative to the quantity produced.
DisableStockChange=Stock change disabled
DisableStockChangeHelp=When this flag is set, there is no stock change on this product, whatever is the quantity consumed
BomAndBomLines=Bills Of Material and lines
BOMLine=Line of BOM
-WarehouseForProduction=Warehouse for production
+WarehouseForProduction=Üretim için depo
CreateMO=Create MO
ToConsume=To consume
ToProduce=To produce
QtyAlreadyConsumed=Qty already consumed
QtyAlreadyProduced=Qty already produced
+ConsumeOrProduce=Consume or Produce
ConsumeAndProduceAll=Consume and Produce All
Manufactured=Manufactured
TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
ForAQuantityOf1=For a quantity to produce of 1
ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
-ProductionForRefAndDate=Production %s - %s
+ProductionForRef=Production of %s
AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
NoStockChangeOnServices=No stock change on services
+ProductQtyToConsumeByMO=Product quantity still to consume by open MO
+ProductQtyToProduceByMO=Product quentity still to produce by open MO
diff --git a/htdocs/langs/tr_TR/orders.lang b/htdocs/langs/tr_TR/orders.lang
index 60857a4e4c1..f97974f92d3 100644
--- a/htdocs/langs/tr_TR/orders.lang
+++ b/htdocs/langs/tr_TR/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Sipariş Tarihi
OrderDateShort=Sipariş tarihi
OrderToProcess=İşlenecek sipariş
NewOrder=Yeni sipariş
+NewOrderSupplier=New Purchase Order
ToOrder=Sipariş yap
MakeOrder=Sipariş yap
SupplierOrder=Tedarikçi siparişi
@@ -25,6 +26,8 @@ OrdersToBill=Teslim edilen müşteri siparişleri
OrdersInProcess=İşlemdeki müşteri siparişleri
OrdersToProcess=İşlenecek müşteri siparişleri
SuppliersOrdersToProcess=İşlenecek tedarikçi siparişleri
+SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
+AwaitingReception=Awaiting reception
StatusOrderCanceledShort=İptal edilmiş
StatusOrderDraftShort=Taslak
StatusOrderValidatedShort=Doğrulanmış
@@ -37,7 +40,6 @@ StatusOrderDeliveredShort=Teslim edildi
StatusOrderToBillShort=Teslim edlidi
StatusOrderApprovedShort=Onaylı
StatusOrderRefusedShort=Reddedildi
-StatusOrderBilledShort=Faturalandı
StatusOrderToProcessShort=İşlenecek
StatusOrderReceivedPartiallyShort=Kısmen aldı
StatusOrderReceivedAllShort=Alınan ürünler
@@ -50,7 +52,6 @@ StatusOrderProcessed=İşlenmiş
StatusOrderToBill=Teslim edildi
StatusOrderApproved=Onaylı
StatusOrderRefused=Reddedildi
-StatusOrderBilled=Faturalandı
StatusOrderReceivedPartially=Kısmen alındı
StatusOrderReceivedAll=Alınan tüm ürünler
ShippingExist=Bir sevkiyat var
@@ -68,8 +69,9 @@ ValidateOrder=Doğrulamak amacıyla
UnvalidateOrder=Siparişten doğrulamayı kaldır
DeleteOrder=Sipariş sil
CancelOrder=Siparişi iptal et
-OrderReopened= %s Siparişi Yeniden açıldı
+OrderReopened= Order %s re-open
AddOrder=Sipariş oluştur
+AddPurchaseOrder=Create purchase order
AddToDraftOrders=Taslak siparişe ekle
ShowOrder=Siparişi göster
OrdersOpened=İşlenecek siparişler
@@ -139,10 +141,10 @@ OrderByEMail=E-posta
OrderByWWW=Çevrimiçi
OrderByPhone=Telefon
# Documents models
-PDFEinsteinDescription=Bir tam sipariş modeli (logo. ..)
-PDFEratostheneDescription=Bir tam sipariş modeli (logo. ..)
+PDFEinsteinDescription=A complete order model
+PDFEratostheneDescription=A complete order model
PDFEdisonDescription=Basit bir sipariş modeli
-PDFProformaDescription=Eksiksiz bir proforma fatura (logo...)
+PDFProformaDescription=A complete Proforma invoice template
CreateInvoiceForThisCustomer=Sipariş Faturala
NoOrdersToInvoice=Faturalanabilir sipariş yok
CloseProcessedOrdersAutomatically=Seçilen tüm siparişleri "İşlendi" olarak sınıflandır.
@@ -152,7 +154,35 @@ OrderCreated=Siparişleriniz oluşturulmuştur
OrderFail=Siparişiniz oluşturulması sırasında hata oluştu
CreateOrders=Sipariş oluştur
ToBillSeveralOrderSelectCustomer=Birden çok siparişe fatura oluşturmak için, önce müşteriye tıkla, sonra "%s" seç
-OptionToSetOrderBilledNotEnabled=Option (from module Workflow) to set order to 'Billed' automatically when invoice is validated is off, so you will have to set status of order to 'Billed' manually.
+OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
-CloseReceivedSupplierOrdersAutomatically=Bütün ürünler teslim alındıysa siparişi "%s" olarak kapat.
+CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
SetShippingMode=Gönderim modunu ayarla
+WithReceptionFinished=With reception finished
+#### supplier orders status
+StatusSupplierOrderCanceledShort=İptal edildi
+StatusSupplierOrderDraftShort=Ödeme emri
+StatusSupplierOrderValidatedShort=Doğrulandı
+StatusSupplierOrderSentShort=İşlemde
+StatusSupplierOrderSent=Sevkiyat işlemde
+StatusSupplierOrderOnProcessShort=Sipariş edildi
+StatusSupplierOrderProcessedShort=İşlenmiş
+StatusSupplierOrderDelivered=Teslim edildi
+StatusSupplierOrderDeliveredShort=Teslim edildi
+StatusSupplierOrderToBillShort=Teslim edildi
+StatusSupplierOrderApprovedShort=Onaylı
+StatusSupplierOrderRefusedShort=Reddedildi
+StatusSupplierOrderToProcessShort=İşlenecek
+StatusSupplierOrderReceivedPartiallyShort=Kısmen alındı
+StatusSupplierOrderReceivedAllShort=Alınan ürünler
+StatusSupplierOrderCanceled=İptal edildi
+StatusSupplierOrderDraft=Taslak (doğrulanması gerekir)
+StatusSupplierOrderValidated=Doğrulandı
+StatusSupplierOrderOnProcess=Sipariş edildi - Teslime hazır
+StatusSupplierOrderOnProcessWithValidation=Sipariş edildi - Kabul ya da doğrulama için beklemede
+StatusSupplierOrderProcessed=İşlenmiş
+StatusSupplierOrderToBill=Teslim edildi
+StatusSupplierOrderApproved=Onaylı
+StatusSupplierOrderRefused=Reddedildi
+StatusSupplierOrderReceivedPartially=Kısmen alındı
+StatusSupplierOrderReceivedAll=Alınan tüm ürünler
diff --git a/htdocs/langs/tr_TR/other.lang b/htdocs/langs/tr_TR/other.lang
index 01f0543f06b..08476ebaedb 100644
--- a/htdocs/langs/tr_TR/other.lang
+++ b/htdocs/langs/tr_TR/other.lang
@@ -24,7 +24,7 @@ MessageOK=Message on the return page for a validated payment
MessageKO=Message on the return page for a canceled payment
ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
DeleteAlsoContentRecursively=Check to delete all content recursively
-
+PoweredBy=Powered by
YearOfInvoice=Fatura tarihi yılı
PreviousYearOfInvoice=Fatura tarihinden önceki yıl
NextYearOfInvoice=Fatura tarihinden sonraki yıl
@@ -104,7 +104,8 @@ DemoFundation=Bir derneğin üyelerini yönet
DemoFundation2=Bir derneğin üyelerini ve banka hesabını yönet
DemoCompanyServiceOnly=Yalnızca şirket veya serbest satış hizmeti
DemoCompanyShopWithCashDesk=Kasası olan bir mağazayı yönet
-DemoCompanyProductAndStocks=Bir mağazayla ürün satan şirket
+DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
+DemoCompanyManufacturing=Company manufacturing products
DemoCompanyAll=Birden fazla faaliyet gösteren şirket (tüm ana modüller)
CreatedBy=Oluşturan %s
ModifiedBy=Düzenleyen %s
@@ -267,7 +268,7 @@ WEBSITE_PAGEURL=Sayfanın URL si
WEBSITE_TITLE=Unvan
WEBSITE_DESCRIPTION=Açıklama
WEBSITE_IMAGE=Görüntü
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITEKEY__ in the path if path depends on website name.
WEBSITE_KEYWORDS=Anahtar kelimeler
LinesToImport=Lines to import
diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang
index a5c5489c7b0..4c5e62ef78f 100644
--- a/htdocs/langs/tr_TR/projects.lang
+++ b/htdocs/langs/tr_TR/projects.lang
@@ -77,7 +77,7 @@ MyProjectsArea=Projelerim Alanı
DurationEffective=Etken süre
ProgressDeclared=Bildirilen ilerleme
TaskProgressSummary=Task progress
-CurentlyOpenedTasks=Curently opened tasks
+CurentlyOpenedTasks=Curently open tasks
TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
ProgressCalculated=Hesaplanan ilerleme
@@ -249,9 +249,13 @@ TimeSpentForInvoice=Harcanan süre
OneLinePerUser=Kullanıcı başına bir satır
ServiceToUseOnLines=Service to use on lines
InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets).
+ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
ProjectFollowOpportunity=Follow opportunity
ProjectFollowTasks=Follow tasks
UsageOpportunity=Usage: Opportunity
UsageTasks=Usage: Tasks
UsageBillTimeShort=Usage: Bill time
+InvoiceToUse=Draft invoice to use
+NewInvoice=Yeni fatura
+OneLinePerTask=One line per task
+OneLinePerPeriod=One line per period
diff --git a/htdocs/langs/tr_TR/propal.lang b/htdocs/langs/tr_TR/propal.lang
index 360c19f714d..c9ed2712b0d 100644
--- a/htdocs/langs/tr_TR/propal.lang
+++ b/htdocs/langs/tr_TR/propal.lang
@@ -28,7 +28,7 @@ ShowPropal=Teklif göster
PropalsDraft=Taslaklar
PropalsOpened=Açık
PropalStatusDraft=Taslak (doğrulanması gerekir)
-PropalStatusValidated=Onaylanmış (teklif açıldı)
+PropalStatusValidated=Onaylı (teklif açık)
PropalStatusSigned=İmzalı(faturalanacak)
PropalStatusNotSigned=İmzalanmamış (kapalı)
PropalStatusBilled=Faturalanmış
@@ -76,10 +76,11 @@ TypeContact_propal_external_BILLING=Müşteri faturası ilgilisi
TypeContact_propal_external_CUSTOMER=Müşteri teklif izleme ilgilisi
TypeContact_propal_external_SHIPPING=Teslimat için müşteri iletişim kişisi
# Document models
-DocModelAzurDescription=Eksiksiz bir teklif modeli (logo. ..)
-DocModelCyanDescription=Eksiksiz bir teklif modeli (logo. ..)
+DocModelAzurDescription=A complete proposal model
+DocModelCyanDescription=A complete proposal model
DefaultModelPropalCreate=Varsayılan model oluşturma
DefaultModelPropalToBill=Bir teklifi kapatma sırasında varsayılan şablon (faturalanacak)
DefaultModelPropalClosed=Bir teklifi kapatma sırasında varsayılan şablon (faturalanmamış)
ProposalCustomerSignature=Kesin sipariş için Firma Kaşesi, Tarih ve İmza
ProposalsStatisticsSuppliers=Tedarikçi teklifi istatistikleri
+CaseFollowedBy=Case followed by
diff --git a/htdocs/langs/tr_TR/stocks.lang b/htdocs/langs/tr_TR/stocks.lang
index 95b61039877..a09166cbf36 100644
--- a/htdocs/langs/tr_TR/stocks.lang
+++ b/htdocs/langs/tr_TR/stocks.lang
@@ -143,6 +143,7 @@ InventoryCode=Hareket veya stok kodu
IsInPackage=Pakette içerilir
WarehouseAllowNegativeTransfer=Stok eksi olabilir
qtyToTranferIsNotEnough=Kaynak deponuzda yeterli stok bulunmuyor ve kurulumunuz negatif stoklara izin vermiyor.
+qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
ShowWarehouse=Depo göster
MovementCorrectStock=Stok düzeltme yapılacak ürün %s
MovementTransferStock=%s ürününün başka bir depoya stok aktarılması
@@ -192,6 +193,7 @@ TheoricalQty=Teorik adet
TheoricalValue=Teorik adet
LastPA=Last BP
CurrentPA=Curent BP
+RecordedQty=Recorded Qty
RealQty=Gerçek Miktar
RealValue=Gerçek Değer
RegulatedQty=Düzenlenmiş Adet
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index d9a02a1ba06..f26ceccd497 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -519,7 +519,7 @@ Module25Desc=Sales order management
Module30Name=Рахунки-фактури
Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
Module40Name=Vendors
-Module40Desc=Vendors and purchase management (purchase orders and billing)
+Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
Module42Name=Debug Logs
Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
Module49Name=Editors
@@ -561,9 +561,9 @@ Module200Desc=LDAP directory synchronization
Module210Name=PostNuke
Module210Desc=PostNuke integration
Module240Name=Data exports
-Module240Desc=Tool to export Dolibarr data (with assistants)
+Module240Desc=Tool to export Dolibarr data (with assistance)
Module250Name=Data imports
-Module250Desc=Tool to import data into Dolibarr (with assistants)
+Module250Desc=Tool to import data into Dolibarr (with assistance)
Module310Name=Members
Module310Desc=Foundation members management
Module320Name=RSS Feed
@@ -878,7 +878,7 @@ Permission1251=Run mass imports of external data into database (data load)
Permission1321=Export customer invoices, attributes and payments
Permission1322=Reopen a paid bill
Permission1421=Export sales orders and attributes
-Permission2401=Read actions (events or tasks) linked to his user account (if owner of event)
+Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
Permission2411=Read actions (events or tasks) of others
@@ -1156,7 +1156,7 @@ NoEventOrNoAuditSetup=No security event has been logged. This is normal if Audit
NoEventFoundWithCriteria=No security event has been found for this search criteria.
SeeLocalSendMailSetup=See your local sendmail setup
BackupDesc=A complete backup of a Dolibarr installation requires two steps.
-BackupDesc2=Backup the contents of the "documents" directory (%s) containing all uploaded and generated files. This will also include all the dump files generated in Step 1.
+BackupDesc2=Backup the contents of the "documents" directory (%s) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
BackupDesc3=Backup the structure and contents of your database (%s) into a dump file. For this, you can use the following assistant.
BackupDescX=The archived directory should be stored in a secure place.
BackupDescY=The generated dump file should be stored in a secure place.
@@ -1167,6 +1167,7 @@ RestoreDesc3=Restore the database structure and data from a backup dump file int
RestoreMySQL=MySQL import
ForcedToByAModule= This rule is forced to %s by an activated module
PreviousDumpFiles=Existing backup files
+PreviousArchiveFiles=Existing archive files
WeekStartOnDay=First day of the week
RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user %s or you must add -W option at end of command line to provide %s password.
@@ -1248,6 +1249,7 @@ AskForPreferredShippingMethod=Ask for preferred shipping method for Third Partie
FieldEdition=Edition of field %s
FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
GetBarCode=Get barcode
+NumberingModules=Numbering models
##### Module password generation
PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
@@ -1711,8 +1713,9 @@ ChequeReceiptsNumberingModule=Check Receipts Numbering Module
MultiCompanySetup=Multi-company module setup
##### Suppliers #####
SuppliersSetup=Vendor module setup
-SuppliersCommandModel=Complete template of purchase order (logo...)
-SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
+SuppliersCommandModel=Complete template of Purchase Order
+SuppliersCommandModelMuscadet=Complete template of Purchase Order
+SuppliersInvoiceModel=Complete template of Vendor Invoice
SuppliersInvoiceNumberingModel=Vendor invoices numbering models
IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
##### GeoIPMaxmind #####
@@ -1762,9 +1765,10 @@ ListOfNotificationsPerUser=List of automatic notifications per user*
ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
ListOfFixedNotifications=List of automatic fixed notifications
GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
Threshold=Threshold
-BackupDumpWizard=Wizard to build the backup file
+BackupDumpWizard=Wizard to build the database dump file
+BackupZipWizard=Wizard to build the archive of documents directory
SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file %s to allow this feature.
@@ -1953,6 +1957,8 @@ SmallerThan=Smaller than
LargerThan=Larger than
IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
+EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set a value here to use this feature. Note that you must also use a read/write login account.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
EndPointFor=End point for %s : %s
DeleteEmailCollector=Delete email collector
ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
diff --git a/htdocs/langs/uk_UA/bills.lang b/htdocs/langs/uk_UA/bills.lang
index 9881df2dc44..b8f062cef61 100644
--- a/htdocs/langs/uk_UA/bills.lang
+++ b/htdocs/langs/uk_UA/bills.lang
@@ -416,7 +416,7 @@ PaymentConditionShort14D=14 days
PaymentCondition14D=14 days
PaymentConditionShort14DENDMONTH=14 days of month-end
PaymentCondition14DENDMONTH=Within 14 days following the end of the month
-FixAmount=Fixed amount
+FixAmount=Fixed amount - 1 line with label '%s'
VarAmount=Variable amount (%% tot.)
VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
# PaymentType
@@ -512,7 +512,7 @@ RevenueStamp=Revenue stamp
YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template
PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
diff --git a/htdocs/langs/uk_UA/categories.lang b/htdocs/langs/uk_UA/categories.lang
index a6c3ffa01b0..7207bbacc38 100644
--- a/htdocs/langs/uk_UA/categories.lang
+++ b/htdocs/langs/uk_UA/categories.lang
@@ -62,6 +62,7 @@ ContactCategoriesShort=Contacts tags/categories
AccountsCategoriesShort=Accounts tags/categories
ProjectsCategoriesShort=Projects tags/categories
UsersCategoriesShort=Users tags/categories
+StockCategoriesShort=Warehouse tags/categories
ThisCategoryHasNoProduct=This category does not contain any product.
ThisCategoryHasNoSupplier=This category does not contain any vendor.
ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -88,3 +89,6 @@ AddProductServiceIntoCategory=Add the following product/service
ShowCategory=Show tag/category
ByDefaultInList=By default in list
ChooseCategory=Choose category
+StocksCategoriesArea=Warehouses Categories Area
+ActionCommCategoriesArea=Events Categories Area
+UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/uk_UA/companies.lang b/htdocs/langs/uk_UA/companies.lang
index 6d6b1d92e17..b4ff027e4df 100644
--- a/htdocs/langs/uk_UA/companies.lang
+++ b/htdocs/langs/uk_UA/companies.lang
@@ -247,6 +247,12 @@ ProfId3US=-
ProfId4US=-
ProfId5US=-
ProfId6US=-
+ProfId1RO=Prof Id 1 (CUI)
+ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
+ProfId3RO=Prof Id 3 (CAEN)
+ProfId4RO=-
+ProfId5RO=Prof Id 5 (EUID)
+ProfId6RO=-
ProfId1RU=Prof Id 1 (OGRN)
ProfId2RU=Prof Id 2 (INN)
ProfId3RU=Prof Id 3 (KPP)
@@ -339,7 +345,7 @@ MyContacts=My contacts
Capital=Capital
CapitalOf=Capital of %s
EditCompany=Edit company
-ThisUserIsNot=This user is not a prospect, customer nor vendor
+ThisUserIsNot=This user is not a prospect, customer or vendor
VATIntraCheck=Чек
VATIntraCheckDesc=The VAT ID must include the country prefix. The link %s uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -406,6 +412,13 @@ AllocateCommercial=Assigned to sales representative
Organization=Organization
FiscalYearInformation=Fiscal Year
FiscalMonthStart=Starting month of the fiscal year
+SocialNetworksInformation=Social networks
+SocialNetworksFacebookURL=Facebook URL
+SocialNetworksTwitterURL=Twitter URL
+SocialNetworksLinkedinURL=Linkedin URL
+SocialNetworksInstagramURL=Instagram URL
+SocialNetworksYoutubeURL=Youtube URL
+SocialNetworksGithubURL=Github URL
YouMustAssignUserMailFirst=You must create an email for this user prior to being able to add an email notification.
YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
ListSuppliersShort=List of Vendors
diff --git a/htdocs/langs/uk_UA/compta.lang b/htdocs/langs/uk_UA/compta.lang
index f314723d6bb..db4c2fecf25 100644
--- a/htdocs/langs/uk_UA/compta.lang
+++ b/htdocs/langs/uk_UA/compta.lang
@@ -63,7 +63,7 @@ LT2SupplierES=IRPF purchases
LT2CustomerIN=SGST sales
LT2SupplierIN=SGST purchases
VATCollected=VAT collected
-ToPay=To pay
+StatusToPay=To pay
SpecialExpensesArea=Area for all special payments
SocialContribution=Social or fiscal tax
SocialContributions=Social or fiscal taxes
@@ -112,7 +112,7 @@ ShowVatPayment=Show VAT payment
TotalToPay=Total to pay
BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=vendor accounting code
+SupplierAccountancyCode=Vendor accounting code
CustomerAccountancyCodeShort=Cust. account. code
SupplierAccountancyCodeShort=Sup. account. code
AccountNumber=Номер рахунка
@@ -254,3 +254,4 @@ ByVatRate=By sale tax rate
TurnoverbyVatrate=Turnover invoiced by sale tax rate
TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
PurchasebyVatrate=Purchase by sale tax rate
+LabelToShow=Short label
diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang
index b070695736f..4edca737c66 100644
--- a/htdocs/langs/uk_UA/errors.lang
+++ b/htdocs/langs/uk_UA/errors.lang
@@ -117,7 +117,8 @@ ErrorLoginDoesNotExists=User with login %s could not be found.
ErrorLoginHasNoEmail=This user has no email address. Process aborted.
ErrorBadValueForCode=Bad value for security code. Try again with new value...
ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
-ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you want to add a discount line, just create the discount first with link %s on screen and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
+ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
ErrorWebServerUserHasNotPermission=User account %s used to execute web server has no permission for that
ErrorNoActivatedBarcode=No barcode type activated
@@ -224,6 +225,8 @@ ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to
ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
ErrorFieldRequiredForProduct=Field '%s' is required for product %s
+ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
+ErrorAddAtLeastOneLineFirst=Add at least one line first
# Warnings
WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/uk_UA/holiday.lang b/htdocs/langs/uk_UA/holiday.lang
index 81585c0851a..4ab79b19d5d 100644
--- a/htdocs/langs/uk_UA/holiday.lang
+++ b/htdocs/langs/uk_UA/holiday.lang
@@ -39,8 +39,10 @@ TypeOfLeaveId=Type of leave ID
TypeOfLeaveCode=Type of leave code
TypeOfLeaveLabel=Type of leave label
NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary.
NbUseDaysCPShort=Days consumed
NbUseDaysCPShortInMonth=Days consumed in month
+DayIsANonWorkingDay=%s is a non working day
DateStartInMonth=Start date in month
DateEndInMonth=End date in month
EditCP=Edit
diff --git a/htdocs/langs/uk_UA/install.lang b/htdocs/langs/uk_UA/install.lang
index 708b3bac479..1b173656a47 100644
--- a/htdocs/langs/uk_UA/install.lang
+++ b/htdocs/langs/uk_UA/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
PHPSupportCalendar=This PHP supports calendars extensions.
PHPSupportUTF8=This PHP supports UTF8 functions.
PHPSupportIntl=This PHP supports Intl functions.
+PHPSupport=This PHP supports %s functions.
PHPMemoryOK=Your PHP max session memory is set to %s. This should be enough.
PHPMemoryTooLow=Your PHP max session memory is set to %s bytes. This is too low. Change your php.ini to set memory_limit parameter to at least %s bytes.
Recheck=Click here for a more detailed test
@@ -25,6 +26,7 @@ ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
+ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
ErrorDirDoesNotExists=Directory %s does not exist.
ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
index 278a2275452..6fcb27c143b 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -471,7 +471,7 @@ TotalDuration=Total duration
Summary=Summary
DolibarrStateBoard=Database Statistics
DolibarrWorkBoard=Open Items
-NoOpenedElementToProcess=No opened element to process
+NoOpenedElementToProcess=No open element to process
Available=Available
NotYetAvailable=Not yet available
NotAvailable=Not available
@@ -1005,7 +1005,7 @@ ContactDefault_contrat=Contract
ContactDefault_facture=Рахунок-фактура
ContactDefault_fichinter=Intervention
ContactDefault_invoice_supplier=Supplier Invoice
-ContactDefault_order_supplier=Supplier Order
+ContactDefault_order_supplier=Purchase Order
ContactDefault_project=Project
ContactDefault_project_task=Task
ContactDefault_propal=Proposal
@@ -1013,3 +1013,6 @@ ContactDefault_supplier_proposal=Supplier Proposal
ContactDefault_ticketsup=Ticket
ContactAddedAutomatically=Contact added from contact thirdparty roles
More=More
+ShowDetails=Show details
+CustomReports=Custom reports
+SelectYourGraphOptionsFirst=Select your graph options to build a graph
diff --git a/htdocs/langs/uk_UA/modulebuilder.lang b/htdocs/langs/uk_UA/modulebuilder.lang
index 5e2ae72a85a..a79b4549045 100644
--- a/htdocs/langs/uk_UA/modulebuilder.lang
+++ b/htdocs/langs/uk_UA/modulebuilder.lang
@@ -83,7 +83,7 @@ ListOfDictionariesEntries=List of dictionaries entries
ListOfPermissionsDefined=List of defined permissions
SeeExamples=See examples here
EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:
preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
($user->rights->holiday->define_holiday ? 1 : 0)
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:
preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
($user->rights->holiday->define_holiday ? 1 : 0)
IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
@@ -135,3 +135,5 @@ CSSClass=CSS Class
NotEditable=Not editable
ForeignKey=Foreign key
TypeOfFieldsHelp=Type of fields:
varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
+AsciiToHtmlConverter=Ascii to HTML converter
+AsciiToPdfConverter=Ascii to PDF converter
diff --git a/htdocs/langs/uk_UA/mrp.lang b/htdocs/langs/uk_UA/mrp.lang
index ad612115268..11c6915a25c 100644
--- a/htdocs/langs/uk_UA/mrp.lang
+++ b/htdocs/langs/uk_UA/mrp.lang
@@ -54,12 +54,15 @@ ToConsume=To consume
ToProduce=To produce
QtyAlreadyConsumed=Qty already consumed
QtyAlreadyProduced=Qty already produced
+ConsumeOrProduce=Consume or Produce
ConsumeAndProduceAll=Consume and Produce All
Manufactured=Manufactured
TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
ForAQuantityOf1=For a quantity to produce of 1
ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
-ProductionForRefAndDate=Production %s - %s
+ProductionForRef=Production of %s
AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
NoStockChangeOnServices=No stock change on services
+ProductQtyToConsumeByMO=Product quantity still to consume by open MO
+ProductQtyToProduceByMO=Product quentity still to produce by open MO
diff --git a/htdocs/langs/uk_UA/orders.lang b/htdocs/langs/uk_UA/orders.lang
index d8b16c51cf7..54f235a923e 100644
--- a/htdocs/langs/uk_UA/orders.lang
+++ b/htdocs/langs/uk_UA/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Order date
OrderDateShort=Order date
OrderToProcess=Order to process
NewOrder=New order
+NewOrderSupplier=New Purchase Order
ToOrder=Make order
MakeOrder=Make order
SupplierOrder=Purchase order
@@ -25,6 +26,8 @@ OrdersToBill=Sales orders delivered
OrdersInProcess=Sales orders in process
OrdersToProcess=Sales orders to process
SuppliersOrdersToProcess=Purchase orders to process
+SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
+AwaitingReception=Awaiting reception
StatusOrderCanceledShort=Canceled
StatusOrderDraftShort=Проект
StatusOrderValidatedShort=Підтверджений
@@ -37,7 +40,6 @@ StatusOrderDeliveredShort=Delivered
StatusOrderToBillShort=Delivered
StatusOrderApprovedShort=Approved
StatusOrderRefusedShort=Refused
-StatusOrderBilledShort=Виставлений
StatusOrderToProcessShort=To process
StatusOrderReceivedPartiallyShort=Partially received
StatusOrderReceivedAllShort=Products received
@@ -50,7 +52,6 @@ StatusOrderProcessed=Оброблений
StatusOrderToBill=Delivered
StatusOrderApproved=Approved
StatusOrderRefused=Refused
-StatusOrderBilled=Виставлений
StatusOrderReceivedPartially=Partially received
StatusOrderReceivedAll=All products received
ShippingExist=A shipment exists
@@ -68,8 +69,9 @@ ValidateOrder=Validate order
UnvalidateOrder=Unvalidate order
DeleteOrder=Delete order
CancelOrder=Cancel order
-OrderReopened= Order %s Reopened
+OrderReopened= Order %s re-open
AddOrder=Create order
+AddPurchaseOrder=Create purchase order
AddToDraftOrders=Add to draft order
ShowOrder=Show order
OrdersOpened=Orders to process
@@ -139,10 +141,10 @@ OrderByEMail=Email
OrderByWWW=Online
OrderByPhone=Phone
# Documents models
-PDFEinsteinDescription=A complete order model (logo...)
-PDFEratostheneDescription=A complete order model (logo...)
+PDFEinsteinDescription=A complete order model
+PDFEratostheneDescription=A complete order model
PDFEdisonDescription=A simple order model
-PDFProformaDescription=A complete proforma invoice (logo…)
+PDFProformaDescription=A complete Proforma invoice template
CreateInvoiceForThisCustomer=Bill orders
NoOrdersToInvoice=No orders billable
CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
@@ -152,7 +154,35 @@ OrderCreated=Your orders have been created
OrderFail=An error happened during your orders creation
CreateOrders=Create orders
ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
-OptionToSetOrderBilledNotEnabled=Option (from module Workflow) to set order to 'Billed' automatically when invoice is validated is off, so you will have to set status of order to 'Billed' manually.
+OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
-CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
+CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
SetShippingMode=Set shipping mode
+WithReceptionFinished=With reception finished
+#### supplier orders status
+StatusSupplierOrderCanceledShort=Canceled
+StatusSupplierOrderDraftShort=Проект
+StatusSupplierOrderValidatedShort=Підтверджений
+StatusSupplierOrderSentShort=In process
+StatusSupplierOrderSent=Shipment in process
+StatusSupplierOrderOnProcessShort=Ordered
+StatusSupplierOrderProcessedShort=Оброблений
+StatusSupplierOrderDelivered=Delivered
+StatusSupplierOrderDeliveredShort=Delivered
+StatusSupplierOrderToBillShort=Delivered
+StatusSupplierOrderApprovedShort=Approved
+StatusSupplierOrderRefusedShort=Refused
+StatusSupplierOrderToProcessShort=To process
+StatusSupplierOrderReceivedPartiallyShort=Partially received
+StatusSupplierOrderReceivedAllShort=Products received
+StatusSupplierOrderCanceled=Canceled
+StatusSupplierOrderDraft=Проект (має бути підтверджений)
+StatusSupplierOrderValidated=Підтверджений
+StatusSupplierOrderOnProcess=Ordered - Standby reception
+StatusSupplierOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusSupplierOrderProcessed=Оброблений
+StatusSupplierOrderToBill=Delivered
+StatusSupplierOrderApproved=Approved
+StatusSupplierOrderRefused=Refused
+StatusSupplierOrderReceivedPartially=Partially received
+StatusSupplierOrderReceivedAll=All products received
diff --git a/htdocs/langs/uk_UA/other.lang b/htdocs/langs/uk_UA/other.lang
index 7ee672f089b..46424590f31 100644
--- a/htdocs/langs/uk_UA/other.lang
+++ b/htdocs/langs/uk_UA/other.lang
@@ -24,7 +24,7 @@ MessageOK=Message on the return page for a validated payment
MessageKO=Message on the return page for a canceled payment
ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
DeleteAlsoContentRecursively=Check to delete all content recursively
-
+PoweredBy=Powered by
YearOfInvoice=Year of invoice date
PreviousYearOfInvoice=Previous year of invoice date
NextYearOfInvoice=Following year of invoice date
@@ -104,7 +104,8 @@ DemoFundation=Manage members of a foundation
DemoFundation2=Manage members and bank account of a foundation
DemoCompanyServiceOnly=Company or freelance selling service only
DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
-DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
+DemoCompanyManufacturing=Company manufacturing products
DemoCompanyAll=Company with multiple activities (all main modules)
CreatedBy=Created by %s
ModifiedBy=Modified by %s
@@ -267,7 +268,7 @@ WEBSITE_PAGEURL=URL of page
WEBSITE_TITLE=Title
WEBSITE_DESCRIPTION=Description
WEBSITE_IMAGE=Image
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITEKEY__ in the path if path depends on website name.
WEBSITE_KEYWORDS=Keywords
LinesToImport=Lines to import
diff --git a/htdocs/langs/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang
index d427e9e6e04..7eb21e0c4a3 100644
--- a/htdocs/langs/uk_UA/projects.lang
+++ b/htdocs/langs/uk_UA/projects.lang
@@ -77,7 +77,7 @@ MyProjectsArea=My projects Area
DurationEffective=Effective duration
ProgressDeclared=Declared progress
TaskProgressSummary=Task progress
-CurentlyOpenedTasks=Curently opened tasks
+CurentlyOpenedTasks=Curently open tasks
TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
ProgressCalculated=Calculated progress
@@ -249,9 +249,13 @@ TimeSpentForInvoice=Time spent
OneLinePerUser=One line per user
ServiceToUseOnLines=Service to use on lines
InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets).
+ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
ProjectFollowOpportunity=Follow opportunity
ProjectFollowTasks=Follow tasks
UsageOpportunity=Usage: Opportunity
UsageTasks=Usage: Tasks
UsageBillTimeShort=Usage: Bill time
+InvoiceToUse=Draft invoice to use
+NewInvoice=Новий рахунок-фактура
+OneLinePerTask=One line per task
+OneLinePerPeriod=One line per period
diff --git a/htdocs/langs/uk_UA/propal.lang b/htdocs/langs/uk_UA/propal.lang
index ca37590951e..b575f9bc641 100644
--- a/htdocs/langs/uk_UA/propal.lang
+++ b/htdocs/langs/uk_UA/propal.lang
@@ -28,7 +28,7 @@ ShowPropal=Show proposal
PropalsDraft=Drafts
PropalsOpened=Open
PropalStatusDraft=Проект (має бути підтверджений)
-PropalStatusValidated=Validated (proposal is opened)
+PropalStatusValidated=Validated (proposal is open)
PropalStatusSigned=Signed (needs billing)
PropalStatusNotSigned=Not signed (closed)
PropalStatusBilled=Виставлений
@@ -76,10 +76,11 @@ TypeContact_propal_external_BILLING=Customer invoice contact
TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
TypeContact_propal_external_SHIPPING=Customer contact for delivery
# Document models
-DocModelAzurDescription=A complete proposal model (logo...)
-DocModelCyanDescription=A complete proposal model (logo...)
+DocModelAzurDescription=A complete proposal model
+DocModelCyanDescription=A complete proposal model
DefaultModelPropalCreate=Default model creation
DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
ProposalCustomerSignature=Written acceptance, company stamp, date and signature
ProposalsStatisticsSuppliers=Vendor proposals statistics
+CaseFollowedBy=Case followed by
diff --git a/htdocs/langs/uk_UA/stocks.lang b/htdocs/langs/uk_UA/stocks.lang
index 0ed09c1c2b3..46576893d69 100644
--- a/htdocs/langs/uk_UA/stocks.lang
+++ b/htdocs/langs/uk_UA/stocks.lang
@@ -143,6 +143,7 @@ InventoryCode=Movement or inventory code
IsInPackage=Contained into package
WarehouseAllowNegativeTransfer=Stock can be negative
qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
+qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
@@ -192,6 +193,7 @@ TheoricalQty=Theorique qty
TheoricalValue=Theorique qty
LastPA=Last BP
CurrentPA=Curent BP
+RecordedQty=Recorded Qty
RealQty=Real Qty
RealValue=Real Value
RegulatedQty=Regulated Qty
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index 7989f355378..ee21120b982 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -519,7 +519,7 @@ Module25Desc=Sales order management
Module30Name=Invoices
Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
Module40Name=Vendors
-Module40Desc=Vendors and purchase management (purchase orders and billing)
+Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
Module42Name=Debug Logs
Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
Module49Name=Editors
@@ -561,9 +561,9 @@ Module200Desc=LDAP directory synchronization
Module210Name=PostNuke
Module210Desc=PostNuke integration
Module240Name=Data exports
-Module240Desc=Tool to export Dolibarr data (with assistants)
+Module240Desc=Tool to export Dolibarr data (with assistance)
Module250Name=Data imports
-Module250Desc=Tool to import data into Dolibarr (with assistants)
+Module250Desc=Tool to import data into Dolibarr (with assistance)
Module310Name=Members
Module310Desc=Foundation members management
Module320Name=RSS Feed
@@ -878,7 +878,7 @@ Permission1251=Run mass imports of external data into database (data load)
Permission1321=Export customer invoices, attributes and payments
Permission1322=Reopen a paid bill
Permission1421=Export sales orders and attributes
-Permission2401=Read actions (events or tasks) linked to his user account (if owner of event)
+Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
Permission2411=Read actions (events or tasks) of others
@@ -1156,7 +1156,7 @@ NoEventOrNoAuditSetup=No security event has been logged. This is normal if Audit
NoEventFoundWithCriteria=No security event has been found for this search criteria.
SeeLocalSendMailSetup=See your local sendmail setup
BackupDesc=A complete backup of a Dolibarr installation requires two steps.
-BackupDesc2=Backup the contents of the "documents" directory (%s) containing all uploaded and generated files. This will also include all the dump files generated in Step 1.
+BackupDesc2=Backup the contents of the "documents" directory (%s) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
BackupDesc3=Backup the structure and contents of your database (%s) into a dump file. For this, you can use the following assistant.
BackupDescX=The archived directory should be stored in a secure place.
BackupDescY=The generated dump file should be stored in a secure place.
@@ -1167,6 +1167,7 @@ RestoreDesc3=Restore the database structure and data from a backup dump file int
RestoreMySQL=MySQL import
ForcedToByAModule= This rule is forced to %s by an activated module
PreviousDumpFiles=Existing backup files
+PreviousArchiveFiles=Existing archive files
WeekStartOnDay=First day of the week
RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user %s or you must add -W option at end of command line to provide %s password.
@@ -1248,6 +1249,7 @@ AskForPreferredShippingMethod=Ask for preferred shipping method for Third Partie
FieldEdition=Edition of field %s
FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
GetBarCode=Get barcode
+NumberingModules=Numbering models
##### Module password generation
PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
@@ -1711,8 +1713,9 @@ ChequeReceiptsNumberingModule=Check Receipts Numbering Module
MultiCompanySetup=Multi-company module setup
##### Suppliers #####
SuppliersSetup=Vendor module setup
-SuppliersCommandModel=Complete template of purchase order (logo...)
-SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
+SuppliersCommandModel=Complete template of Purchase Order
+SuppliersCommandModelMuscadet=Complete template of Purchase Order
+SuppliersInvoiceModel=Complete template of Vendor Invoice
SuppliersInvoiceNumberingModel=Vendor invoices numbering models
IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
##### GeoIPMaxmind #####
@@ -1762,9 +1765,10 @@ ListOfNotificationsPerUser=List of automatic notifications per user*
ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
ListOfFixedNotifications=List of automatic fixed notifications
GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
Threshold=Threshold
-BackupDumpWizard=Wizard to build the backup file
+BackupDumpWizard=Wizard to build the database dump file
+BackupZipWizard=Wizard to build the archive of documents directory
SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file %s to allow this feature.
@@ -1953,6 +1957,8 @@ SmallerThan=Smaller than
LargerThan=Larger than
IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
+EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set a value here to use this feature. Note that you must also use a read/write login account.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
EndPointFor=End point for %s : %s
DeleteEmailCollector=Delete email collector
ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
diff --git a/htdocs/langs/uz_UZ/bills.lang b/htdocs/langs/uz_UZ/bills.lang
index e6ea4390fd8..7ce06448be4 100644
--- a/htdocs/langs/uz_UZ/bills.lang
+++ b/htdocs/langs/uz_UZ/bills.lang
@@ -416,7 +416,7 @@ PaymentConditionShort14D=14 days
PaymentCondition14D=14 days
PaymentConditionShort14DENDMONTH=14 days of month-end
PaymentCondition14DENDMONTH=Within 14 days following the end of the month
-FixAmount=Fixed amount
+FixAmount=Fixed amount - 1 line with label '%s'
VarAmount=Variable amount (%% tot.)
VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
# PaymentType
@@ -512,7 +512,7 @@ RevenueStamp=Revenue stamp
YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template
PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
diff --git a/htdocs/langs/uz_UZ/categories.lang b/htdocs/langs/uz_UZ/categories.lang
index a6c3ffa01b0..7207bbacc38 100644
--- a/htdocs/langs/uz_UZ/categories.lang
+++ b/htdocs/langs/uz_UZ/categories.lang
@@ -62,6 +62,7 @@ ContactCategoriesShort=Contacts tags/categories
AccountsCategoriesShort=Accounts tags/categories
ProjectsCategoriesShort=Projects tags/categories
UsersCategoriesShort=Users tags/categories
+StockCategoriesShort=Warehouse tags/categories
ThisCategoryHasNoProduct=This category does not contain any product.
ThisCategoryHasNoSupplier=This category does not contain any vendor.
ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -88,3 +89,6 @@ AddProductServiceIntoCategory=Add the following product/service
ShowCategory=Show tag/category
ByDefaultInList=By default in list
ChooseCategory=Choose category
+StocksCategoriesArea=Warehouses Categories Area
+ActionCommCategoriesArea=Events Categories Area
+UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/uz_UZ/companies.lang b/htdocs/langs/uz_UZ/companies.lang
index 7439972e906..c569a48c84a 100644
--- a/htdocs/langs/uz_UZ/companies.lang
+++ b/htdocs/langs/uz_UZ/companies.lang
@@ -247,6 +247,12 @@ ProfId3US=-
ProfId4US=-
ProfId5US=-
ProfId6US=-
+ProfId1RO=Prof Id 1 (CUI)
+ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
+ProfId3RO=Prof Id 3 (CAEN)
+ProfId4RO=-
+ProfId5RO=Prof Id 5 (EUID)
+ProfId6RO=-
ProfId1RU=Prof Id 1 (OGRN)
ProfId2RU=Prof Id 2 (INN)
ProfId3RU=Prof Id 3 (KPP)
@@ -339,7 +345,7 @@ MyContacts=My contacts
Capital=Capital
CapitalOf=Capital of %s
EditCompany=Edit company
-ThisUserIsNot=This user is not a prospect, customer nor vendor
+ThisUserIsNot=This user is not a prospect, customer or vendor
VATIntraCheck=Check
VATIntraCheckDesc=The VAT ID must include the country prefix. The link %s uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -406,6 +412,13 @@ AllocateCommercial=Assigned to sales representative
Organization=Organization
FiscalYearInformation=Fiscal Year
FiscalMonthStart=Starting month of the fiscal year
+SocialNetworksInformation=Social networks
+SocialNetworksFacebookURL=Facebook URL
+SocialNetworksTwitterURL=Twitter URL
+SocialNetworksLinkedinURL=Linkedin URL
+SocialNetworksInstagramURL=Instagram URL
+SocialNetworksYoutubeURL=Youtube URL
+SocialNetworksGithubURL=Github URL
YouMustAssignUserMailFirst=You must create an email for this user prior to being able to add an email notification.
YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
ListSuppliersShort=List of Vendors
diff --git a/htdocs/langs/uz_UZ/compta.lang b/htdocs/langs/uz_UZ/compta.lang
index 3f175b8b782..1de030a1905 100644
--- a/htdocs/langs/uz_UZ/compta.lang
+++ b/htdocs/langs/uz_UZ/compta.lang
@@ -63,7 +63,7 @@ LT2SupplierES=IRPF purchases
LT2CustomerIN=SGST sales
LT2SupplierIN=SGST purchases
VATCollected=VAT collected
-ToPay=To pay
+StatusToPay=To pay
SpecialExpensesArea=Area for all special payments
SocialContribution=Social or fiscal tax
SocialContributions=Social or fiscal taxes
@@ -112,7 +112,7 @@ ShowVatPayment=Show VAT payment
TotalToPay=Total to pay
BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=vendor accounting code
+SupplierAccountancyCode=Vendor accounting code
CustomerAccountancyCodeShort=Cust. account. code
SupplierAccountancyCodeShort=Sup. account. code
AccountNumber=Account number
@@ -254,3 +254,4 @@ ByVatRate=By sale tax rate
TurnoverbyVatrate=Turnover invoiced by sale tax rate
TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
PurchasebyVatrate=Purchase by sale tax rate
+LabelToShow=Short label
diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang
index b070695736f..4edca737c66 100644
--- a/htdocs/langs/uz_UZ/errors.lang
+++ b/htdocs/langs/uz_UZ/errors.lang
@@ -117,7 +117,8 @@ ErrorLoginDoesNotExists=User with login %s could not be found.
ErrorLoginHasNoEmail=This user has no email address. Process aborted.
ErrorBadValueForCode=Bad value for security code. Try again with new value...
ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
-ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you want to add a discount line, just create the discount first with link %s on screen and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
+ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
ErrorWebServerUserHasNotPermission=User account %s used to execute web server has no permission for that
ErrorNoActivatedBarcode=No barcode type activated
@@ -224,6 +225,8 @@ ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to
ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
ErrorFieldRequiredForProduct=Field '%s' is required for product %s
+ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
+ErrorAddAtLeastOneLineFirst=Add at least one line first
# Warnings
WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/uz_UZ/holiday.lang b/htdocs/langs/uz_UZ/holiday.lang
index 69b6a698e1a..82de49f9c5f 100644
--- a/htdocs/langs/uz_UZ/holiday.lang
+++ b/htdocs/langs/uz_UZ/holiday.lang
@@ -39,8 +39,10 @@ TypeOfLeaveId=Type of leave ID
TypeOfLeaveCode=Type of leave code
TypeOfLeaveLabel=Type of leave label
NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary.
NbUseDaysCPShort=Days consumed
NbUseDaysCPShortInMonth=Days consumed in month
+DayIsANonWorkingDay=%s is a non working day
DateStartInMonth=Start date in month
DateEndInMonth=End date in month
EditCP=Edit
diff --git a/htdocs/langs/uz_UZ/install.lang b/htdocs/langs/uz_UZ/install.lang
index 708b3bac479..1b173656a47 100644
--- a/htdocs/langs/uz_UZ/install.lang
+++ b/htdocs/langs/uz_UZ/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
PHPSupportCalendar=This PHP supports calendars extensions.
PHPSupportUTF8=This PHP supports UTF8 functions.
PHPSupportIntl=This PHP supports Intl functions.
+PHPSupport=This PHP supports %s functions.
PHPMemoryOK=Your PHP max session memory is set to %s. This should be enough.
PHPMemoryTooLow=Your PHP max session memory is set to %s bytes. This is too low. Change your php.ini to set memory_limit parameter to at least %s bytes.
Recheck=Click here for a more detailed test
@@ -25,6 +26,7 @@ ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
+ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
ErrorDirDoesNotExists=Directory %s does not exist.
ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index 252366f2802..969dfce4084 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -471,7 +471,7 @@ TotalDuration=Total duration
Summary=Summary
DolibarrStateBoard=Database Statistics
DolibarrWorkBoard=Open Items
-NoOpenedElementToProcess=No opened element to process
+NoOpenedElementToProcess=No open element to process
Available=Available
NotYetAvailable=Not yet available
NotAvailable=Not available
@@ -1005,7 +1005,7 @@ ContactDefault_contrat=Contract
ContactDefault_facture=Invoice
ContactDefault_fichinter=Intervention
ContactDefault_invoice_supplier=Supplier Invoice
-ContactDefault_order_supplier=Supplier Order
+ContactDefault_order_supplier=Purchase Order
ContactDefault_project=Project
ContactDefault_project_task=Task
ContactDefault_propal=Proposal
@@ -1013,3 +1013,6 @@ ContactDefault_supplier_proposal=Supplier Proposal
ContactDefault_ticketsup=Ticket
ContactAddedAutomatically=Contact added from contact thirdparty roles
More=More
+ShowDetails=Show details
+CustomReports=Custom reports
+SelectYourGraphOptionsFirst=Select your graph options to build a graph
diff --git a/htdocs/langs/uz_UZ/orders.lang b/htdocs/langs/uz_UZ/orders.lang
index ad895845488..503955cf5f0 100644
--- a/htdocs/langs/uz_UZ/orders.lang
+++ b/htdocs/langs/uz_UZ/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Order date
OrderDateShort=Order date
OrderToProcess=Order to process
NewOrder=New order
+NewOrderSupplier=New Purchase Order
ToOrder=Make order
MakeOrder=Make order
SupplierOrder=Purchase order
@@ -25,6 +26,8 @@ OrdersToBill=Sales orders delivered
OrdersInProcess=Sales orders in process
OrdersToProcess=Sales orders to process
SuppliersOrdersToProcess=Purchase orders to process
+SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
+AwaitingReception=Awaiting reception
StatusOrderCanceledShort=Canceled
StatusOrderDraftShort=Draft
StatusOrderValidatedShort=Validated
@@ -37,7 +40,6 @@ StatusOrderDeliveredShort=Delivered
StatusOrderToBillShort=Delivered
StatusOrderApprovedShort=Approved
StatusOrderRefusedShort=Refused
-StatusOrderBilledShort=Billed
StatusOrderToProcessShort=To process
StatusOrderReceivedPartiallyShort=Partially received
StatusOrderReceivedAllShort=Products received
@@ -50,7 +52,6 @@ StatusOrderProcessed=Processed
StatusOrderToBill=Delivered
StatusOrderApproved=Approved
StatusOrderRefused=Refused
-StatusOrderBilled=Billed
StatusOrderReceivedPartially=Partially received
StatusOrderReceivedAll=All products received
ShippingExist=A shipment exists
@@ -68,8 +69,9 @@ ValidateOrder=Validate order
UnvalidateOrder=Unvalidate order
DeleteOrder=Delete order
CancelOrder=Cancel order
-OrderReopened= Order %s Reopened
+OrderReopened= Order %s re-open
AddOrder=Create order
+AddPurchaseOrder=Create purchase order
AddToDraftOrders=Add to draft order
ShowOrder=Show order
OrdersOpened=Orders to process
@@ -139,10 +141,10 @@ OrderByEMail=Email
OrderByWWW=Online
OrderByPhone=Phone
# Documents models
-PDFEinsteinDescription=A complete order model (logo...)
-PDFEratostheneDescription=A complete order model (logo...)
+PDFEinsteinDescription=A complete order model
+PDFEratostheneDescription=A complete order model
PDFEdisonDescription=A simple order model
-PDFProformaDescription=A complete proforma invoice (logo…)
+PDFProformaDescription=A complete Proforma invoice template
CreateInvoiceForThisCustomer=Bill orders
NoOrdersToInvoice=No orders billable
CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
@@ -152,7 +154,35 @@ OrderCreated=Your orders have been created
OrderFail=An error happened during your orders creation
CreateOrders=Create orders
ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
-OptionToSetOrderBilledNotEnabled=Option (from module Workflow) to set order to 'Billed' automatically when invoice is validated is off, so you will have to set status of order to 'Billed' manually.
+OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
-CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
+CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
SetShippingMode=Set shipping mode
+WithReceptionFinished=With reception finished
+#### supplier orders status
+StatusSupplierOrderCanceledShort=Canceled
+StatusSupplierOrderDraftShort=Draft
+StatusSupplierOrderValidatedShort=Validated
+StatusSupplierOrderSentShort=In process
+StatusSupplierOrderSent=Shipment in process
+StatusSupplierOrderOnProcessShort=Ordered
+StatusSupplierOrderProcessedShort=Processed
+StatusSupplierOrderDelivered=Delivered
+StatusSupplierOrderDeliveredShort=Delivered
+StatusSupplierOrderToBillShort=Delivered
+StatusSupplierOrderApprovedShort=Approved
+StatusSupplierOrderRefusedShort=Refused
+StatusSupplierOrderToProcessShort=To process
+StatusSupplierOrderReceivedPartiallyShort=Partially received
+StatusSupplierOrderReceivedAllShort=Products received
+StatusSupplierOrderCanceled=Canceled
+StatusSupplierOrderDraft=Draft (needs to be validated)
+StatusSupplierOrderValidated=Validated
+StatusSupplierOrderOnProcess=Ordered - Standby reception
+StatusSupplierOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusSupplierOrderProcessed=Processed
+StatusSupplierOrderToBill=Delivered
+StatusSupplierOrderApproved=Approved
+StatusSupplierOrderRefused=Refused
+StatusSupplierOrderReceivedPartially=Partially received
+StatusSupplierOrderReceivedAll=All products received
diff --git a/htdocs/langs/uz_UZ/other.lang b/htdocs/langs/uz_UZ/other.lang
index 7ee672f089b..46424590f31 100644
--- a/htdocs/langs/uz_UZ/other.lang
+++ b/htdocs/langs/uz_UZ/other.lang
@@ -24,7 +24,7 @@ MessageOK=Message on the return page for a validated payment
MessageKO=Message on the return page for a canceled payment
ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
DeleteAlsoContentRecursively=Check to delete all content recursively
-
+PoweredBy=Powered by
YearOfInvoice=Year of invoice date
PreviousYearOfInvoice=Previous year of invoice date
NextYearOfInvoice=Following year of invoice date
@@ -104,7 +104,8 @@ DemoFundation=Manage members of a foundation
DemoFundation2=Manage members and bank account of a foundation
DemoCompanyServiceOnly=Company or freelance selling service only
DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
-DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
+DemoCompanyManufacturing=Company manufacturing products
DemoCompanyAll=Company with multiple activities (all main modules)
CreatedBy=Created by %s
ModifiedBy=Modified by %s
@@ -267,7 +268,7 @@ WEBSITE_PAGEURL=URL of page
WEBSITE_TITLE=Title
WEBSITE_DESCRIPTION=Description
WEBSITE_IMAGE=Image
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITEKEY__ in the path if path depends on website name.
WEBSITE_KEYWORDS=Keywords
LinesToImport=Lines to import
diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang
index 868a696c20a..e9a559f6140 100644
--- a/htdocs/langs/uz_UZ/projects.lang
+++ b/htdocs/langs/uz_UZ/projects.lang
@@ -77,7 +77,7 @@ MyProjectsArea=My projects Area
DurationEffective=Effective duration
ProgressDeclared=Declared progress
TaskProgressSummary=Task progress
-CurentlyOpenedTasks=Curently opened tasks
+CurentlyOpenedTasks=Curently open tasks
TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
ProgressCalculated=Calculated progress
@@ -249,9 +249,13 @@ TimeSpentForInvoice=Time spent
OneLinePerUser=One line per user
ServiceToUseOnLines=Service to use on lines
InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets).
+ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
ProjectFollowOpportunity=Follow opportunity
ProjectFollowTasks=Follow tasks
UsageOpportunity=Usage: Opportunity
UsageTasks=Usage: Tasks
UsageBillTimeShort=Usage: Bill time
+InvoiceToUse=Draft invoice to use
+NewInvoice=New invoice
+OneLinePerTask=One line per task
+OneLinePerPeriod=One line per period
diff --git a/htdocs/langs/uz_UZ/propal.lang b/htdocs/langs/uz_UZ/propal.lang
index 7fce5107356..39bfdea31c8 100644
--- a/htdocs/langs/uz_UZ/propal.lang
+++ b/htdocs/langs/uz_UZ/propal.lang
@@ -28,7 +28,7 @@ ShowPropal=Show proposal
PropalsDraft=Drafts
PropalsOpened=Open
PropalStatusDraft=Draft (needs to be validated)
-PropalStatusValidated=Validated (proposal is opened)
+PropalStatusValidated=Validated (proposal is open)
PropalStatusSigned=Signed (needs billing)
PropalStatusNotSigned=Not signed (closed)
PropalStatusBilled=Billed
@@ -76,10 +76,11 @@ TypeContact_propal_external_BILLING=Customer invoice contact
TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
TypeContact_propal_external_SHIPPING=Customer contact for delivery
# Document models
-DocModelAzurDescription=A complete proposal model (logo...)
-DocModelCyanDescription=A complete proposal model (logo...)
+DocModelAzurDescription=A complete proposal model
+DocModelCyanDescription=A complete proposal model
DefaultModelPropalCreate=Default model creation
DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
ProposalCustomerSignature=Written acceptance, company stamp, date and signature
ProposalsStatisticsSuppliers=Vendor proposals statistics
+CaseFollowedBy=Case followed by
diff --git a/htdocs/langs/uz_UZ/stocks.lang b/htdocs/langs/uz_UZ/stocks.lang
index 2e207e63b39..9856649b834 100644
--- a/htdocs/langs/uz_UZ/stocks.lang
+++ b/htdocs/langs/uz_UZ/stocks.lang
@@ -143,6 +143,7 @@ InventoryCode=Movement or inventory code
IsInPackage=Contained into package
WarehouseAllowNegativeTransfer=Stock can be negative
qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
+qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
@@ -192,6 +193,7 @@ TheoricalQty=Theorique qty
TheoricalValue=Theorique qty
LastPA=Last BP
CurrentPA=Curent BP
+RecordedQty=Recorded Qty
RealQty=Real Qty
RealValue=Real Value
RegulatedQty=Regulated Qty
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index 0583a93dc95..2d42d48bc19 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -519,7 +519,7 @@ Module25Desc=Quản lý đơn hàng bán
Module30Name=Hoá đơn
Module30Desc=Quản lý hóa đơn và ghi chú tín dụng cho khách hàng. Quản lý hóa đơn và ghi chú tín dụng cho nhà cung cấp
Module40Name=Nhà cung cấp
-Module40Desc=Nhà cung cấp và quản lý mua hàng (đơn đặt hàng và thanh toán)
+Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
Module42Name=Nhật ký gỡ lỗi
Module42Desc=Phương tiện ghi nhật ký (tệp, syslog, ...). Nhật ký như vậy là cho mục đích kỹ thuật / gỡ lỗi.
Module49Name=Biên tập
@@ -561,9 +561,9 @@ Module200Desc=Đồng bộ hóa thư mục LDAP
Module210Name=PostNuke
Module210Desc=Tích hợp PostNuke
Module240Name=Xuất dữ liệu
-Module240Desc=Công cụ xuất dữ liệu Dolibarr (có trợ lý)
+Module240Desc=Tool to export Dolibarr data (with assistance)
Module250Name=Nhập dữ liệu
-Module250Desc=Công cụ nhập dữ liệu vào Dolibarr (có trợ lý)
+Module250Desc=Tool to import data into Dolibarr (with assistance)
Module310Name=Thành viên
Module310Desc=Quản lý thành viên của tổ chức
Module320Name=RSS Feed
@@ -878,7 +878,7 @@ Permission1251=Chạy nhập dữ liệu khối cho dữ liệu bên ngoài vào
Permission1321=Xuất dữ liệu Hóa đơn khách hàng, các thuộc tính và thanh toán
Permission1322=Mở lại một hóa đơn thanh toán
Permission1421=Xuất dữ liệu đơn đặt hàng và các thuộc tính
-Permission2401=Xem các hành động (sự kiện hoặc nhiệm vụ) được liên kết với tài khoản người dùng của họ (nếu là chủ sở hữu của sự kiện)
+Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
Permission2402=Tạo / sửa đổi các hành động (sự kiện hoặc tác vụ) được liên kết với tài khoản người dùng của họ (nếu là chủ sở hữu của sự kiện)
Permission2403=Xóa các hành động (sự kiện hoặc tác vụ) được liên kết với tài khoản người dùng của họ (nếu là chủ sở hữu của sự kiện)
Permission2411=Xem hành động (sự kiện hay tác vụ) của người khác
@@ -1156,7 +1156,7 @@ NoEventOrNoAuditSetup=Không có sự kiện bảo mật đã được ghi vào
NoEventFoundWithCriteria=Không có sự kiện bảo mật được tìm thấy cho tiêu chí tìm kiếm này.
SeeLocalSendMailSetup=Xem thiết lập sendmail địa phương của bạn
BackupDesc=Một bản sao lưu hoàn chỉnh của bản cài đặt Dolibarr yêu cầu hai bước.
-BackupDesc2=Sao lưu nội dung của thư mục "document" ( %s ) có chứa tất cả các tệp được tải lên và tạo ra. Điều này cũng sẽ bao gồm tất cả các tệp kết xuất được tạo trong Bước 1.
+BackupDesc2=Backup the contents of the "documents" directory (%s) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
BackupDesc3=Sao lưu cấu trúc và nội dung của cơ sở dữ liệu của bạn ( %s ) vào một tệp kết xuất. Đối với điều này, bạn có thể sử dụng theo các trợ lý.
BackupDescX=Thư mục lưu trữ nên được lưu trữ ở một nơi an toàn.
BackupDescY=Tạo ra các tập tin dump nên được lưu trữ ở một nơi an toàn.
@@ -1167,6 +1167,7 @@ RestoreDesc3=Khôi phục cấu trúc cơ sở dữ liệu và dữ liệu từ
RestoreMySQL=MySQL nhập dữ liệu
ForcedToByAModule= Quy luật này buộc %s bởi một mô-đun được kích hoạt
PreviousDumpFiles=Các tập tin sao lưu hiện có
+PreviousArchiveFiles=Existing archive files
WeekStartOnDay=Ngày đầu tiên trong tuần
RunningUpdateProcessMayBeRequired=Quá trình chạy nâng cấp dường như là bắt buộc (Phiên bản chương trình %s khác với phiên bản Cơ sở dữ liệu %s)
YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user %s or you must add -W option at end of command line to provide %s password.
@@ -1248,6 +1249,7 @@ AskForPreferredShippingMethod=Yêu cầu phương thức vận chuyển ưa thí
FieldEdition=Biên soạn của trường %s
FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
GetBarCode=Nhận mã vạch
+NumberingModules=Numbering models
##### Module password generation
PasswordGenerationStandard=Quay trở lại một mật khẩu được tạo ra theo thuật toán Dolibarr nội bộ: 8 ký tự có chứa số chia sẻ và ký tự trong chữ thường.
PasswordGenerationNone=Không có gợi ý tạo mật khẩu. Mật khẩu phải được nhập bằng tay.
@@ -1711,8 +1713,9 @@ ChequeReceiptsNumberingModule=Kiểm tra mô-đun đánh số biên nhận séc
MultiCompanySetup=Thiết lập mô-đun đa công ty
##### Suppliers #####
SuppliersSetup=Thiết lập mô-đun nhà cung cấp
-SuppliersCommandModel=Mẫu hoàn chỉnh của đơn đặt hàng (logo ...)
-SuppliersInvoiceModel=Mẫu hoàn chỉnh của hóa đơn nhà cung cấp (logo ...)
+SuppliersCommandModel=Complete template of Purchase Order
+SuppliersCommandModelMuscadet=Complete template of Purchase Order
+SuppliersInvoiceModel=Complete template of Vendor Invoice
SuppliersInvoiceNumberingModel=Mô hình đánh số hóa đơn nhà cung cấp
IfSetToYesDontForgetPermission=Nếu được đặt thành giá trị không null, đừng quên cung cấp quyền cho các nhóm hoặc người dùng được phép phê duyệt lần thứ hai
##### GeoIPMaxmind #####
@@ -1762,9 +1765,10 @@ ListOfNotificationsPerUser=Danh sách thông báo tự động cho mỗi ngườ
ListOfNotificationsPerUserOrContact=Danh sách các thông báo tự động có thể có (về sự kiện kinh doanh) có sẵn cho mỗi người dùng * hoặc mỗi liên lạc **
ListOfFixedNotifications=Danh sách thông báo cố định tự động
GoOntoUserCardToAddMore=Chuyển đến tab "Thông báo" của người dùng để thêm hoặc xóa thông báo cho người dùng
-GoOntoContactCardToAddMore=Chuyển đến tab "Thông báo" của bên thứ ba để thêm hoặc xóa thông báo cho các liên lạc/địa chỉ
+GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
Threshold=Threshold
-BackupDumpWizard=Thuật sĩ xây dựng tệp sao lưu
+BackupDumpWizard=Wizard to build the database dump file
+BackupZipWizard=Wizard to build the archive of documents directory
SomethingMakeInstallFromWebNotPossible=Cài đặt module bên ngoài là không thể từ giao diện web với các lý do sau:
SomethingMakeInstallFromWebNotPossible2=Vì lý do này, quá trình nâng cấp được mô tả ở đây là quy trình thủ công chỉ người dùng đặc quyền mới có thể thực hiện.
InstallModuleFromWebHasBeenDisabledByFile=Cài đặt các module bên ngoài từ các ứng dụng đã bị vô hiệu bởi quản trị viên của bạn. Bạn phải yêu cầu ông phải loại bỏ các tập tin %s để cho phép tính năng này.
@@ -1953,6 +1957,8 @@ SmallerThan=Nhỏ hơn
LargerThan=Lớn hơn
IfTrackingIDFoundEventWillBeLinked=Lưu ý rằng nếu tìm thấy ID theo dõi trong email đến, sự kiện sẽ được tự động liên kết với các đối tượng liên quan.
WithGMailYouCanCreateADedicatedPassword=Với tài khoản GMail, nếu bạn đã bật xác thực 2 bước, bạn nên tạo mật khẩu thứ hai dành riêng cho ứng dụng thay vì sử dụng mật khẩu tài khoản của riêng bạn từ https://myaccount.google.com/.
+EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set a value here to use this feature. Note that you must also use a read/write login account.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
EndPointFor=Điểm kết thúc cho %s: %s
DeleteEmailCollector=Xóa trình thu thập email
ConfirmDeleteEmailCollector=Bạn có chắc chắn muốn xóa trình thu thập email này?
diff --git a/htdocs/langs/vi_VN/bills.lang b/htdocs/langs/vi_VN/bills.lang
index 5616615c943..e5835ff67ee 100644
--- a/htdocs/langs/vi_VN/bills.lang
+++ b/htdocs/langs/vi_VN/bills.lang
@@ -416,7 +416,7 @@ PaymentConditionShort14D=14 ngày
PaymentCondition14D=14 ngày
PaymentConditionShort14DENDMONTH=14 ngày cuối tháng
PaymentCondition14DENDMONTH=Trong vòng 14 ngày sau khi kết thúc tháng
-FixAmount=Số tiền cố định
+FixAmount=Fixed amount - 1 line with label '%s'
VarAmount=Số tiền thay đổi (%% tot.)
VarAmountOneLine=Số tiền thay đổi (%% tot.) - 1 dòng có nhãn '%s'
# PaymentType
@@ -512,7 +512,7 @@ RevenueStamp=Doanh thu đóng dấu
YouMustCreateInvoiceFromThird=Tùy chọn này chỉ khả dụng khi tạo hóa đơn từ tab "Khách hàng" của bên thứ ba
YouMustCreateInvoiceFromSupplierThird=Tùy chọn này chỉ khả dụng khi tạo hóa đơn từ tab "Nhà cung cấp" của bên thứ ba
YouMustCreateStandardInvoiceFirstDesc=Trước tiên, bạn phải tạo hóa đơn chuẩn và chuyển đổi thành "mẫu" để tạo hóa đơn mẫu mới
-PDFCrabeDescription=Hóa đơn mẫu PDF Crabe. Một mẫu hóa đơn đầy đủ (mẫu đề nghị)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template
PDFSpongeDescription=Hóa đơn PDF mẫu Sponge. Một mẫu hóa đơn hoàn chỉnh
PDFCrevetteDescription=Hóa đơn PDF mẫu Crevette. Mẫu hóa đơn hoàn chỉnh cho hóa đơn tình huống
TerreNumRefModelDesc1=Quay về số với định dạng %ssyymm-nnnn cho hóa đơn chuẩn và %syymm-nnnn cho các giấy báo có nơi mà yy là năm, mm là tháng và nnnn là một chuỗi ngắt và không trở về 0
diff --git a/htdocs/langs/vi_VN/categories.lang b/htdocs/langs/vi_VN/categories.lang
index 666150e4f72..6d89e248588 100644
--- a/htdocs/langs/vi_VN/categories.lang
+++ b/htdocs/langs/vi_VN/categories.lang
@@ -90,4 +90,5 @@ ShowCategory=Hiển thị thẻ/ danh mục
ByDefaultInList=Theo mặc định trong danh sách
ChooseCategory=Chọn danh mục
StocksCategoriesArea=Khu vực Danh mục Kho
+ActionCommCategoriesArea=Events Categories Area
UseOrOperatorForCategories=Sử dụng hoặc điều hành các danh mục
diff --git a/htdocs/langs/vi_VN/companies.lang b/htdocs/langs/vi_VN/companies.lang
index e561cb2fb52..63225bdbd93 100644
--- a/htdocs/langs/vi_VN/companies.lang
+++ b/htdocs/langs/vi_VN/companies.lang
@@ -247,6 +247,12 @@ ProfId3US=-
ProfId4US=-
ProfId5US=-
ProfId6US=-
+ProfId1RO=Prof Id 1 (CUI)
+ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
+ProfId3RO=Prof Id 3 (CAEN)
+ProfId4RO=-
+ProfId5RO=Prof Id 5 (EUID)
+ProfId6RO=-
ProfId1RU=Prof Id 1 (OGRN)
ProfId2RU=Prof Id 2 (INN)
ProfId3RU=Prof Id 3 (KPP)
@@ -339,7 +345,7 @@ MyContacts=Liên lạc của tôi
Capital=Vốn
CapitalOf=Vốn của %s
EditCompany=Chỉnh sửa công ty
-ThisUserIsNot=Người dùng này không phải là một triển vọng, khách hàng cũng không phải nhà cung cấp
+ThisUserIsNot=This user is not a prospect, customer or vendor
VATIntraCheck=Kiểm tra
VATIntraCheckDesc=ID VAT phải bao gồm tiền tố quốc gia. Liên kết %s sử dụng dịch vụ kiểm tra VAT Châu Âu (VIES) yêu cầu truy cập internet từ máy chủ Dolibarr.
VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -406,6 +412,13 @@ AllocateCommercial=Giao cho đại diện bán hàng
Organization=Tổ chức
FiscalYearInformation=Năm tài chính
FiscalMonthStart=Tháng bắt đầu của năm tài chính
+SocialNetworksInformation=Social networks
+SocialNetworksFacebookURL=Facebook URL
+SocialNetworksTwitterURL=Twitter URL
+SocialNetworksLinkedinURL=Linkedin URL
+SocialNetworksInstagramURL=Instagram URL
+SocialNetworksYoutubeURL=Youtube URL
+SocialNetworksGithubURL=Github URL
YouMustAssignUserMailFirst=Bạn phải tạo một email cho người dùng này trước khi có thể thêm thông báo email.
YouMustCreateContactFirst=Để có thể thêm thông báo email, trước tiên bạn phải xác định danh bạ với email hợp lệ cho bên thứ ba
ListSuppliersShort=Danh sách nhà cung cấp
diff --git a/htdocs/langs/vi_VN/compta.lang b/htdocs/langs/vi_VN/compta.lang
index a4f520636b7..c6b810a1adb 100644
--- a/htdocs/langs/vi_VN/compta.lang
+++ b/htdocs/langs/vi_VN/compta.lang
@@ -254,3 +254,4 @@ ByVatRate=Theo thuế suất bán hàng
TurnoverbyVatrate=Doanh thu được lập hóa đơn theo thuế suất bán hàng
TurnoverCollectedbyVatrate=Doanh thu được thu thập theo thuế suất bán hàng
PurchasebyVatrate=Mua theo thuế suất bán hàng
+LabelToShow=Nhãn ngắn
diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang
index b3279840a6a..78bd2fca7c7 100644
--- a/htdocs/langs/vi_VN/errors.lang
+++ b/htdocs/langs/vi_VN/errors.lang
@@ -117,7 +117,8 @@ ErrorLoginDoesNotExists=Người sử dụng có đăng nhập% s không
ErrorLoginHasNoEmail=Thành viên này không có địa chỉ email. Quá trình hủy bỏ.
ErrorBadValueForCode=Bad giá trị so với mã bảo vệ. Hãy thử lại với giá trị mới ...
ErrorBothFieldCantBeNegative=Fields% s và% s không thể được cả hai tiêu cực
-ErrorFieldCantBeNegativeOnInvoice=Trường %s không thể có giá trị âm trên loại hóa đơn này. Nếu bạn muốn thêm một dòng giảm giá, trước tiên chỉ cần tạo giảm giá với liên kết %s trên màn hình và áp dụng nó cho hóa đơn. Bạn cũng có thể yêu cầu quản trị viên của mình đặt tùy chọn FACTURE_ENABLE_NEGECT_LINES thành 1 để cho phép hành vi cũ.
+ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
ErrorQtyForCustomerInvoiceCantBeNegative=Số lượng cho dòng vào hóa đơn của khách hàng không thể âm
ErrorWebServerUserHasNotPermission=Tài khoản người dùng% s được sử dụng để thực hiện các máy chủ web không có sự cho phép cho điều đó
ErrorNoActivatedBarcode=Không có loại mã vạch kích hoạt
@@ -224,6 +225,8 @@ ErrorObjectMustHaveStatusActiveToBeDisabled=Các đối tượng phải có tr
ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Các đối tượng phải có trạng thái 'Dự thảo' hoặc 'Đã vô hiệu' để được kích hoạt
ErrorNoFieldWithAttributeShowoncombobox=Không có trường nào có thuộc tính 'showoncombobox' bên trong định nghĩa của đối tượng '%s'. Không có cách nào để hiển thị combolist.
ErrorFieldRequiredForProduct=Field '%s' is required for product %s
+ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
+ErrorAddAtLeastOneLineFirst=Add at least one line first
# Warnings
WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Tham số PHP của bạn upload_max_filesize (%s) cao hơn tham số PHP post_max_size (%s). Đây không phải là một thiết lập phù hợp.
WarningPasswordSetWithNoAccount=Một mật khẩu đã được đặt cho thành viên này. Tuy nhiên, không có tài khoản người dùng nào được tạo. Vì vậy, mật khẩu này được lưu trữ nhưng không thể được sử dụng để đăng nhập vào Dolibarr. Nó có thể được sử dụng bởi một mô-đun / giao diện bên ngoài nhưng nếu bạn không cần xác định bất kỳ thông tin đăng nhập hay mật khẩu nào cho thành viên, bạn có thể tắt tùy chọn "Quản lý đăng nhập cho từng thành viên" từ thiết lập mô-đun Thành viên. Nếu bạn cần quản lý thông tin đăng nhập nhưng không cần bất kỳ mật khẩu nào, bạn có thể để trống trường này để tránh cảnh báo này. Lưu ý: Email cũng có thể được sử dụng làm thông tin đăng nhập nếu thành viên được liên kết với người dùng.
diff --git a/htdocs/langs/vi_VN/holiday.lang b/htdocs/langs/vi_VN/holiday.lang
index 37fb63282c7..cc8fee2a000 100644
--- a/htdocs/langs/vi_VN/holiday.lang
+++ b/htdocs/langs/vi_VN/holiday.lang
@@ -39,8 +39,10 @@ TypeOfLeaveId=ID Loại nghỉ phép
TypeOfLeaveCode=Mã Loại nghỉ phép
TypeOfLeaveLabel=Nhãn Loại nghỉ phép
NbUseDaysCP=Số ngày nghỉ đã tiêu thụ
+NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary.
NbUseDaysCPShort=Ngày đã tiêu thụ
NbUseDaysCPShortInMonth=Số ngày đã tiêu thụ trong tháng
+DayIsANonWorkingDay=%s is a non working day
DateStartInMonth=Ngày bắt đầu trong tháng
DateEndInMonth=Ngày kết thúc trong tháng
EditCP=Chỉnh sửa
diff --git a/htdocs/langs/vi_VN/install.lang b/htdocs/langs/vi_VN/install.lang
index dbb88b322a8..cc1544916a9 100644
--- a/htdocs/langs/vi_VN/install.lang
+++ b/htdocs/langs/vi_VN/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=PHP này hỗ trợ Curl.
PHPSupportCalendar=PHP này hỗ trợ các lịch phần mở rộng.
PHPSupportUTF8=PHP này hỗ trợ các chức năng UTF8.
PHPSupportIntl=PHP này hỗ trợ các chức năng Intl.
+PHPSupport=This PHP supports %s functions.
PHPMemoryOK=PHP bộ nhớ phiên tối đa của bạn được thiết lập %s. Điều này là đủ.
PHPMemoryTooLow=Bộ nhớ phiên tối đa PHP của bạn được đặt thành %s byte. Điều này là quá thấp. Thay đổi php.ini của bạn để đặt tham số memory_limit thành ít nhất %s byte.
Recheck=Nhấn vào đây để kiểm tra chi tiết hơn
@@ -25,6 +26,7 @@ ErrorPHPDoesNotSupportCurl=Cài đặt PHP của bạn không hỗ trợ Curl.
ErrorPHPDoesNotSupportCalendar=Cài đặt PHP của bạn không hỗ trợ các phần mở rộng lịch php.
ErrorPHPDoesNotSupportUTF8=Cài đặt PHP của bạn không hỗ trợ các chức năng UTF8. Dolibarr không thể hoạt động chính xác. Giải quyết điều này trước khi cài đặt Dolibarr.
ErrorPHPDoesNotSupportIntl=Cài đặt PHP của bạn không hỗ trợ các chức năng Intl.
+ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
ErrorDirDoesNotExists=Thư mục %s không tồn tại.
ErrorGoBackAndCorrectParameters=Quay lại và kiểm tra / sửa các tham số.
ErrorWrongValueForParameter=Bạn có thể gõ một giá trị sai cho tham số '%s'.
diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index 71c4ed9ef28..ef977fcee1f 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -471,7 +471,7 @@ TotalDuration=Tổng thời hạn
Summary=Tóm tắt
DolibarrStateBoard=Thống kê cơ sở dữ liệu
DolibarrWorkBoard=Các chỉ mục mở
-NoOpenedElementToProcess=Không có phần tử mở để xử lý
+NoOpenedElementToProcess=No open element to process
Available=Sẵn có
NotYetAvailable=Chưa có
NotAvailable=Chưa có
@@ -741,7 +741,7 @@ NotSupported=Không được hỗ trợ
RequiredField=Dòng bắt buộc
Result=Kết quả
ToTest=Kiểm tra
-ValidateBefore=Item must be validated before using this feature
+ValidateBefore=Mục phải được xác nhận trước khi sử dụng tính năng này
Visibility=Hiển thị
Totalizable=Tổng hợp
TotalizableDesc=Trường này được tổng hợp trong danh sách
@@ -1005,11 +1005,14 @@ ContactDefault_contrat=Hợp đồng
ContactDefault_facture=Hoá đơn
ContactDefault_fichinter=Can thiệp
ContactDefault_invoice_supplier=Hóa đơn nhà cung cấp
-ContactDefault_order_supplier=Đơn hàng nhà cung cấp
+ContactDefault_order_supplier=Purchase Order
ContactDefault_project=Dự án
ContactDefault_project_task=Tác vụ
ContactDefault_propal=Đơn hàng đề xuất
ContactDefault_supplier_proposal=Đề xuất nhà cung cấp
ContactDefault_ticketsup=Vé
ContactAddedAutomatically=Liên lạc được thêm từ vai trò liên lạc của bên thứ ba
-More=More
+More=Thêm nữa
+ShowDetails=Show details
+CustomReports=Custom reports
+SelectYourGraphOptionsFirst=Select your graph options to build a graph
diff --git a/htdocs/langs/vi_VN/modulebuilder.lang b/htdocs/langs/vi_VN/modulebuilder.lang
index 844dc08354c..c5221854aa7 100644
--- a/htdocs/langs/vi_VN/modulebuilder.lang
+++ b/htdocs/langs/vi_VN/modulebuilder.lang
@@ -83,7 +83,7 @@ ListOfDictionariesEntries=Danh sách các mục từ điển
ListOfPermissionsDefined=Danh sách các quyền được định nghĩa
SeeExamples=Xem ví dụ ở đây
EnabledDesc=Điều kiện để có trường này hoạt động (Ví dụ: 1 hoặc $conf-> golobal->MYMODULE_MYOPTION)
-VisibleDesc=Trường này có thể thấy? (Ví dụ: 0 = Không bao giờ hiển thị, 1 = Hiển thị trên danh sách và biểu mẫu tạo/cập nhật/xem, 2=Chỉ hiển thị trên danh sách, 3=Hiển thị chỉ trên biểu mẫu tạo/cập nhật/xem (không liệt kê), 4=Hiển thị trên danh sách và chỉ biểu mẫu cập nhật/xem (không tạo). Sử dụng giá trị âm có nghĩa là trường không được hiển thị theo mặc định trong danh sách nhưng có thể được chọn để xem). Nó có thể là một biểu thức, ví dụ:
preg_match('/public/', $_SERVER ['PHP_SELF'])?0: 1
($user->rights->holiday->define_holiday? 1 : 0)
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:
preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
($user->rights->holiday->define_holiday ? 1 : 0)
IsAMeasureDesc=Giá trị của trường có thể được tích lũy để có được tổng số vào danh sách không? (Ví dụ: 1 hoặc 0)
SearchAllDesc=Là trường được sử dụng để thực hiện tìm kiếm từ công cụ tìm kiếm nhanh? (Ví dụ: 1 hoặc 0)
SpecDefDesc=Nhập vào đây tất cả tài liệu bạn muốn cung cấp với mô-đun chưa được xác định bởi các tab khác. Bạn có thể sử dụng .md hoặc tốt hơn, cú pháp .asciidoc đầy đủ.
@@ -135,3 +135,5 @@ CSSClass=Lớp CSS
NotEditable=Không thể chỉnh sửa
ForeignKey=Khóa ngoại
TypeOfFieldsHelp=Kiểu trường:
varchar (99), double (24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' có nghĩa là chúng ta thêm nút + sau khi kết hợp để tạo bản ghi, ví dụ 'bộ lọc' có thể là 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTEER__)')
+AsciiToHtmlConverter=Ascii to HTML converter
+AsciiToPdfConverter=Ascii to PDF converter
diff --git a/htdocs/langs/vi_VN/mrp.lang b/htdocs/langs/vi_VN/mrp.lang
index 56a5ca4185d..89ce772451d 100644
--- a/htdocs/langs/vi_VN/mrp.lang
+++ b/htdocs/langs/vi_VN/mrp.lang
@@ -54,12 +54,15 @@ ToConsume=Để tiêu thụ
ToProduce=Để sản xuất
QtyAlreadyConsumed=Số lượng đã tiêu thụ
QtyAlreadyProduced=Số lượng đã được sản xuất
+ConsumeOrProduce=Consume or Produce
ConsumeAndProduceAll=Tiêu thụ và sản xuất tất cả
Manufactured=Được sản xuất
TheProductXIsAlreadyTheProductToProduce=Các sản phẩm để thêm đã là sản phẩm để sản xuất.
ForAQuantityOf1=Đối với số lượng sản xuất là 1
ConfirmValidateMo=Bạn có chắc chắn muốn xác nhận Đơn hàng sản xuất này không?
ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
-ProductionForRefAndDate=Production %s - %s
+ProductionForRef=Production of %s
AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
NoStockChangeOnServices=No stock change on services
+ProductQtyToConsumeByMO=Product quantity still to consume by open MO
+ProductQtyToProduceByMO=Product quentity still to produce by open MO
diff --git a/htdocs/langs/vi_VN/orders.lang b/htdocs/langs/vi_VN/orders.lang
index 9ecc0d0e588..f77878edc7b 100644
--- a/htdocs/langs/vi_VN/orders.lang
+++ b/htdocs/langs/vi_VN/orders.lang
@@ -69,7 +69,7 @@ ValidateOrder=Xác nhận đơn hàng
UnvalidateOrder=Đơn hàng chưa xác nhận
DeleteOrder=Xóa đơn hàng
CancelOrder=Hủy đơn hàng
-OrderReopened= Đơn đặt hàng %s Mở lại
+OrderReopened= Order %s re-open
AddOrder=Tạo đơn hàng
AddPurchaseOrder=Tạo đơn hàng mua
AddToDraftOrders=Thêm vào đơn hàng dự thảo
@@ -141,10 +141,10 @@ OrderByEMail=Email
OrderByWWW=Online
OrderByPhone=Điện thoại
# Documents models
-PDFEinsteinDescription=Mẫu đơn hàng đầy đủ (logo ...)
-PDFEratostheneDescription=Mẫu đơn hàng đầy đủ (logo ...)
+PDFEinsteinDescription=A complete order model
+PDFEratostheneDescription=A complete order model
PDFEdisonDescription=Mẫu đơn hàng đơn giản
-PDFProformaDescription=Hoá đơn proforma đầy đủ (logo ...)
+PDFProformaDescription=A complete Proforma invoice template
CreateInvoiceForThisCustomer=Thanh toán đơn hàng
NoOrdersToInvoice=Không có đơn hàng có thể lập hóa đơn
CloseProcessedOrdersAutomatically=Phân loại "Đã xử lý" cho tất cả các đơn hàng được chọn.
diff --git a/htdocs/langs/vi_VN/other.lang b/htdocs/langs/vi_VN/other.lang
index 0408cbc7444..5c6a8912098 100644
--- a/htdocs/langs/vi_VN/other.lang
+++ b/htdocs/langs/vi_VN/other.lang
@@ -24,7 +24,7 @@ MessageOK=Thông điệp trên trang trả về cho một khoản thanh toán đ
MessageKO=Thông điệp trên trang trả về cho một khoản thanh toán bị hủy
ContentOfDirectoryIsNotEmpty=Nội dung của thư mục này không rỗng.
DeleteAlsoContentRecursively=Kiểm tra để xóa tất cả nội dung lặp lại
-
+PoweredBy=Powered by
YearOfInvoice=Năm hóa đơn
PreviousYearOfInvoice=Năm trước của ngày hóa đơn
NextYearOfInvoice=Năm sau của ngày hóa đơn
@@ -104,7 +104,8 @@ DemoFundation=Quản lý thành viên của một nền tảng
DemoFundation2=Quản lý thành viên và tài khoản ngân hàng của một nền tảng
DemoCompanyServiceOnly=Chỉ công ty hoặc dịch vụ bán hàng tự do
DemoCompanyShopWithCashDesk=Quản lý một cửa hàng với một bàn bằng tiền mặt
-DemoCompanyProductAndStocks=Công ty bán sản phẩm có một cửa hàng
+DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
+DemoCompanyManufacturing=Company manufacturing products
DemoCompanyAll=Công ty có nhiều hoạt động (tất cả các mô-đun chính)
CreatedBy=Được tạo ra bởi %s
ModifiedBy=Được thay đổi bởi %s
@@ -267,7 +268,7 @@ WEBSITE_PAGEURL=URL của trang
WEBSITE_TITLE=Tiêu đề
WEBSITE_DESCRIPTION=Mô tả
WEBSITE_IMAGE=Hình ảnh
-WEBSITE_IMAGEDesc=Đường dẫn tương đối của phương tiện hình ảnh. Bạn có thể giữ trống vì điều này hiếm khi được sử dụng (nội dung động có thể được sử dụng để hiển thị bản xem trước của danh sách các bài đăng trên blog).
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITEKEY__ in the path if path depends on website name.
WEBSITE_KEYWORDS=Từ khóa
LinesToImport=Dòng để nhập
diff --git a/htdocs/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang
index dca8ad08e9a..dcdc0b4ccea 100644
--- a/htdocs/langs/vi_VN/projects.lang
+++ b/htdocs/langs/vi_VN/projects.lang
@@ -77,7 +77,7 @@ MyProjectsArea=Khu vực dự án của tôi
DurationEffective=Thời hạn hiệu lực
ProgressDeclared=Tiến độ công bố
TaskProgressSummary=Tiến độ công việc
-CurentlyOpenedTasks=Nhiệm vụ mở hiện tại
+CurentlyOpenedTasks=Curently open tasks
TheReportedProgressIsLessThanTheCalculatedProgressionByX=Tiến độ khai báo ít hơn %s so với tiến độ tính toán
TheReportedProgressIsMoreThanTheCalculatedProgressionByX=Tiến độ khai báo là nhiều hơn %s so với tiến độ tính toán
ProgressCalculated=Tiến độ được tính toán
@@ -249,9 +249,13 @@ TimeSpentForInvoice=Thời gian đã qua
OneLinePerUser=Một dòng trên mỗi người dùng
ServiceToUseOnLines=Dịch vụ được sử dụng trên các dòng
InvoiceGeneratedFromTimeSpent=Hóa đơn %s đã được tạo từ thời gian dành đã qua trên dự án
-ProjectBillTimeDescription=Chọn nếu bạn nhập bảng chấm công vào các nhiệm vụ của dự án VÀ bạn có kế hoạch tạo (các) hóa đơn từ bảng chấm công để lập hóa đơn cho khách hàng của dự án (không Chọn nếu bạn có kế hoạch tạo hóa đơn không dựa trên bảng chấm công).
+ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
ProjectFollowOpportunity=Theo dõi cơ hội
ProjectFollowTasks=Theo dõi các nhiệm vụ
UsageOpportunity=Cách dùng: Cơ hội
UsageTasks=Cách dùng: Nhiệm vụ
UsageBillTimeShort=Cách dùng: Hóa đơn thời gian
+InvoiceToUse=Draft invoice to use
+NewInvoice=Hóa đơn mới
+OneLinePerTask=One line per task
+OneLinePerPeriod=One line per period
diff --git a/htdocs/langs/vi_VN/propal.lang b/htdocs/langs/vi_VN/propal.lang
index 948b3aa08e8..f1a6f2c5d2e 100644
--- a/htdocs/langs/vi_VN/propal.lang
+++ b/htdocs/langs/vi_VN/propal.lang
@@ -76,8 +76,8 @@ TypeContact_propal_external_BILLING=Liên lạc khách hàng về hóa đơn
TypeContact_propal_external_CUSTOMER=Liên hệ với khách hàng sau-up đề nghị
TypeContact_propal_external_SHIPPING=Liên lạc khách hàng để giao hàng
# Document models
-DocModelAzurDescription=Một mô hình đề xuất đầy đủ (logo ...)
-DocModelCyanDescription=Một mô hình đề xuất đầy đủ (logo ...)
+DocModelAzurDescription=A complete proposal model
+DocModelCyanDescription=A complete proposal model
DefaultModelPropalCreate=Tạo mô hình mặc định
DefaultModelPropalToBill=Mặc định mẫu khi đóng cửa một đề xuất kinh doanh (được lập hoá đơn)
DefaultModelPropalClosed=Mặc định mẫu khi đóng cửa một đề xuất kinh doanh (chưa lập hoá đơn)
diff --git a/htdocs/langs/vi_VN/stocks.lang b/htdocs/langs/vi_VN/stocks.lang
index 315913c7d26..959e3b30c6c 100644
--- a/htdocs/langs/vi_VN/stocks.lang
+++ b/htdocs/langs/vi_VN/stocks.lang
@@ -143,6 +143,7 @@ InventoryCode=Mã chuyển kho hoặc mã kiểm kho
IsInPackage=Chứa vào gói
WarehouseAllowNegativeTransfer=Tồn kho có thể âm
qtyToTranferIsNotEnough=Bạn không có đủ tồn kho từ kho nguồn của mình và thiết lập của bạn không cho phép các tồn kho âm.
+qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
ShowWarehouse=Hiện kho
MovementCorrectStock=Hiệu chỉnh tồn kho cho sản phẩm %s
MovementTransferStock=Chuyển tồn kho của sản phẩm %s vào kho khác
@@ -192,6 +193,7 @@ TheoricalQty=Số lượng lý thuyết
TheoricalValue=Số lượng lý thuyết
LastPA=BP cuối cùng
CurrentPA=BP hiện tại
+RecordedQty=Recorded Qty
RealQty=Số lượng thực tế
RealValue=Giá trị thực tế
RegulatedQty=Số lượng quy định
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index 4a6c90c1f33..602c6568718 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -519,7 +519,7 @@ Module25Desc=Sales order management
Module30Name=发票
Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
Module40Name=供应商
-Module40Desc=Vendors and purchase management (purchase orders and billing)
+Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
Module42Name=调试日志
Module42Desc=记录设施(文件,系统日志,......)。此类日志用于技术/调试目的。
Module49Name=编辑器
@@ -561,9 +561,9 @@ Module200Desc=LDAP directory synchronization
Module210Name=PostNuke
Module210Desc=PostNuke 整合
Module240Name=数据导出
-Module240Desc=数据导出工具(助理)
+Module240Desc=Tool to export Dolibarr data (with assistance)
Module250Name=数据导入
-Module250Desc=Tool to import data into Dolibarr (with assistants)
+Module250Desc=Tool to import data into Dolibarr (with assistance)
Module310Name=会员
Module310Desc=机构会员管理模块
Module320Name=RSS 源
@@ -878,7 +878,7 @@ Permission1251=导入大量外部数据到数据库(载入资料)
Permission1321=导出客户发票、属性及其付款资料
Permission1322=重新开立付费账单
Permission1421=Export sales orders and attributes
-Permission2401=Read actions (events or tasks) linked to his user account (if owner of event)
+Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
Permission2411=读取他人的动作(事件或任务)
@@ -1156,7 +1156,7 @@ NoEventOrNoAuditSetup=No security event has been logged. This is normal if Audit
NoEventFoundWithCriteria=No security event has been found for this search criteria.
SeeLocalSendMailSetup=参见您的本机 sendmail 设置
BackupDesc=A complete backup of a Dolibarr installation requires two steps.
-BackupDesc2=Backup the contents of the "documents" directory (%s) containing all uploaded and generated files. This will also include all the dump files generated in Step 1.
+BackupDesc2=Backup the contents of the "documents" directory (%s) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
BackupDesc3=Backup the structure and contents of your database (%s) into a dump file. For this, you can use the following assistant.
BackupDescX=The archived directory should be stored in a secure place.
BackupDescY=生成的转储文件应存放在安全的地方。
@@ -1167,6 +1167,7 @@ RestoreDesc3=Restore the database structure and data from a backup dump file int
RestoreMySQL=MySQL 导入
ForcedToByAModule= 此规则被一个启用中的模块强制应用于 %s
PreviousDumpFiles=Existing backup files
+PreviousArchiveFiles=Existing archive files
WeekStartOnDay=First day of the week
RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
YouMustRunCommandFromCommandLineAfterLoginToUser=您必须以 %s 用户在MySQL控制台登陆后通过命令行运行此命令否则您必须在命令行的末尾使用 -W 选项来提供 %s 的密码。
@@ -1248,6 +1249,7 @@ AskForPreferredShippingMethod=Ask for preferred shipping method for Third Partie
FieldEdition=%s 字段的编辑
FillThisOnlyIfRequired=例如:+2 (请只在时区错误问题出现时填写)
GetBarCode=获取条码
+NumberingModules=Numbering models
##### Module password generation
PasswordGenerationStandard=返回一个根据 Dolibarr 内部算法生成的密码:8个字符,包含小写数字和字母。
PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
@@ -1711,8 +1713,9 @@ ChequeReceiptsNumberingModule=Check Receipts Numbering Module
MultiCompanySetup=多公司模块设置
##### Suppliers #####
SuppliersSetup=Vendor module setup
-SuppliersCommandModel=Complete template of purchase order (logo...)
-SuppliersInvoiceModel=采购账单的完整模板(LOGO标识...)
+SuppliersCommandModel=Complete template of Purchase Order
+SuppliersCommandModelMuscadet=Complete template of Purchase Order
+SuppliersInvoiceModel=Complete template of Vendor Invoice
SuppliersInvoiceNumberingModel=Vendor invoices numbering models
IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
##### GeoIPMaxmind #####
@@ -1762,9 +1765,10 @@ ListOfNotificationsPerUser=List of automatic notifications per user*
ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
ListOfFixedNotifications=List of automatic fixed notifications
GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=转到合作方的“通知”标签,添加或删除联系人/地址的通知
+GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
Threshold=阈值
-BackupDumpWizard=Wizard to build the backup file
+BackupDumpWizard=Wizard to build the database dump file
+BackupZipWizard=Wizard to build the archive of documents directory
SomethingMakeInstallFromWebNotPossible=由于以下原因,无法从Web界面安装外部模块:
SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
InstallModuleFromWebHasBeenDisabledByFile=管理员已禁用从应用程序安装外部模块。您必须要求他删除文件 %s 以允许此功能。
@@ -1953,6 +1957,8 @@ SmallerThan=Smaller than
LargerThan=Larger than
IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
+EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set a value here to use this feature. Note that you must also use a read/write login account.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
EndPointFor=End point for %s : %s
DeleteEmailCollector=Delete email collector
ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
diff --git a/htdocs/langs/zh_CN/bills.lang b/htdocs/langs/zh_CN/bills.lang
index 32af27bf84f..71578f9d1b9 100644
--- a/htdocs/langs/zh_CN/bills.lang
+++ b/htdocs/langs/zh_CN/bills.lang
@@ -416,7 +416,7 @@ PaymentConditionShort14D=14天
PaymentCondition14D=14天
PaymentConditionShort14DENDMONTH=月末14天
PaymentCondition14DENDMONTH=在月底之后的14天内
-FixAmount=Fixed amount
+FixAmount=Fixed amount - 1 line with label '%s'
VarAmount=可变金额(%% tot.)
VarAmountOneLine=可变金额(%% tot。) - 1行标签'%s'
# PaymentType
@@ -512,7 +512,7 @@ RevenueStamp=印花税票
YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
YouMustCreateStandardInvoiceFirstDesc=您必须先创建标准发票并将其转换为“模板”以创建新模板发票
-PDFCrabeDescription=发票模板Crabe。一个完整的发票模板(支援增值税选项,折扣,付款条件,标识等..)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template
PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
PDFCrevetteDescription=发票PDF模板Crevette。情况发票的完整发票模板
TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
diff --git a/htdocs/langs/zh_CN/categories.lang b/htdocs/langs/zh_CN/categories.lang
index 633645a3abd..f86d7cc626f 100644
--- a/htdocs/langs/zh_CN/categories.lang
+++ b/htdocs/langs/zh_CN/categories.lang
@@ -62,6 +62,7 @@ ContactCategoriesShort=联系人标签/分类
AccountsCategoriesShort=账户标签/分类
ProjectsCategoriesShort=项目标签/分类
UsersCategoriesShort=Users tags/categories
+StockCategoriesShort=Warehouse tags/categories
ThisCategoryHasNoProduct=本分类不包含任何产品。
ThisCategoryHasNoSupplier=This category does not contain any vendor.
ThisCategoryHasNoCustomer=本分类不包含任何客户。
@@ -88,3 +89,6 @@ AddProductServiceIntoCategory=添加下面的产品/服务
ShowCategory=显示标签/分类
ByDefaultInList=按默认列表
ChooseCategory=选择类别
+StocksCategoriesArea=Warehouses Categories Area
+ActionCommCategoriesArea=Events Categories Area
+UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/zh_CN/companies.lang b/htdocs/langs/zh_CN/companies.lang
index 8ba8cc1e5ec..8f920f891d1 100644
--- a/htdocs/langs/zh_CN/companies.lang
+++ b/htdocs/langs/zh_CN/companies.lang
@@ -247,6 +247,12 @@ ProfId3US=-
ProfId4US=-
ProfId5US=-
ProfId6US=-
+ProfId1RO=Prof Id 1 (CUI)
+ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
+ProfId3RO=Prof Id 3 (CAEN)
+ProfId4RO=-
+ProfId5RO=Prof Id 5 (EUID)
+ProfId6RO=-
ProfId1RU=Prof Id 1 (OGRN)
ProfId2RU=Prof Id 2 (INN)
ProfId3RU=Prof Id 3 (KPP)
@@ -339,7 +345,7 @@ MyContacts=我的联系人
Capital=注册资金
CapitalOf=注册资金 %s
EditCompany=编辑公司
-ThisUserIsNot=This user is not a prospect, customer nor vendor
+ThisUserIsNot=This user is not a prospect, customer or vendor
VATIntraCheck=支票
VATIntraCheckDesc=The VAT ID must include the country prefix. The link %s uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -406,6 +412,13 @@ AllocateCommercial=分配给销售代表
Organization=组织
FiscalYearInformation=Fiscal Year
FiscalMonthStart=会计年度初始月
+SocialNetworksInformation=Social networks
+SocialNetworksFacebookURL=Facebook URL
+SocialNetworksTwitterURL=Twitter URL
+SocialNetworksLinkedinURL=Linkedin URL
+SocialNetworksInstagramURL=Instagram URL
+SocialNetworksYoutubeURL=Youtube URL
+SocialNetworksGithubURL=Github URL
YouMustAssignUserMailFirst=You must create an email for this user prior to being able to add an email notification.
YouMustCreateContactFirst=能够添加电子邮件通知, 首先你必须填写合伙人的有效Email地址
ListSuppliersShort=List of Vendors
diff --git a/htdocs/langs/zh_CN/compta.lang b/htdocs/langs/zh_CN/compta.lang
index 4dd94738343..af8ca4a19e6 100644
--- a/htdocs/langs/zh_CN/compta.lang
+++ b/htdocs/langs/zh_CN/compta.lang
@@ -63,7 +63,7 @@ LT2SupplierES=IRPF采购
LT2CustomerIN=SGST销售
LT2SupplierIN=SGST购买
VATCollected=增值税征收
-ToPay=待支付
+StatusToPay=待支付
SpecialExpensesArea=特殊支付区域
SocialContribution=社会或财政税
SocialContributions=社会或财政税
@@ -112,7 +112,7 @@ ShowVatPayment=显示增值税纳税
TotalToPay=共支付
BalanceVisibilityDependsOnSortAndFilters=仅当表格在%s上按升序排序并过滤为1个银行帐户时,才会在此列表中显示余额
CustomerAccountancyCode=客户科目代码
-SupplierAccountancyCode=vendor accounting code
+SupplierAccountancyCode=Vendor accounting code
CustomerAccountancyCodeShort=客户账户代码
SupplierAccountancyCodeShort=供应商账户代码
AccountNumber=帐号
@@ -254,3 +254,4 @@ ByVatRate=按销售税率计算
TurnoverbyVatrate=营业税按销售税率开具
TurnoverCollectedbyVatrate=按销售税率收取的营业额
PurchasebyVatrate=按销售税率购买
+LabelToShow=标签别名
diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang
index 6b6291dc7bd..7222c4140cf 100644
--- a/htdocs/langs/zh_CN/errors.lang
+++ b/htdocs/langs/zh_CN/errors.lang
@@ -117,7 +117,8 @@ ErrorLoginDoesNotExists=登陆账号 %s 有误——系统中没有这个
ErrorLoginHasNoEmail=此账户未设定Email地址。无法使用该功能.
ErrorBadValueForCode=代码有错误的值类型。再次尝试以新的价值...
ErrorBothFieldCantBeNegative=栏位%s和%s不能都为负的
-ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you want to add a discount line, just create the discount first with link %s on screen and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
+ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
ErrorQtyForCustomerInvoiceCantBeNegative=进入客户发票的数量不能为负数
ErrorWebServerUserHasNotPermission=%s用来执行Web服务器用户帐户没有该权限
ErrorNoActivatedBarcode=没有激活的条码类型
@@ -224,6 +225,8 @@ ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to
ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
ErrorFieldRequiredForProduct=Field '%s' is required for product %s
+ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
+ErrorAddAtLeastOneLineFirst=Add at least one line first
# Warnings
WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
WarningPasswordSetWithNoAccount=为此成员设置了密码。但是,未创建任何用户帐户。因此,此密码已存储,但无法用于登录Dolibarr。它可以由外部模块/接口使用,但如果您不需要为成员定义任何登录名或密码,则可以从成员模块设置中禁用“管理每个成员的登录名”选项。如果您需要管理登录但不需要任何密码,则可以将此字段保留为空以避免此警告。注意:如果成员链接到用户,则电子邮件也可用作登录。
diff --git a/htdocs/langs/zh_CN/holiday.lang b/htdocs/langs/zh_CN/holiday.lang
index 250d66af087..3e018f1cbdd 100644
--- a/htdocs/langs/zh_CN/holiday.lang
+++ b/htdocs/langs/zh_CN/holiday.lang
@@ -39,8 +39,10 @@ TypeOfLeaveId=请假ID的类型
TypeOfLeaveCode=请假类型
TypeOfLeaveLabel=请假标签的类型
NbUseDaysCP=消耗的休假天数
+NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary.
NbUseDaysCPShort=消耗的天数
NbUseDaysCPShortInMonth=一个月消耗的天数
+DayIsANonWorkingDay=%s is a non working day
DateStartInMonth=以月开始日期
DateEndInMonth=截止日期
EditCP=编辑
diff --git a/htdocs/langs/zh_CN/install.lang b/htdocs/langs/zh_CN/install.lang
index 6f5b8a98052..c66000995eb 100644
--- a/htdocs/langs/zh_CN/install.lang
+++ b/htdocs/langs/zh_CN/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
PHPSupportCalendar=This PHP supports calendars extensions.
PHPSupportUTF8=This PHP supports UTF8 functions.
PHPSupportIntl=This PHP supports Intl functions.
+PHPSupport=This PHP supports %s functions.
PHPMemoryOK=您的PHP最大session会话内存设置为%s。这应该够了的。
PHPMemoryTooLow=Your PHP max session memory is set to %s bytes. This is too low. Change your php.ini to set memory_limit parameter to at least %s bytes.
Recheck=Click here for a more detailed test
@@ -25,6 +26,7 @@ ErrorPHPDoesNotSupportCurl=你的PHP服务器不支持Curl。
ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
+ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
ErrorDirDoesNotExists=目录 %s 不存在。
ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
ErrorWrongValueForParameter=您可能输入了一个错误的参数值的 '%s' 。
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index d06ce104d54..6f355424368 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -471,7 +471,7 @@ TotalDuration=总时间
Summary=摘要
DolibarrStateBoard=数据库统计
DolibarrWorkBoard=Open Items
-NoOpenedElementToProcess=没有要打开的元素
+NoOpenedElementToProcess=No open element to process
Available=可用的
NotYetAvailable=不可用的
NotAvailable=不可用
@@ -1005,7 +1005,7 @@ ContactDefault_contrat=合同
ContactDefault_facture=发票
ContactDefault_fichinter=介入
ContactDefault_invoice_supplier=Supplier Invoice
-ContactDefault_order_supplier=Supplier Order
+ContactDefault_order_supplier=Purchase Order
ContactDefault_project=项目
ContactDefault_project_task=任务
ContactDefault_propal=报价
@@ -1013,3 +1013,6 @@ ContactDefault_supplier_proposal=Supplier Proposal
ContactDefault_ticketsup=Ticket
ContactAddedAutomatically=Contact added from contact thirdparty roles
More=More
+ShowDetails=Show details
+CustomReports=Custom reports
+SelectYourGraphOptionsFirst=Select your graph options to build a graph
diff --git a/htdocs/langs/zh_CN/modulebuilder.lang b/htdocs/langs/zh_CN/modulebuilder.lang
index a78ee292adf..e210ea09c96 100644
--- a/htdocs/langs/zh_CN/modulebuilder.lang
+++ b/htdocs/langs/zh_CN/modulebuilder.lang
@@ -83,7 +83,7 @@ ListOfDictionariesEntries=List of dictionaries entries
ListOfPermissionsDefined=已定义权限的列表
SeeExamples=见这里的例子
EnabledDesc=激活此字段的条件(示例:1 或 $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:
preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
($user->rights->holiday->define_holiday ? 1 : 0)
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:
preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
($user->rights->holiday->define_holiday ? 1 : 0)
IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
SpecDefDesc=在此输入您要为模块提供的所有文档,这些文档尚未由其他选项卡定义。您可以使用.md或更好的.asciidoc语法。
@@ -135,3 +135,5 @@ CSSClass=CSS Class
NotEditable=Not editable
ForeignKey=Foreign key
TypeOfFieldsHelp=Type of fields:
varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
+AsciiToHtmlConverter=Ascii to HTML converter
+AsciiToPdfConverter=Ascii to PDF converter
diff --git a/htdocs/langs/zh_CN/mrp.lang b/htdocs/langs/zh_CN/mrp.lang
index ad612115268..11c6915a25c 100644
--- a/htdocs/langs/zh_CN/mrp.lang
+++ b/htdocs/langs/zh_CN/mrp.lang
@@ -54,12 +54,15 @@ ToConsume=To consume
ToProduce=To produce
QtyAlreadyConsumed=Qty already consumed
QtyAlreadyProduced=Qty already produced
+ConsumeOrProduce=Consume or Produce
ConsumeAndProduceAll=Consume and Produce All
Manufactured=Manufactured
TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
ForAQuantityOf1=For a quantity to produce of 1
ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
-ProductionForRefAndDate=Production %s - %s
+ProductionForRef=Production of %s
AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
NoStockChangeOnServices=No stock change on services
+ProductQtyToConsumeByMO=Product quantity still to consume by open MO
+ProductQtyToProduceByMO=Product quentity still to produce by open MO
diff --git a/htdocs/langs/zh_CN/orders.lang b/htdocs/langs/zh_CN/orders.lang
index 0f150ef3f69..5280f9748e6 100644
--- a/htdocs/langs/zh_CN/orders.lang
+++ b/htdocs/langs/zh_CN/orders.lang
@@ -11,6 +11,7 @@ OrderDate=订购日期
OrderDateShort=订单日期
OrderToProcess=待处理订单
NewOrder=新订单
+NewOrderSupplier=New Purchase Order
ToOrder=订单填写
MakeOrder=订单填写
SupplierOrder=采购订单
@@ -25,6 +26,8 @@ OrdersToBill=Sales orders delivered
OrdersInProcess=Sales orders in process
OrdersToProcess=Sales orders to process
SuppliersOrdersToProcess=待处理采购订单
+SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
+AwaitingReception=Awaiting reception
StatusOrderCanceledShort=已取消
StatusOrderDraftShort=草稿
StatusOrderValidatedShort=已验证
@@ -37,7 +40,6 @@ StatusOrderDeliveredShort=已递送
StatusOrderToBillShort=已递送
StatusOrderApprovedShort=已批准
StatusOrderRefusedShort=已拒绝
-StatusOrderBilledShort=已到账
StatusOrderToProcessShort=待处理
StatusOrderReceivedPartiallyShort=部分收到
StatusOrderReceivedAllShort=收到的产品
@@ -50,7 +52,6 @@ StatusOrderProcessed=已处理
StatusOrderToBill=已递送
StatusOrderApproved=已批准
StatusOrderRefused=已拒绝
-StatusOrderBilled=已到账
StatusOrderReceivedPartially=部分收到
StatusOrderReceivedAll=收到所有产品
ShippingExist=运输存在
@@ -68,8 +69,9 @@ ValidateOrder=验证订单
UnvalidateOrder=未验证订单
DeleteOrder=删除订单
CancelOrder=取消订单
-OrderReopened= 订单 %s 已重开
+OrderReopened= Order %s re-open
AddOrder=创建订单
+AddPurchaseOrder=Create purchase order
AddToDraftOrders=添加订单草稿
ShowOrder=显示订单
OrdersOpened=处理订单
@@ -139,10 +141,10 @@ OrderByEMail=电子邮件
OrderByWWW=在线
OrderByPhone=电话
# Documents models
-PDFEinsteinDescription=一个完整的命令模式(logo. ..)
-PDFEratostheneDescription=一个完整的命令模式(logo. ..)
+PDFEinsteinDescription=A complete order model
+PDFEratostheneDescription=A complete order model
PDFEdisonDescription=一份简单的订购模式
-PDFProformaDescription=完整的预开发票(LOGO标志...)
+PDFProformaDescription=A complete Proforma invoice template
CreateInvoiceForThisCustomer=计费订单
NoOrdersToInvoice=没有订单账单
CloseProcessedOrdersAutomatically=归类所有“已处理”的订单。
@@ -152,7 +154,35 @@ OrderCreated=您的订单已创建
OrderFail=您的订单创建期间发生了错误
CreateOrders=创建订单
ToBillSeveralOrderSelectCustomer=要为多个订单创建一张发票, 首先点击客户,然后选择 "%s".
-OptionToSetOrderBilledNotEnabled=选项(来自模块工作流程)将发票验证时自动将订单设置为“已结算”,因此您必须手动将订单状态设置为“已结算”。
+OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
IfValidateInvoiceIsNoOrderStayUnbilled=如果发票确认为“否”,则在验证发票之前,订单将保持为“未开票”状态。
-CloseReceivedSupplierOrdersAutomatically=如果收到所有产品,则自动关闭订单“%s”。
+CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
SetShippingMode=设置送货方式
+WithReceptionFinished=With reception finished
+#### supplier orders status
+StatusSupplierOrderCanceledShort=已取消
+StatusSupplierOrderDraftShort=草稿
+StatusSupplierOrderValidatedShort=批准
+StatusSupplierOrderSentShort=过程中
+StatusSupplierOrderSent=运输处理中
+StatusSupplierOrderOnProcessShort=已下订单
+StatusSupplierOrderProcessedShort=处理完毕
+StatusSupplierOrderDelivered=已递送
+StatusSupplierOrderDeliveredShort=已递送
+StatusSupplierOrderToBillShort=已递送
+StatusSupplierOrderApprovedShort=已获批准
+StatusSupplierOrderRefusedShort=已被拒绝
+StatusSupplierOrderToProcessShort=待处理
+StatusSupplierOrderReceivedPartiallyShort=部分收到
+StatusSupplierOrderReceivedAllShort=Products received
+StatusSupplierOrderCanceled=已取消
+StatusSupplierOrderDraft=草稿(需要确认)
+StatusSupplierOrderValidated=批准
+StatusSupplierOrderOnProcess=已下订单 - 等待接收
+StatusSupplierOrderOnProcessWithValidation=已下订单 - 等待接收或确认
+StatusSupplierOrderProcessed=处理完毕
+StatusSupplierOrderToBill=已递送
+StatusSupplierOrderApproved=已获批准
+StatusSupplierOrderRefused=已被拒绝
+StatusSupplierOrderReceivedPartially=部分收到
+StatusSupplierOrderReceivedAll=All products received
diff --git a/htdocs/langs/zh_CN/other.lang b/htdocs/langs/zh_CN/other.lang
index f840ee7ae66..c12d0c4839c 100644
--- a/htdocs/langs/zh_CN/other.lang
+++ b/htdocs/langs/zh_CN/other.lang
@@ -24,7 +24,7 @@ MessageOK=Message on the return page for a validated payment
MessageKO=Message on the return page for a canceled payment
ContentOfDirectoryIsNotEmpty=该目录的内容不为空。
DeleteAlsoContentRecursively=Check to delete all content recursively
-
+PoweredBy=Powered by
YearOfInvoice=发票日期年份
PreviousYearOfInvoice=上一年的发票日期
NextYearOfInvoice=发票日期后一年
@@ -104,7 +104,8 @@ DemoFundation=基础会员管理
DemoFundation2=资金密集型企业
DemoCompanyServiceOnly=外贸公司
DemoCompanyShopWithCashDesk=管理与现金办公桌店
-DemoCompanyProductAndStocks=销售门店
+DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
+DemoCompanyManufacturing=Company manufacturing products
DemoCompanyAll=公司有多项活动(所有主要模块)
CreatedBy=创建者 %s
ModifiedBy=修改者 %s
@@ -267,7 +268,7 @@ WEBSITE_PAGEURL=页面URL地址
WEBSITE_TITLE=标题
WEBSITE_DESCRIPTION=描述
WEBSITE_IMAGE=Image
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITEKEY__ in the path if path depends on website name.
WEBSITE_KEYWORDS=关键字
LinesToImport=要导入的行
diff --git a/htdocs/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang
index d127d603a04..bbe7ff6bddb 100644
--- a/htdocs/langs/zh_CN/projects.lang
+++ b/htdocs/langs/zh_CN/projects.lang
@@ -77,7 +77,7 @@ MyProjectsArea=我的项目区
DurationEffective=有效时间
ProgressDeclared=进度
TaskProgressSummary=Task progress
-CurentlyOpenedTasks=Curently opened tasks
+CurentlyOpenedTasks=Curently open tasks
TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
ProgressCalculated=计算进展
@@ -249,9 +249,13 @@ TimeSpentForInvoice=所花费的时间
OneLinePerUser=One line per user
ServiceToUseOnLines=Service to use on lines
InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets).
+ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
ProjectFollowOpportunity=Follow opportunity
ProjectFollowTasks=Follow tasks
UsageOpportunity=Usage: Opportunity
UsageTasks=Usage: Tasks
UsageBillTimeShort=Usage: Bill time
+InvoiceToUse=Draft invoice to use
+NewInvoice=新建发票
+OneLinePerTask=One line per task
+OneLinePerPeriod=One line per period
diff --git a/htdocs/langs/zh_CN/propal.lang b/htdocs/langs/zh_CN/propal.lang
index 45d686c72d6..356639b2c4c 100644
--- a/htdocs/langs/zh_CN/propal.lang
+++ b/htdocs/langs/zh_CN/propal.lang
@@ -28,7 +28,7 @@ ShowPropal=显示报价
PropalsDraft=草稿
PropalsOpened=打开
PropalStatusDraft=草稿(需要验证)
-PropalStatusValidated=已验证(提案已打开)
+PropalStatusValidated=已确定(打开的报价单)
PropalStatusSigned=已签署(待付款)
PropalStatusNotSigned=未签署(已关闭)
PropalStatusBilled=已到账
@@ -76,10 +76,11 @@ TypeContact_propal_external_BILLING=客户账单联系人
TypeContact_propal_external_CUSTOMER=跟进报价的客户联系人
TypeContact_propal_external_SHIPPING=客户联系以便交付
# Document models
-DocModelAzurDescription=完整的订单模版 (LOGO标志...)
-DocModelCyanDescription=完整的订单模版 (LOGO标志...)
+DocModelAzurDescription=A complete proposal model
+DocModelCyanDescription=A complete proposal model
DefaultModelPropalCreate=设置默认模板
DefaultModelPropalToBill=关闭订单时使用的默认模板(待生成账单)
DefaultModelPropalClosed=关闭订单时使用的默认模板(待付款)
ProposalCustomerSignature=书面接受,公司盖章,日期和签名
ProposalsStatisticsSuppliers=Vendor proposals statistics
+CaseFollowedBy=Case followed by
diff --git a/htdocs/langs/zh_CN/stocks.lang b/htdocs/langs/zh_CN/stocks.lang
index fbd1b725105..5af65215710 100644
--- a/htdocs/langs/zh_CN/stocks.lang
+++ b/htdocs/langs/zh_CN/stocks.lang
@@ -143,6 +143,7 @@ InventoryCode=调拨或盘点编码
IsInPackage=包含在模块包
WarehouseAllowNegativeTransfer=股票可能是负面的
qtyToTranferIsNotEnough=您的源仓库中没有足够的库存,您的设置不允许负库存。
+qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
ShowWarehouse=显示仓库
MovementCorrectStock=产品库存校正 %s
MovementTransferStock=库存调拨移转 %s 到其他仓库库位中
@@ -192,6 +193,7 @@ TheoricalQty=理论数量
TheoricalValue=理论数量
LastPA=最后 BP
CurrentPA=当前 BP
+RecordedQty=Recorded Qty
RealQty=实际数量
RealValue=实际价值
RegulatedQty=规范数量
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index 3e33b4dcccb..109d878c286 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -243,13 +243,13 @@ Developpers=開發商/貢獻者
OfficialWebSite=Dolibarr官方網站
OfficialWebSiteLocal=本地網站(%s)
OfficialWiki=Dolibarr文件/ Wiki
-OfficialDemo=Dolibarr在線展示
+OfficialDemo=Dolibarr線上展示
OfficialMarketPlace=外部模組/插件官方市場
OfficialWebHostingService=可參考的網站主機服務 (雲端主機)
ReferencedPreferredPartners=首選合作夥伴
OtherResources=其他資源
ExternalResources=外部資源
-SocialNetworks=交際網路
+SocialNetworks=社交網路
ForDocumentationSeeWiki=有關用戶或開發人員的文件(文件,常見問題...),
可在Dolibarr維基查閱:
%s
ForAnswersSeeForum=有關任何其他問題/幫助,您可以使用Dolibarr論壇:
%s
HelpCenterDesc1=以下是獲得Dolibarr幫助和支持的一些資源。
@@ -519,7 +519,7 @@ Module25Desc=銷售訂單管理
Module30Name=發票
Module30Desc=為客戶管理發票和信用票據。供應商發票和信用票據管理
Module40Name=供應商
-Module40Desc=供應商和採購管理(採購訂單和開票)
+Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
Module42Name=除錯日誌
Module42Desc=日誌記錄 (file, syslog, ...)。這些日誌是針對技術性以及除錯用途。
Module49Name=編輯器
@@ -538,8 +538,8 @@ Module55Name=條碼
Module55Desc=條碼管理
Module56Name=電話
Module56Desc=電話整合
-Module57Name=銀行直接借記付款
-Module57Desc=管理直接借記付款訂單。它包括為歐洲國家產生的SEPA檔案。
+Module57Name=銀行直接轉帳付款
+Module57Desc=管理直接轉帳付款訂單。它包括為歐洲國家產生的SEPA檔案。
Module58Name=點選撥打
Module58Desc=點選撥打系統(Asterisk, ...)的整合
Module59Name=Bookmark4u
@@ -561,9 +561,9 @@ Module200Desc=LDAP資料夾同步
Module210Name=PostNuke
Module210Desc=PostNuke 的整合
Module240Name=資料匯出
-Module240Desc=匯出 Dolibarr 資料的工具 (助手)
+Module240Desc=匯出 Dolibarr 資料的工具 (小幫手)
Module250Name=資料匯入
-Module250Desc=將資料匯入Dolibarr的工具(助手)
+Module250Desc=將資料匯入Dolibarr的工具(小幫手)
Module310Name=會員
Module310Desc=公司會員管理
Module320Name=RSS 訂閱
@@ -725,10 +725,10 @@ Permission142=建立/修改全部專案及任務(也包含我不是連絡人
Permission144=刪除全部專案及任務(也包含我不是連絡人的私人專案)
Permission146=讀取提供者
Permission147=讀取統計資料
-Permission151=讀取直接信用付款訂單
-Permission152=建立/修改直接借記付款訂單
-Permission153=傳送/傳輸直接借記付款訂單
-Permission154=記錄直接借記付款訂單的信貸/拒絕
+Permission151=讀取直接轉帳付款訂單
+Permission152=建立/修改直接轉帳付款訂單
+Permission153=傳送/傳輸直接轉帳付款訂單
+Permission154=記錄直接轉帳付款訂單的信貸/拒絕
Permission161=讀取合約/訂閱
Permission162=建立/修改合約/訂閱
Permission163=啟動服務合約/合約的訂閱
@@ -878,7 +878,7 @@ Permission1251=執行從外部資料批次匯入到資料庫的功能 (載入資
Permission1321=匯出客戶發票、屬性及付款資訊
Permission1322=重啟已付帳單
Permission1421=匯出銷售訂單和屬性
-Permission2401=讀取連結到自己用戶帳戶(如果是事件所有者)的活動(事件或任務)
+Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
Permission2402=建立/修改連結到自己的用戶帳戶(如果是事件所有者)的活動(事件或任務)
Permission2403=刪除連結到自己用戶帳戶的行動(事件或任務)(如果是事件所有者)
Permission2411=讀取其他行動(事件或任務)
@@ -1156,17 +1156,18 @@ NoEventOrNoAuditSetup=尚未記錄任何安全事件。如果未在“設定-安
NoEventFoundWithCriteria=找不到此搜尋條件的安全事件。
SeeLocalSendMailSetup=查看本地的郵件寄送設定
BackupDesc=一個Dolibarr安裝的完整備份需要兩個步驟。
-BackupDesc2=備份包含所有上傳和產生文件的“文件”資料夾( %s )的內容。這還將包括在步驟1中產生的所有轉存文件。
+BackupDesc2=備份包含所有上傳和產生文件的“ documents”資料夾( %s )的內容。這還將包括在步驟1中產生的所有轉存檔案。此操作可能持續幾分鐘。
BackupDesc3=將資料庫的結構和內容( %s )備份到轉存檔案中。為此,您可以使用以下助手。
BackupDescX=存檔資料夾應儲存在安全的地方。
BackupDescY=產生的轉存檔案應處存在安全的地方。
BackupPHPWarning=用這種方法不能保證備份。推薦上一個。
RestoreDesc=要還原Dolibarr備份,需要執行兩個步驟。
RestoreDesc2=將“ 文件”資料夾的備份文件(例如zip文件)還原到新的Dolibarr安裝或目前文件資料夾( %s )中。
-RestoreDesc3=將資料庫結構和數據從備份檔案還原到新Dolibarr安裝的資料庫或目前安裝的資料庫 (%s)中。警告,還原完成後,您必須使用備份時間/安裝中存在的登入名稱/密碼才能再次連接。
要將備份數據庫還原到當前安裝中,可以按照此助手進行操作。
+RestoreDesc3=將資料庫結構和數據從備份檔案還原到新Dolibarr安裝的資料庫或目前安裝的資料庫 (%s)中。警告,還原完成後,您必須使用備份時間/安裝中存在的登入名稱/密碼才能再次連接。
要將備份數據庫還原到目前安裝中,可以依照此助手進行操作。
RestoreMySQL=MySQL匯入
ForcedToByAModule= 有一啟動模組強制%s適用此規則
PreviousDumpFiles=現有備份檔案
+PreviousArchiveFiles=現有壓縮檔案
WeekStartOnDay=一周的第一天
RunningUpdateProcessMayBeRequired=似乎需要執行升級(程式版本%s與資料庫版本%s不同)
YouMustRunCommandFromCommandLineAfterLoginToUser=用戶%s在登入終端機後您必須從命令列執行此命令,或您必須在命令列末增加 -W 選項以提供 %s 密碼。
@@ -1248,6 +1249,7 @@ AskForPreferredShippingMethod=要求合作方使用首選的運輸方式。
FieldEdition=欗位 %s編輯
FillThisOnlyIfRequired=例如: +2 (若遇到時區偏移問題時才填寫)
GetBarCode=取得條碼
+NumberingModules=編號模型
##### Module password generation
PasswordGenerationStandard=返回根據Dolibarr內部算法產生的密碼:8個字元,包含數字和小寫字元。
PasswordGenerationNone=不要產生建議密碼。密碼必須手動輸入。
@@ -1449,7 +1451,7 @@ LDAPFieldFax=傳真號碼
LDAPFieldFaxExample=範例:facsimiletelephonenumber
LDAPFieldAddress=街道名稱
LDAPFieldAddressExample=範例: street
-LDAPFieldZip=郵遞區號
+LDAPFieldZip=壓縮
LDAPFieldZipExample=範例: postalcode
LDAPFieldTown=鄉鎮區
LDAPFieldTownExample=範例:l
@@ -1560,7 +1562,7 @@ GenbarcodeLocation=條碼產生命令行工具 ( 某些條碼類型使用內部
BarcodeInternalEngine=內部引擎
BarCodeNumberManager=管理自動編號的條碼
##### Prelevements #####
-WithdrawalsSetup=直接借記付款模組設定
+WithdrawalsSetup=直接轉帳付款模組設定
##### ExternalRSS #####
ExternalRSSSetup=外部RSS匯入設定
NewRSS=新RSS 訂閱
@@ -1711,8 +1713,9 @@ ChequeReceiptsNumberingModule=支票收據編號模組
MultiCompanySetup=多重公司模組設定
##### Suppliers #####
SuppliersSetup=供應商模組設定
-SuppliersCommandModel=採購訂單的完整範本(logo...)
-SuppliersInvoiceModel=供應商發票的完整範本(logo. ...)
+SuppliersCommandModel=Complete template of Purchase Order
+SuppliersCommandModelMuscadet=Complete template of Purchase Order
+SuppliersInvoiceModel=Complete template of Vendor Invoice
SuppliersInvoiceNumberingModel=供應商發票編號模型
IfSetToYesDontForgetPermission=如果設定為非null值,請不要忘記為允許第二次批准的群組或用戶提供權限
##### GeoIPMaxmind #####
@@ -1762,9 +1765,10 @@ ListOfNotificationsPerUser=每個用戶的自動通知清單*
ListOfNotificationsPerUserOrContact=每個用戶*或每個聯絡人**的自動通知(在業務事件中)清單
ListOfFixedNotifications=自動固定通知清單
GoOntoUserCardToAddMore=前往用戶的“通知”分頁以增加或刪除用戶的通知
-GoOntoContactCardToAddMore=前往合作方的「通知」分頁以便增加或移除通訊錄/地址通知
+GoOntoContactCardToAddMore=前往合作方的"通知"分頁以便增加或移除通訊錄/地址通知
Threshold=Threshold
-BackupDumpWizard=建立檔案備份的精靈
+BackupDumpWizard=建立資料庫轉存檔案的小精靈
+BackupZipWizard=建立文件資料夾壓縮檔的小精靈
SomethingMakeInstallFromWebNotPossible=由於以下原因,無法從 Web 界面安裝外部模組:
SomethingMakeInstallFromWebNotPossible2=因此,此處描述的升級過程是只有特權用戶才能執行的手動過程。
InstallModuleFromWebHasBeenDisabledByFile=您的管理員已禁止從應用程式安裝外部模組。您必須要求他刪除檔案%s才能使用此功能。
@@ -1911,7 +1915,7 @@ LoadThirdPartyFromName=在%s載入合作方搜尋 (僅載入)
LoadThirdPartyFromNameOrCreate= 在%s載入合作方搜尋 (如果找不到就建立)
WithDolTrackingID=在訊息ID中找到Dolibarr參考
WithoutDolTrackingID=在訊息ID中找不到Dolibarr參考
-FormatZip=郵遞區號
+FormatZip=Zip
MainMenuCode=選單輸入代碼(主選單)
ECMAutoTree=顯示自動ECM樹狀圖
OperationParamDesc=定義用於操作的值,或如何提取值. 範例:
objproperty1=SET:abc
objproperty1=SET:a value with replacement of __objproperty1__
objproperty3=SETIFEMPTY:abc
objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)
options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)
object.objproperty5=EXTRACT:BODY:我的公司名稱為\\s([^\\s]*)
使用; char作為分隔符號以提取或設定幾個屬性。
@@ -1953,6 +1957,8 @@ SmallerThan=小於
LargerThan=大於
IfTrackingIDFoundEventWillBeLinked=請注意,如果在傳入電子郵件中找到跟踪ID,則該事件將自動連結到相關對象。
WithGMailYouCanCreateADedicatedPassword=對於GMail帳戶,如果啟用了兩步驗證,建議您為應用程序建立專用的第二個密碼,而不要使用來自https://myaccount.google.com/的帳戶密碼。
+EmailCollectorTargetDir=當成功地寄出電子郵件後,將電子郵件移動到另一個標籤/資料夾可能是一種有需要的行動。只需在此處設定一個值即可使用此功能。請注意,您還必須使用可讀/寫登入帳戶。
+EmailCollectorLoadThirdPartyHelp=您可以使用此操作來使用電子郵件內容在資料庫中尋找並載入現有的合作方。找到(或建立)的合作方將用於需要他的後續操作。在參數欄位中您可以使用例如如果您想要從合作方字串'Name: name to find'中將提取的姓名傳送進到內容中您可以使用欄位參數'EXTRACT:BODY:Name:\\s([^\\s]*)'
EndPointFor=%s的端點:%s
DeleteEmailCollector=刪除電子郵件收集器
ConfirmDeleteEmailCollector=您確定要刪除此電子郵件收集器嗎?
@@ -1962,6 +1968,6 @@ RESTRICT_API_ON_IP=僅將可用的API允許用於某些主機IP(不允許使
RESTRICT_ON_IP=僅允許訪問某些主機IP(不允許使用萬用字元,請在值之間使用空格)。空白意味著每個主機都可以訪問。
BaseOnSabeDavVersion=基於SabreDAV版本
NotAPublicIp=不是公共IP
-MakeAnonymousPing=對Dolibarr基金會服務器進行匿名Ping'+1'(僅在安裝後執行1次),以允許基金會計算Dolibarr安裝的次數。
+MakeAnonymousPing=對Dolibarr基金會服務器進行匿名Ping'+1'(僅在安裝後執行1次),以允許基金會計算Dolibarr安裝的次數。
FeatureNotAvailableWithReceptionModule=啟用接收模組後,此功能不可用
EmailTemplate=電子郵件模板
diff --git a/htdocs/langs/zh_TW/agenda.lang b/htdocs/langs/zh_TW/agenda.lang
index ba34ca606c3..1a6cda0b470 100644
--- a/htdocs/langs/zh_TW/agenda.lang
+++ b/htdocs/langs/zh_TW/agenda.lang
@@ -4,7 +4,7 @@ Actions=事件
Agenda=應辦事項
TMenuAgenda=應辦事項
Agendas=應辦事項
-LocalAgenda=內部日曆
+LocalAgenda=內部行事曆
ActionsOwnedBy=事件承辦人
ActionsOwnedByShort=承辦人
AffectedTo=指定給
@@ -32,8 +32,8 @@ ViewPerUser=檢視每位用戶
ViewPerType=每種類別檢視
AutoActions= 自動填滿
AgendaAutoActionDesc= 在這裡,您可以定義希望Dolibarr在應辦事項中自動新增的事件。如果未進行任何檢查,則日誌中將僅包含手動操作,並在應辦事項中顯示。將不會保存專案中自動商業行動追蹤(驗證,狀態更改)。
-AgendaSetupOtherDesc= 此頁面允許將您的Dolibarr事件匯出到外部日曆(Thunderbird,Google Calendar等)。
-AgendaExtSitesDesc=該頁面允許顯示外部來源日曆,以將其事件納入Dolibarr應辦事項。
+AgendaSetupOtherDesc= 此頁面允許將您的Dolibarr事件匯出到外部行事曆(Thunderbird,Google Calendar等)。
+AgendaExtSitesDesc=該頁面允許顯示外部來源行事曆,以將其事件納入Dolibarr應辦事項。
ActionsEvents=Dolibarr 會在待辦事項中自動建立行動事件
EventRemindersByEmailNotEnabled=電子郵件事件提醒未在%s模組設定中啟用。
##### Agenda event labels #####
@@ -60,7 +60,7 @@ MemberSubscriptionModifiedInDolibarr=會員 %s 已修改 %s 訂閱
MemberSubscriptionDeletedInDolibarr=會員 %s 已刪除 %s 訂閱
ShipmentValidatedInDolibarr=裝運%s已驗證
ShipmentClassifyClosedInDolibarr=裝運%s已歸類為開票
-ShipmentUnClassifyCloseddInDolibarr=裝運%s已歸類為重新打開
+ShipmentUnClassifyCloseddInDolibarr=發貨%s已分類為重新打開
ShipmentBackToDraftInDolibarr=裝運%s回到草稿狀態
ShipmentDeletedInDolibarr=裝運%s已刪除
OrderCreatedInDolibarr=訂單 %s 已建立
diff --git a/htdocs/langs/zh_TW/banks.lang b/htdocs/langs/zh_TW/banks.lang
index 97a4ba09a84..f94f47eed36 100644
--- a/htdocs/langs/zh_TW/banks.lang
+++ b/htdocs/langs/zh_TW/banks.lang
@@ -35,8 +35,8 @@ SwiftValid=BIC/SWIFT 有效
SwiftVNotalid=BIC/SWIFT 無效
IbanValid=BAN 有效
IbanNotValid=BAN 無效
-StandingOrders=直接扣款
-StandingOrder=直接扣款
+StandingOrders=直接轉帳訂單
+StandingOrder=直接轉帳訂單
AccountStatement=帳戶對帳單
AccountStatementShort=對帳單
AccountStatements=帳戶對帳單
@@ -101,7 +101,7 @@ NotReconciled=未對帳
CustomerInvoicePayment=客戶付款
SupplierInvoicePayment=供應商付款
SubscriptionPayment=訂閱付款
-WithdrawalPayment=借貸付款單
+WithdrawalPayment=借方付款單
SocialContributionPayment=社會/財務稅負繳款單
BankTransfer=銀行轉帳
BankTransfers=銀行轉帳
@@ -154,7 +154,7 @@ RejectCheck=支票已退回
ConfirmRejectCheck=您確定要將此支票標記為已拒絕嗎?
RejectCheckDate=退回支票的日期
CheckRejected=支票已退回
-CheckRejectedAndInvoicesReopened=支票退回並重新開啟發票
+CheckRejectedAndInvoicesReopened=支票已退回,發票已重新打開
BankAccountModelModule=銀行帳戶的文件範本
DocumentModelSepaMandate=歐洲統一支付區要求的範本。僅適用於歐洲經濟共同體的歐洲國家。
DocumentModelBan=列印有BAN資訊的範本。
diff --git a/htdocs/langs/zh_TW/bills.lang b/htdocs/langs/zh_TW/bills.lang
index 7b07a0e7b8e..1040165a467 100644
--- a/htdocs/langs/zh_TW/bills.lang
+++ b/htdocs/langs/zh_TW/bills.lang
@@ -61,7 +61,7 @@ Payment=付款
PaymentBack=還款
CustomerInvoicePaymentBack=還款
Payments=付款
-PaymentsBack=Refunds
+PaymentsBack=退回付款
paymentInInvoiceCurrency=發票幣別
PaidBack=退款
DeletePayment=刪除付款
@@ -78,7 +78,7 @@ ReceivedCustomersPaymentsToValid=待驗證的客戶已付款單據
PaymentsReportsForYear=%s的付款報告
PaymentsReports=付款報告
PaymentsAlreadyDone=付款已完成
-PaymentsBackAlreadyDone=Refunds already done
+PaymentsBackAlreadyDone=退款已完成
PaymentRule=付款條件
PaymentMode=付款類型
PaymentTypeDC=借/貸卡片
@@ -246,8 +246,8 @@ EscompteOffered=已提供折扣(付款日前付款)
EscompteOfferedShort=折扣
SendBillRef=提交發票%s
SendReminderBillRef=提交發票%s(提醒)
-StandingOrders=直接借記單
-StandingOrder=直接借記單
+StandingOrders=直接轉帳訂單
+StandingOrder=直接轉帳訂單
NoDraftBills=沒有草案發票(s)
NoOtherDraftBills=沒有其他草案發票
NoDraftInvoices=沒有草案發票(s)
@@ -416,14 +416,14 @@ PaymentConditionShort14D=14天
PaymentCondition14D=14天
PaymentConditionShort14DENDMONTH=月底14天
PaymentCondition14DENDMONTH=月底後的14天內
-FixAmount=固定金額
+FixAmount=固定金額-標籤為“ %s”的1行
VarAmount=可變金額 (%% tot.)
VarAmountOneLine=可變金額 (%% tot.) - 有標籤 '%s'的一行
# PaymentType
PaymentTypeVIR=銀行轉帳
PaymentTypeShortVIR=銀行轉帳
-PaymentTypePRE=直接付款訂單
-PaymentTypeShortPRE=信用付款訂單
+PaymentTypePRE=直接轉帳付款訂單
+PaymentTypeShortPRE=轉帳付款訂單
PaymentTypeLIQ=現金
PaymentTypeShortLIQ=現金
PaymentTypeCB=信用卡
@@ -512,7 +512,7 @@ RevenueStamp=印花稅
YouMustCreateInvoiceFromThird=僅當從合作方的“客戶”標籤建立發票時,此選項才可使用
YouMustCreateInvoiceFromSupplierThird=僅當從合作方的“供應商”標籤建立發票時,此選項才可用
YouMustCreateStandardInvoiceFirstDesc=您必須先建立標準發票,然後將其轉換為“範本”才能建立新的發票範本
-PDFCrabeDescription=發票PDF範本Crabe。完整的發票範本(推薦範本)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template
PDFSpongeDescription=發票PDF範本Sponge。完整的發票範本
PDFCrevetteDescription=發票PDF範本Crevette。狀況發票的完整發票範本
TerreNumRefModelDesc1=退回編號格式,標準發票為%syymm-nnnn,信用票據(折讓單-credit notes)是%syymm-nnnn的格式,其中yy是年,mm是月,nnnn是不間斷且不返回0的序列
diff --git a/htdocs/langs/zh_TW/categories.lang b/htdocs/langs/zh_TW/categories.lang
index 44901fd1687..565e1f0430a 100644
--- a/htdocs/langs/zh_TW/categories.lang
+++ b/htdocs/langs/zh_TW/categories.lang
@@ -90,4 +90,5 @@ ShowCategory=顯示標籤/類別
ByDefaultInList=預設在清單中
ChooseCategory=選擇類別
StocksCategoriesArea=倉庫類別區域
+ActionCommCategoriesArea=事件類別區
UseOrOperatorForCategories=類別的使用或運算
diff --git a/htdocs/langs/zh_TW/companies.lang b/htdocs/langs/zh_TW/companies.lang
index ae62fb6f41a..375edfe5e59 100644
--- a/htdocs/langs/zh_TW/companies.lang
+++ b/htdocs/langs/zh_TW/companies.lang
@@ -247,6 +247,12 @@ ProfId3US=-
ProfId4US=-
ProfId5US=-
ProfId6US=-
+ProfId1RO=Prof Id 1 (CUI)
+ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
+ProfId3RO=Prof Id 3 (CAEN)
+ProfId4RO=-
+ProfId5RO=Prof Id 5 (EUID)
+ProfId6RO=-
ProfId1RU=Prof Id 1 (OGRN)
ProfId2RU=Prof Id 2 (INN)
ProfId3RU=Prof Id 3 (KPP)
@@ -339,7 +345,7 @@ MyContacts=我的通訊錄
Capital=資本
CapitalOf=%s的資本
EditCompany=編輯公司資料
-ThisUserIsNot=此用戶非潛在方、客戶或供應商
+ThisUserIsNot=此用戶非潛在、客戶或供應商
VATIntraCheck=確認
VATIntraCheckDesc=營業稅ID必須包含國家/地區前綴。連結%s使用歐洲增值稅檢查器服務(VIES),該服務需要Dolibarr伺服器連上網路。
VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -406,6 +412,13 @@ AllocateCommercial=指定業務代表
Organization=組織
FiscalYearInformation=會計年度
FiscalMonthStart=會計年度開始月份
+SocialNetworksInformation=社交網路
+SocialNetworksFacebookURL=Facebook網址
+SocialNetworksTwitterURL=Twitter網址
+SocialNetworksLinkedinURL=Linkedin網址
+SocialNetworksInstagramURL=Instagram網址
+SocialNetworksYoutubeURL=YouTube網址
+SocialNetworksGithubURL=Github網址
YouMustAssignUserMailFirst=您必須先為此用戶建立電子郵件(email),然後才能新增電子郵件(email)通知。
YouMustCreateContactFirst=為了增加 email 通知,你必須先在合作方的通訊錄有合法 email
ListSuppliersShort=供應商清單
diff --git a/htdocs/langs/zh_TW/compta.lang b/htdocs/langs/zh_TW/compta.lang
index 33a8a983cef..146e67823ee 100644
--- a/htdocs/langs/zh_TW/compta.lang
+++ b/htdocs/langs/zh_TW/compta.lang
@@ -254,3 +254,4 @@ ByVatRate=依營業稅率
TurnoverbyVatrate=依營業稅率開票的營業額
TurnoverCollectedbyVatrate=依營業稅率收取的營業額
PurchasebyVatrate=依銷售購買稅率
+LabelToShow=短標籤
diff --git a/htdocs/langs/zh_TW/dict.lang b/htdocs/langs/zh_TW/dict.lang
index 52f70eede85..28f4deaf115 100644
--- a/htdocs/langs/zh_TW/dict.lang
+++ b/htdocs/langs/zh_TW/dict.lang
@@ -307,7 +307,7 @@ DemandReasonTypeSRC_WOM=口碑
DemandReasonTypeSRC_PARTNER=夥伴
DemandReasonTypeSRC_EMPLOYEE=員工
DemandReasonTypeSRC_SPONSORING=贊助商
-DemandReasonTypeSRC_SRC_CUSTOMER=客戶的聯繫窗口
+DemandReasonTypeSRC_SRC_CUSTOMER=客戶的聯絡人窗口
#### Paper formats ####
PaperFormatEU4A0=4A0 格式
PaperFormatEU2A0=2A0 格式
@@ -342,18 +342,18 @@ ExpAuto9CV=9 CV
ExpAuto10CV=10 CV
ExpAuto11CV=11 CV
ExpAuto12CV=12 CV
-ExpAuto3PCV=3 CV and more
-ExpAuto4PCV=4 CV and more
-ExpAuto5PCV=5 CV and more
-ExpAuto6PCV=6 CV and more
-ExpAuto7PCV=7 CV and more
-ExpAuto8PCV=8 CV and more
-ExpAuto9PCV=9 CV and more
-ExpAuto10PCV=10 CV and more
-ExpAuto11PCV=11 CV and more
-ExpAuto12PCV=12 CV and more
-ExpAuto13PCV=13 CV and more
+ExpAuto3PCV=3 CV和更多
+ExpAuto4PCV=4 CV和更多
+ExpAuto5PCV=5 CV和更多
+ExpAuto6PCV=6 CV和更多
+ExpAuto7PCV=7 CV和更多
+ExpAuto8PCV=8 CV和更多
+ExpAuto9PCV=9 CV和更多
+ExpAuto10PCV=10 CV和更多
+ExpAuto11PCV=11 CV和更多
+ExpAuto12PCV=12 CV和更多
+ExpAuto13PCV=13 CV和更多
ExpCyclo=容量低至50立方公分
-ExpMoto12CV=Motorbike 1 or 2 CV
-ExpMoto345CV=Motorbike 3, 4 or 5 CV
-ExpMoto5PCV=Motorbike 5 CV and more
+ExpMoto12CV=摩托車1或2 CV
+ExpMoto345CV=摩托車3, 4或5 CV
+ExpMoto5PCV=摩托車5 CV 和更多
diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang
index 5dcfd0a9564..a5abf593e25 100644
--- a/htdocs/langs/zh_TW/errors.lang
+++ b/htdocs/langs/zh_TW/errors.lang
@@ -20,7 +20,7 @@ ErrorFailToCreateDir=無法建立資料夾'%s'。
ErrorFailToDeleteDir=無法刪除資料夾'%s'。
ErrorFailToMakeReplacementInto=無法替換到檔案“ %s ”中。
ErrorFailToGenerateFile=無法產生檔案“ %s ”。
-ErrorThisContactIsAlreadyDefinedAsThisType=此聯絡人已被定義為此類型的聯絡人。
+ErrorThisContactIsAlreadyDefinedAsThisType=此聯絡人已被定義為以下類型的聯絡人。
ErrorCashAccountAcceptsOnlyCashMoney=這是一個現金帳戶的銀行帳戶,所以只接受現金支付的類型。
ErrorFromToAccountsMustDiffers=來源和目標的銀行帳戶必須是不同的。
ErrorBadThirdPartyName=合作方名稱的值不正確
@@ -62,14 +62,14 @@ ErrorFileSizeTooLarge=檔案太大。
ErrorSizeTooLongForIntType=位數超過int類型(最大位數%s)
ErrorSizeTooLongForVarcharType=位數超過字串類型(最大位數%s)
ErrorNoValueForSelectType=請填寫所選清單的值
-ErrorNoValueForCheckBoxType=Please fill value for checkbox list
-ErrorNoValueForRadioType=Please fill value for radio list
-ErrorBadFormatValueList=The list value cannot have more than one comma: %s, but need at least one: key,value
+ErrorNoValueForCheckBoxType=請填寫複選框清單的值
+ErrorNoValueForRadioType=請填寫廣播清單的值
+ErrorBadFormatValueList=清單值不能包含多於一個逗號: %s ,但至少需要一個:key,value
ErrorFieldCanNotContainSpecialCharacters=欄位 %s必須不包含特殊字元
-ErrorFieldCanNotContainSpecialNorUpperCharacters=欄位%s不能包含特殊字符,也不能包含大寫字元,只能使用數字。
+ErrorFieldCanNotContainSpecialNorUpperCharacters=欄位%s不能包含特殊字元,也不能包含大寫字元,只能使用數字。
ErrorFieldMustHaveXChar=欄位 %s 至少必須有%s 字元.
ErrorNoAccountancyModuleLoaded=會計模組未啟動
-ErrorExportDuplicateProfil=此匯出設定已存在此配置檔案名稱。
+ErrorExportDuplicateProfil=此匯出設定已存在此設定檔案名稱。
ErrorLDAPSetupNotComplete=Dolibarr與LDAP的匹配不完整。
ErrorLDAPMakeManualTest=.ldif檔案已在資料夾%s中.請以命令行手動讀取以得到更多的錯誤信息。
ErrorCantSaveADoneUserWithZeroPercentage=如果填寫了“完成者”欄位,則無法使用“狀態未開始”保存操作。
@@ -87,166 +87,169 @@ ErrorFieldRefNotIn=欄位%s: '%s' 不是 %s現有參考
ErrorsOnXLines=發現%s錯誤
ErrorFileIsInfectedWithAVirus=防毒程式無法驗證檔案(檔案可能被病毒感染)
ErrorSpecialCharNotAllowedForField=欄位“ %s”不允許使用特殊字元
-ErrorNumRefModel=存在一個引用(%s)和編號是不符合本規則兼容到數據庫。記錄中刪除或重命名參考激活此模塊。
-ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
-ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
-ErrorBadMask=錯誤的遮罩參數值
-ErrorBadMaskFailedToLocatePosOfSequence=沒有序列號錯誤,面具
-ErrorBadMaskBadRazMonth=錯誤,壞的復位值
-ErrorMaxNumberReachForThisMask=Maximum number reached for this mask
-ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
-ErrorSelectAtLeastOne=錯誤。選擇至少一個條目。
-ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transaction that is conciliated
-ErrorProdIdAlreadyExist=%s被分配到另一個第三
+ErrorNumRefModel=資料庫中存在一個引用(%s),並且與該編號規則不相容。刪除記錄或重命名的引用以啟用此模組。
+ErrorQtyTooLowForThisSupplier=數量太少,或者此供應商沒有為此產品定義價格
+ErrorOrdersNotCreatedQtyTooLow=由於數量太少,某些訂單尚未建立
+ErrorModuleSetupNotComplete=模組%s的設定似乎不完整。請前往首頁-設定-模組完成設定。
+ErrorBadMask=遮罩錯誤
+ErrorBadMaskFailedToLocatePosOfSequence=錯誤,遮罩沒有序列號
+ErrorBadMaskBadRazMonth=錯誤,不好的重置值
+ErrorMaxNumberReachForThisMask=已達到此遮罩的最大數量
+ErrorCounterMustHaveMoreThan3Digits=計數器必須超過3位數字
+ErrorSelectAtLeastOne=錯誤。選擇至少一個科目。
+ErrorDeleteNotPossibleLineIsConsolidated=無法刪除,因為記錄連結到已調解的銀行交易
+ErrorProdIdAlreadyExist=%s已被分配到另一個合作方
ErrorFailedToSendPassword=無法傳送密碼
-ErrorFailedToLoadRSSFile=未能得到RSS提要。嘗試添加恒定MAIN_SIMPLEXMLLOAD_DEBUG,如果錯誤消息不提供足夠的信息。
-ErrorForbidden=Access denied.
You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user.
-ErrorForbidden2=此登錄權限可以定義你的Dolibarr從菜單%的S ->%s的管理員
-ErrorForbidden3=看來Dolibarr是不是通過身份驗證的會話中使用。以在Dolibarr安裝文件就會知道如何管理認證(htaccess的,mod_auth或其他...).
-ErrorNoImagickReadimage=在 PHP 中沒有 imagick 類別,所以沒有預覽。管理員可以從選單設定 - 顯示中停用此分頁。
+ErrorFailedToLoadRSSFile=無法獲取RSS訂閱. 如果錯誤訊息沒有提供足夠的資訊,請嘗試增加參數MAIN_SIMPLEXMLLOAD_DEBUG
+ErrorForbidden=訪問被拒絕。
您嘗試訪問已停用模組的頁面,區域或功能,或者沒經過身份驗證的程序,或者不允許用戶訪問。
+ErrorForbidden2=可以經由您的Dolibarr管理員從選單%s->%s中定義此登入權限。
+ErrorForbidden3=似乎Dolibarr被未通過身份驗證的程序使用。查看Dolibarr設定文件,以了解如何管理身份驗證(htaccess,mod_auth或其他...)。
+ErrorNoImagickReadimage=在此 PHP 中沒有 imagick 類別,所以無法預覽。管理員可以從選單設定 - 顯示中停用此分頁。
ErrorRecordAlreadyExists=記錄已存在
-ErrorLabelAlreadyExists=This label already exists
+ErrorLabelAlreadyExists=此標籤已存在
ErrorCantReadFile=無法讀取檔案'%s'
ErrorCantReadDir=無法讀取資料夾'%s'
ErrorBadLoginPassword=錯誤的帳號或密碼
ErrorLoginDisabled=您的帳戶已被停用
-ErrorFailedToRunExternalCommand=無法運行外部命令。檢查它是可用和可運行在PHP的服務器。如果PHP 安全模式被激活,請檢查命令safe_mode_exec_dir之內,是由參數定義一個資料夾。
+ErrorFailedToRunExternalCommand=無法執行外部命令。檢查它是可用並且可執行在PHP的伺服器上。如果PHP 安全模式被啟用,請檢查命令已在資料夾中並以參數safe_mode_exec_dir定義。
ErrorFailedToChangePassword=無法更改密碼
-ErrorLoginDoesNotExists=如何正確使用手機與登錄%找不到。
-ErrorLoginHasNoEmail=這位用戶沒有電子郵件地址。進程中止。
-ErrorBadValueForCode=代碼有錯誤的值類型。再次嘗試以新的價值...
+ErrorLoginDoesNotExists=找不到登入名稱%s的用戶。
+ErrorLoginHasNoEmail=這位用戶沒有電子郵件地址。程序中止。
+ErrorBadValueForCode=安全代碼有錯誤的值。請嘗試新的值...
ErrorBothFieldCantBeNegative=欄位%s和%s不能都為負值
-ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you want to add a discount line, just create the discount first with link %s on screen and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
-ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
-ErrorWebServerUserHasNotPermission=%s用來執行Web服務器用戶帳戶沒有該權限
-ErrorNoActivatedBarcode=沒有激活的條碼類型
-ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
-ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorModuleFileRequired=You must select a Dolibarr module package file
-ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
-ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base
-ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
-ErrorNewValueCantMatchOldValue=New value can't be equal to old one
-ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
-ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
-ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
-ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
-ErrorPHPNeedModule=Error, your PHP must have module %s installed to use this feature.
-ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
-ErrorWarehouseMustDiffers=Source and target warehouses must differs
-ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
-ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
-ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank entry that was reconciled
-ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Paid
-ErrorPriceExpression1=Cannot assign to constant '%s'
-ErrorPriceExpression2=Cannot redefine built-in function '%s'
-ErrorPriceExpression3=Undefined variable '%s' in function definition
-ErrorPriceExpression4=Illegal character '%s'
-ErrorPriceExpression5=Unexpected '%s'
-ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
-ErrorPriceExpression8=Unexpected operator '%s'
-ErrorPriceExpression9=An unexpected error occured
-ErrorPriceExpression10=Operator '%s' lacks operand
-ErrorPriceExpression11=Expecting '%s'
-ErrorPriceExpression14=Division by zero
-ErrorPriceExpression17=Undefined variable '%s'
-ErrorPriceExpression19=Expression not found
-ErrorPriceExpression20=Empty expression
-ErrorPriceExpression21=Empty result '%s'
-ErrorPriceExpression22=Negative result '%s'
-ErrorPriceExpression23=Unknown or non set variable '%s' in %s
-ErrorPriceExpression24=Variable '%s' exists but has no value
-ErrorPriceExpressionInternal=Internal error '%s'
-ErrorPriceExpressionUnknown=Unknown error '%s'
-ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
-ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on product '%s' requiring lot/serial information
-ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
-ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action
-ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
-ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
-ErrorGlobalVariableUpdater2=Missing parameter '%s'
-ErrorGlobalVariableUpdater3=The requested data was not found in result
-ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
-ErrorGlobalVariableUpdater5=No global variable selected
-ErrorFieldMustBeANumeric=Field %s must be a numeric value
-ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter it's status.
-ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
-ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
-ErrorSavingChanges=An error has occurred when saving the changes
-ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
-ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
-ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=產品 %s 庫存不足,增加此項到新的提案/建議書
-ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
-ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
-ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
-ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
-ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
-ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
-ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
-ErrorTaskAlreadyAssigned=Task already assigned to user
-ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
+ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
+ErrorQtyForCustomerInvoiceCantBeNegative=客戶發票行的數量不能為負值
+ErrorWebServerUserHasNotPermission=用戶帳戶%s沒有權限用來執行網頁伺服器
+ErrorNoActivatedBarcode=沒有啟動的條碼類型
+ErrUnzipFails=無法使用ZipArchive解壓縮%s
+ErrNoZipEngine=在此PHP中沒有用於壓縮/解壓縮%s檔案的引擎
+ErrorFileMustBeADolibarrPackage=檔案%s必須是Dolibarr壓縮包
+ErrorModuleFileRequired=您必須選擇一個Dolibarr模組軟體包檔案
+ErrorPhpCurlNotInstalled=未安裝PHP CURL,這對於使用Paypal很重要
+ErrorFailedToAddToMailmanList=無法將記錄%s增加到Mailman清單%s或SPIP
+ErrorFailedToRemoveToMailmanList=無法將記錄%s刪除到Mailman清單%s或SPIP
+ErrorNewValueCantMatchOldValue=新值不能等於舊值
+ErrorFailedToValidatePasswordReset=重置密碼失敗。可能是重新初始化已經完成(此連結只能使用一次)。如果不是,請嘗試再重置密碼一次。
+ErrorToConnectToMysqlCheckInstance=連結資料庫失敗。檢查資料庫伺服器是否正在執行(例如mysql / mariadb,您可以使用“ sudo service mysql start”命令行啟動它)。
+ErrorFailedToAddContact=新增聯絡人失敗
+ErrorDateMustBeBeforeToday=日期不能大於今天
+ErrorPaymentModeDefinedToWithoutSetup=付款方式已設定為%s類型,但模組“發票”尚未完整定義要為此付款方式顯示的資訊設定。
+ErrorPHPNeedModule=錯誤,您的PHP必須安裝模組%s才能使用此功能。
+ErrorOpenIDSetupNotComplete=您設定了Dolibarr設定檔案以允許OpenID身份驗證,但未將OpenID的服務網址定義為常數%s
+ErrorWarehouseMustDiffers=來源倉庫和目標倉庫必須不同
+ErrorBadFormat=格式錯誤!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=錯誤,此會員尚未連結到任何合作方。在使用發票建立訂閱之前,將會員連結到現有的合作方或建立新的合作方。
+ErrorThereIsSomeDeliveries=錯誤,有一些與此發貨相關的交貨。刪除被拒絕。
+ErrorCantDeletePaymentReconciliated=無法刪除已產生且已對帳的銀行科目付款
+ErrorCantDeletePaymentSharedWithPayedInvoice=無法刪除至少有一個狀態為已付款發票的付款
+ErrorPriceExpression1=無法分配給常數'%s'
+ErrorPriceExpression2=無法重新定義內部函數 '%s'
+ErrorPriceExpression3=函數定義中的未定義變數'%s'
+ErrorPriceExpression4=非法字元 '%s'
+ErrorPriceExpression5=未預期的 '%s'
+ErrorPriceExpression6=參數數量錯誤(給出了%s,預期為%s)
+ErrorPriceExpression8=未預期的運算子 '%s'
+ErrorPriceExpression9=發生意外錯誤
+ErrorPriceExpression10=運算元 '%s'缺少操作數
+ErrorPriceExpression11=預期為 '%s'
+ErrorPriceExpression14=被零除
+ErrorPriceExpression17=未定義變數 '%s'
+ErrorPriceExpression19=找不到表達式
+ErrorPriceExpression20=空表達式
+ErrorPriceExpression21=清空結果 '%s'
+ErrorPriceExpression22=否定結果 '%s'
+ErrorPriceExpression23=%s中未知或未設定的變數'%s'
+ErrorPriceExpression24=變數'%s'已存在但沒有值
+ErrorPriceExpressionInternal=內部錯誤'%s'
+ErrorPriceExpressionUnknown=未知錯誤'%s'
+ErrorSrcAndTargetWarehouseMustDiffers=來源倉庫和目標倉庫必須不同
+ErrorTryToMakeMoveOnProductRequiringBatchData=錯誤,嘗試在沒有批次/序列資訊的情況下進行庫存移動,在產品'%s'中需要批次/序列資訊
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=必須先驗證(批准或拒絕)所有記錄的接收,然後才能執行此操作
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=必須先驗證(批准)所有記錄的接收,然後才能執行此操作
+ErrorGlobalVariableUpdater0=HTTP請求失敗,錯誤為“ %s”
+ErrorGlobalVariableUpdater1=無效的JSON格式'%s'
+ErrorGlobalVariableUpdater2=缺少參數'%s'
+ErrorGlobalVariableUpdater3=在結果中找不到所需的資料
+ErrorGlobalVariableUpdater4=SOAP客戶端失敗,錯誤為“ %s”
+ErrorGlobalVariableUpdater5=未選擇全域變數
+ErrorFieldMustBeANumeric=欄位%s必須為數字
+ErrorMandatoryParametersNotProvided=未提供強制性參數
+ErrorOppStatusRequiredIfAmount=您為此潛在客戶設定了預估金額。因此,您還必須輸入其狀態。
+ErrorFailedToLoadModuleDescriptorForXXX=無法載入%s的模組描述類別
+ErrorBadDefinitionOfMenuArrayInModuleDescriptor=模組描述類別中的選單有幾組定義錯誤(密鑰fk_menu的值錯誤)
+ErrorSavingChanges=保存變更時發生錯誤
+ErrorWarehouseRequiredIntoShipmentLine=運送行上需要一個倉庫
+ErrorFileMustHaveFormat=檔案的格式必須為%s
+ErrorSupplierCountryIsNotDefined=該供應商的國家/地區未定義。請先更正此問題。
+ErrorsThirdpartyMerge=合併兩個記錄失敗。請求已取消。
+ErrorStockIsNotEnoughToAddProductOnOrder=庫存不足,因此不能將產品%s增加到新訂單中。
+ErrorStockIsNotEnoughToAddProductOnInvoice=庫存不足,因此不能將產品%s增加到新發票中。
+ErrorStockIsNotEnoughToAddProductOnShipment=庫存不足,無法讓產品將產品%s增加到新的發貨中。
+ErrorStockIsNotEnoughToAddProductOnProposal=庫存不足,因此不能將產品%s增加到新提案/建議書中。
+ErrorFailedToLoadLoginFileForMode=無法取得模式'%s'的登入金鑰。
+ErrorModuleNotFound=找不到模組檔案。
+ErrorFieldAccountNotDefinedForBankLine=沒有為來源行ID %s(%s)定義的會計科目值
+ErrorFieldAccountNotDefinedForInvoiceLine=沒有為發票編號%s(%s)定義的會計科目值
+ErrorFieldAccountNotDefinedForLine=沒有為行(%s)定義會計科目值
+ErrorBankStatementNameMustFollowRegex=錯誤,銀行對帳單名稱必須遵循以下%s語法規則
+ErrorPhpMailDelivery=檢查您使用的收件人數量是否過高,並且電子郵件內容與垃圾郵件相似。還請您的管理員檢查防火牆和服務器日誌檔案以獲取更完整的資訊。
+ErrorUserNotAssignedToTask=必須為用戶分配任務才能輸入花費的時間。
+ErrorTaskAlreadyAssigned=任務已分配給用戶
+ErrorModuleFileSeemsToHaveAWrongFormat=模組軟體包的格式似乎錯誤。
ErrorModuleFileSeemsToHaveAWrongFormat2=模組的zip檔案中必須至少存在一個強制性資料夾: %s或%s
-ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (%s) does not match expected name syntax: %s
-ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
-ErrorNoWarehouseDefined=Error, no warehouses defined.
-ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
-ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
-ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Mass validation is not possible when option to increase/decrease stock is set on this action (you must validate one by one so you can define the warehouse to increase/decrease)
-ErrorObjectMustHaveStatusDraftToBeValidated=Object %s must have status 'Draft' to be validated.
-ErrorObjectMustHaveLinesToBeValidated=Object %s must have lines to be validated.
-ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Only validated invoices can be sent using the "Send by email" mass action.
-ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a predefined product or not
-ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
-ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
-ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
-ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
-ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container %s has the same name or alternative alias that the one your try to use
-ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
-ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
-ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
-ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
-ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
-ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
-ErrorSearchCriteriaTooSmall=Search criteria too small.
-ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to be disabled
-ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
-ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
-ErrorFieldRequiredForProduct=Field '%s' is required for product %s
+ErrorFilenameDosNotMatchDolibarrPackageRules=模組軟體包的名稱( %s )與預期的名稱語法不匹配: %s
+ErrorDuplicateTrigger=錯誤,觸發器名稱%s已重複。已從%s載入。
+ErrorNoWarehouseDefined=錯誤,未定義倉庫。
+ErrorBadLinkSourceSetButBadValueForRef=您使用的連結接無效。定義了付款的“來源”,但“參考”的值無效。
+ErrorTooManyErrorsProcessStopped=錯誤太多。程序已停止。
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=在此操作中設定了增加/減少庫存的選項時,無法進行批次驗證(必須逐個驗證,以便可以定義要增加/減少的倉庫)
+ErrorObjectMustHaveStatusDraftToBeValidated=項目%s必須為“草稿”狀態才能進行驗證。
+ErrorObjectMustHaveLinesToBeValidated=項目%s必須要有驗證的行。
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction=使用“通過電子郵件發送”批次操作只能傳送經過驗證的發票。
+ErrorChooseBetweenFreeEntryOrPredefinedProduct=您必須選擇商品是否為預定義產品
+ErrorDiscountLargerThanRemainToPaySplitItBefore=您嘗試使用的折扣大於剩餘的折扣。將之前的折扣分成2個較小的折扣。
+ErrorFileNotFoundWithSharedLink=找不到檔案。可能是共享金鑰最近被修改或檔案被刪除了。
+ErrorProductBarCodeAlreadyExists=產品條碼%s已存在於另一個產品參考上。
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=另請注意,當至少一個子產品(或子產品的子產品)需要序列號/批號時,無法使用虛擬產品自動增加/減少子產品。
+ErrorDescRequiredForFreeProductLines=對於帶有免費產品的行,必須進行描述說明
+ErrorAPageWithThisNameOrAliasAlreadyExists=此頁面/容器%s與您嘗試使用的名稱/別名相同
+ErrorDuringChartLoad=載入會計科目表時出錯。如果幾個帳戶沒有被載入,您仍然可以手動輸入。
+ErrorBadSyntaxForParamKeyForContent=參數keyforcontent的語法錯誤。必須具有以%s或%s開頭的值
+ErrorVariableKeyForContentMustBeSet=錯誤,必須設定名稱為%s(帶有文字內容)或%s(帶有外部網址)的常數。
+ErrorURLMustStartWithHttp=網址 %s 必須以 http://或https://開始
+ErrorNewRefIsAlreadyUsed=錯誤,新參考已被使用
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=錯誤,無法刪除連結到已關閉發票的付款。
+ErrorSearchCriteriaTooSmall=搜尋條件太小。
+ErrorObjectMustHaveStatusActiveToBeDisabled=項目必須具有“活動”狀態才能被禁用
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=要啟用的項目必須具有“草稿”或“已禁用”狀態
+ErrorNoFieldWithAttributeShowoncombobox=沒有欄位在項目“ %s”的定義中具有屬性“ showoncombobox”。無法顯示組合清單。
+ErrorFieldRequiredForProduct=產品%s必須有欄位'%s'
+ProblemIsInSetupOfTerminal=問題在於站台%s的設定。
+ErrorAddAtLeastOneLineFirst=請先至少增加一行
# Warnings
-WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
-WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
-WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
-WarningEnableYourModulesApplications=Click here to enable your modules and applications
-WarningSafeModeOnCheckExecDir=警告,PHP的選項safe_mode設置為在此情況下命令必須在safe_mode_exec_dir之存儲參數的PHP資料夾內宣布。
-WarningBookmarkAlreadyExists=本標題或此目標(網址)書簽已存在。
-WarningPassIsEmpty=警告,數據庫密碼是空的。這是一個安全漏洞。您應該添加一個密碼到您的數據庫,並改變你的conf.php文件,以反映這一點。
-WarningConfFileMustBeReadOnly=警告,你的配置文件(conf.php htdocs中/ conf /中 ),可覆蓋由Web服務器。這是一個嚴重的安全漏洞。在文件修改權限在閱讀作業系統由Web服務器使用的用戶只模式。如果您的磁盤使用Windows和FAT格式的,你要知道,這個文件系統不允許添加文件的權限,因此不能完全安全的。
-WarningsOnXLines=%S上的源代碼行警告
-WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be chosen by default until you check your module setup.
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=您的PHP參數upload_max_filesize(%s)高於PHP參數post_max_size(%s)。這不是相同的設定。
+WarningPasswordSetWithNoAccount=為此會員設定了密碼。但是,沒有建立用戶帳戶。因此,雖然密碼已儲存,但不能用於登入Dolibarr。外部模組/界面可以使用它,但是如果您不需要為會員定義任何登入名稱或密碼,則可以從會員模組設定中禁用選項“管理每個會員的登入名稱”。如果您需要管理登入名稱但不需要任何密碼,則可以將此欄位保留為空白以避免此警告。注意:如果會員連結到用戶,電子郵件也可以用作登入名稱。
+WarningMandatorySetupNotComplete=點擊此處設定必填參數
+WarningEnableYourModulesApplications=點擊此處啟用您的模組和應用程式
+WarningSafeModeOnCheckExecDir=警告,PHP選項safe_mode處於開啟狀態,因此命令必須儲存在php參數safe_mode_exec_dir聲明的資料夾內。
+WarningBookmarkAlreadyExists=具有此標題或目標(網址)的書籤已存在。
+WarningPassIsEmpty=警告,資料庫密碼是空的。這是一個安全漏洞。您應該在資料庫中加入一個密碼,並更改conf.php檔案以修正這安全錯誤。
+WarningConfFileMustBeReadOnly=警告,您的設定檔案( htdocs / conf / conf.php )可能會被Web伺服器器覆蓋。這是一個嚴重的安全漏洞。對於Web伺服器使用的操作系統用戶,需將檔案權限修改為唯讀模式。如果對磁碟使用Windows和FAT格式,則必須知道此檔案系統不允許在檔案上加入權限,因此不能保證完全安全。
+WarningsOnXLines=關於%s來源記錄的警告
+WarningNoDocumentModelActivated=沒有啟動用於產生文件的模型。預設情況下將選擇一個模型直到您檢查模組設定。
WarningLockFileDoesNotExists=警告,安裝完成後,必須通過在資料夾%s中增加檔案install.lock來禁用安裝/遷移工具。忽略此檔案的建立會帶來嚴重的安全風險。
-WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other Setup).
-WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution.
-WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
-WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
-WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
-WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
-WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
-WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
-WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
-WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
-WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to %s when using the mass actions on lists
-WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
-WarningProjectClosed=Project is closed. You must re-open it first.
-WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
+WarningUntilDirRemoved=只要存在此漏洞(或在設定->其他設定中增加常數MAIN_REMOVE_INSTALL_WARNING),所有安全警告(僅管理員用戶可見)將保持活動狀態。
+WarningCloseAlways=警告,即使來源元件和目標元件之間的數量不同,也將關閉。請謹慎啟用此功能。
+WarningUsingThisBoxSlowDown=警告,使用此框會嚴重降低顯示此框所有頁面的速度。
+WarningClickToDialUserSetupNotComplete=您用戶的ClickToDial資訊設定尚未完成(請參閱用戶卡上的ClickToDial分頁)。
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=當針對盲人或文字瀏覽器優化了顯示設定時,此功能將被禁用。
+WarningPaymentDateLowerThanInvoiceDate=付款日期(%s)早於發票%s的發票日期(%s)。
+WarningTooManyDataPleaseUseMoreFilters= 資料太多(超過%s行)。請使用更多過濾器或將常數%s設定為更高的上限。
+WarningSomeLinesWithNullHourlyRate=某些用戶記錄了某些時間,但未定義其小時費率。%s每小時使用的值為0 ,但這可能會導致錯誤的花費時間評估。
+WarningYourLoginWasModifiedPleaseLogin=您的登入名稱已修改。為了安全起見,您必須先使用新登入名稱登入,然後再執行下一步操作。
+WarningAnEntryAlreadyExistForTransKey=此語言的翻譯密鑰條目已存在
+WarningNumberOfRecipientIsRestrictedInMassAction=警告,在清單上使用批次操作時,其他收件人的數量限制為%s
+WarningDateOfLineMustBeInExpenseReportRange=警告,行的日期不在費用報告的範圍內
+WarningProjectClosed=專案已關閉。您必須先重新打開它。
+WarningSomeBankTransactionByChequeWereRemovedAfter=在產生包括它們的收據之後,一些銀行交易將被刪除。因此支票的數量和收據的數量可能與清單中的數量和總數有所不同。
diff --git a/htdocs/langs/zh_TW/holiday.lang b/htdocs/langs/zh_TW/holiday.lang
index 31d956e963d..6895bed54b7 100644
--- a/htdocs/langs/zh_TW/holiday.lang
+++ b/htdocs/langs/zh_TW/holiday.lang
@@ -39,8 +39,10 @@ TypeOfLeaveId=休假ID類型
TypeOfLeaveCode=休假代碼類型
TypeOfLeaveLabel=休假標籤類型
NbUseDaysCP=已休假天數
+NbUseDaysCPHelp=此計算考慮了字典中定義的非工作日和假期。
NbUseDaysCPShort=已休假天數
NbUseDaysCPShortInMonth=已休假天數(月)
+DayIsANonWorkingDay=%s是非工作日
DateStartInMonth=開始日期(月份)
DateEndInMonth=結束日期(月份)
EditCP=編輯
@@ -85,7 +87,7 @@ NewSoldeCP=新剩餘假期
alreadyCPexist=在此期間之休假申請已完成。
FirstDayOfHoliday=假期的第一天
LastDayOfHoliday=假期的最後一天
-BoxTitleLastLeaveRequests=最新%s已修改的休假申請
+BoxTitleLastLeaveRequests=最新%s筆已修改的休假申請
HolidaysMonthlyUpdate=每月更新
ManualUpdate=手動更新
HolidaysCancelation=取消的休假申請
diff --git a/htdocs/langs/zh_TW/install.lang b/htdocs/langs/zh_TW/install.lang
index ce08119373f..b0fb8a04911 100644
--- a/htdocs/langs/zh_TW/install.lang
+++ b/htdocs/langs/zh_TW/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=此PHP支援Curl。
PHPSupportCalendar=此PHP支援日曆外掛。
PHPSupportUTF8=此PHP支援UTF8函數。
PHPSupportIntl=此PHP支援Intl函數。
+PHPSupport=此PHP支援%s函數。
PHPMemoryOK=您的PHP最大session記憶體設定為%s 。這應該足夠了。
PHPMemoryTooLow=您的PHP最大session記憶體為%sbytes。這太低了。更改您的php.ini,以將記憶體限制/b>參數設定為至少%sbytes。
Recheck=點擊這裡進行更詳細的測試
@@ -25,6 +26,7 @@ ErrorPHPDoesNotSupportCurl=您的PHP安裝不支援Curl。
ErrorPHPDoesNotSupportCalendar=您的PHP安裝不支援php日曆外掛。
ErrorPHPDoesNotSupportUTF8=您的PHP安裝不支援UTF8函數。 Dolibarr無法正常工作。必須在安裝Dolibarr之前修復此問題。
ErrorPHPDoesNotSupportIntl=您的PHP安裝不支援Intl函數。
+ErrorPHPDoesNotSupport=您的PHP安裝不支援%s函數。
ErrorDirDoesNotExists=資料夾%s不存在。
ErrorGoBackAndCorrectParameters=返回並檢查/更正參數。
ErrorWrongValueForParameter=您可能為參數“ %s”輸入了錯誤的值。
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index 39bdab7d860..847b4c8776b 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -470,7 +470,7 @@ Duration=期間
TotalDuration=總時間
Summary=摘要
DolibarrStateBoard=資料庫統計
-DolibarrWorkBoard=開啟項目
+DolibarrWorkBoard=開放項目
NoOpenedElementToProcess=沒有已開啟元件要執行
Available=可用
NotYetAvailable=尚不可用
@@ -505,7 +505,7 @@ Validated=已驗證
Opened=開放
OpenAll=開放(全部)
ClosedAll=已關閉(全部)
-New=新會員類型
+New=新增
Discount=折扣
Unknown=未知
General=一般
@@ -517,7 +517,7 @@ Topic=主旨
ByCompanies=依合作方
ByUsers=依用戶
Links=連線
-Link=連線
+Link=連線
Rejects=拒絕
Preview=預覽
NextStep=下一步
@@ -675,7 +675,7 @@ FeatureDisabled=功能已禁用
MoveBox=移動小工具
Offered=已提供
NotEnoughPermissions=您沒有權限執行這個動作
-SessionName=連線階段名稱
+SessionName=連線程序名稱
Method=方法
Receive=收到
CompleteOrNoMoreReceptionExpected=完成或沒有更多的預期
@@ -732,7 +732,7 @@ CoreErrorTitle=系統錯誤
CoreErrorMessage=很抱歉,發生錯誤。連絡您的系統管理員以確認記錄檔或禁用 $dolibarr_main_prod=1 以取得更多資訊。
CreditCard=信用卡
ValidatePayment=驗證付款
-CreditOrDebitCard=信用卡或簽帳金融卡
+CreditOrDebitCard=信用卡或金融信用卡
FieldsWithAreMandatory=%s的欄位是強制性
FieldsWithIsForPublic=公共會員清單中顯示帶有%s的欄位。如果您不想這樣做,請取消勾選“公共”。
AccordingToGeoIPDatabase=(根據GeoIP轉換)
@@ -861,7 +861,7 @@ ExportOfPiecesAlreadyExportedIsDisable=已停用已匯出出口件
AllExportedMovementsWereRecordedAsExported=所有匯出動作均記錄為已匯出
NotAllExportedMovementsCouldBeRecordedAsExported=並非所有匯出動作都可以記錄為已匯出
Miscellaneous=雜項
-Calendar=日曆
+Calendar=行事曆
GroupBy=群組依...
ViewFlatList=檢視平面清單
RemoveString=移除字串‘%s’
@@ -892,13 +892,13 @@ EMailTemplates=電子郵件範本
FileNotShared=檔案未共享給外部
Project=專案
Projects=專案
-LeadOrProject=潛在 | 項目
-LeadsOrProjects=潛在 | 項目
+LeadOrProject=潛在|專案
+LeadsOrProjects=潛在|專案
Lead=潛在
Leads=潛在
-ListOpenLeads=列出開放潛在客戶
-ListOpenProjects=列出開放項目
-NewLeadOrProject=新的潛在客戶或項目
+ListOpenLeads=列出打開潛在
+ListOpenProjects=列出打開專案
+NewLeadOrProject=新潛在客戶或專案
Rights=權限
LineNb=行號
IncotermLabel=交易條件
@@ -1005,7 +1005,7 @@ ContactDefault_contrat=合約
ContactDefault_facture=發票
ContactDefault_fichinter=干預
ContactDefault_invoice_supplier=供應商發票
-ContactDefault_order_supplier=供應商訂單
+ContactDefault_order_supplier=採購訂單
ContactDefault_project=專案
ContactDefault_project_task=任務
ContactDefault_propal=提案/建議書
@@ -1013,3 +1013,6 @@ ContactDefault_supplier_proposal=供應商提案/建議書
ContactDefault_ticketsup=服務單
ContactAddedAutomatically=通過合作方聯絡人增加的聯絡人
More=更多
+ShowDetails=顯示詳細資料
+CustomReports=Custom reports
+SelectYourGraphOptionsFirst=Select your graph options to build a graph
diff --git a/htdocs/langs/zh_TW/members.lang b/htdocs/langs/zh_TW/members.lang
index 20a2c166331..04c73132f61 100644
--- a/htdocs/langs/zh_TW/members.lang
+++ b/htdocs/langs/zh_TW/members.lang
@@ -100,8 +100,8 @@ EnablePublicSubscriptionForm=使用自我訂閱表格啟用公共網站
ForceMemberType=強制會員類型
ExportDataset_member_1=會員和訂閱
ImportDataset_member_1=會員
-LastMembersModified=%s最後修改的會員
-LastSubscriptionsModified=%s最後修改的訂閱
+LastMembersModified=最後%s位修改的會員
+LastSubscriptionsModified=最後%s筆修改的訂閱
String=字串
Text=文字
Int=整數
diff --git a/htdocs/langs/zh_TW/modulebuilder.lang b/htdocs/langs/zh_TW/modulebuilder.lang
index 02d58f25a35..ae63a1c899f 100644
--- a/htdocs/langs/zh_TW/modulebuilder.lang
+++ b/htdocs/langs/zh_TW/modulebuilder.lang
@@ -1,12 +1,12 @@
# Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative manual development is here.
+ModuleBuilderDesc=此工具只能由有經驗的用戶或開發人員使用。它提供了用於建構或編輯自己的模組的實用程式。替代手動開發的文件在此處。
EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): %s
ModuleBuilderDesc3=Generated/editable modules found: %s
ModuleBuilderDesc4=A module is detected as 'editable' when the file %s exists in root of module directory
-NewModule=New module
-NewObjectInModulebuilder=New object
+NewModule=新模組
+NewObjectInModulebuilder=新項目
ModuleKey=Module key
ObjectKey=Object key
ModuleInitialized=Module initialized
@@ -30,9 +30,9 @@ BuildDocumentation=Build documentation
ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here:
ModuleIsLive=This module has been activated. Any change may break a current live feature.
DescriptionLong=Long description
-EditorName=Name of editor
-EditorUrl=URL of editor
-DescriptorFile=Descriptor file of module
+EditorName=編輯器名稱
+EditorUrl=編輯器網址
+DescriptorFile=模組的描述檔案
ClassFile=File for PHP DAO CRUD class
ApiClassFile=File for PHP API class
PageForList=PHP page for list of record
@@ -46,8 +46,8 @@ SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
FileNotYetGenerated=File not yet generated
RegenerateClassAndSql=Force update of .class and .sql files
RegenerateMissingFiles=Generate missing files
-SpecificationFile=File of documentation
-LanguageFile=File for language
+SpecificationFile=文件檔案
+LanguageFile=語言檔案
ObjectProperties=Object Properties
ConfirmDeleteProperty=Are you sure you want to delete the property %s? This will change code in PHP class but also remove column from table definition of object.
NotNull=Not NULL
@@ -83,7 +83,7 @@ ListOfDictionariesEntries=List of dictionaries entries
ListOfPermissionsDefined=List of defined permissions
SeeExamples=See examples here
EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:
preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
($user->rights->holiday->define_holiday ? 1 : 0)
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:
preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
($user->rights->holiday->define_holiday ? 1 : 0)
IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
@@ -135,3 +135,5 @@ CSSClass=CSS Class
NotEditable=Not editable
ForeignKey=Foreign key
TypeOfFieldsHelp=Type of fields:
varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
+AsciiToHtmlConverter=Ascii to HTML converter
+AsciiToPdfConverter=Ascii to PDF converter
diff --git a/htdocs/langs/zh_TW/mrp.lang b/htdocs/langs/zh_TW/mrp.lang
index 0eb50539d65..277f0863b88 100644
--- a/htdocs/langs/zh_TW/mrp.lang
+++ b/htdocs/langs/zh_TW/mrp.lang
@@ -1,65 +1,68 @@
-Mrp=Manufacturing Orders
-MO=Manufacturing Order
-MRPDescription=Module to manage Manufacturing Orders (MO).
-MRPArea=MRP Area
+Mrp=製造訂單
+MO=製造訂單
+MRPDescription=管理製造訂單(MO)的模組。
+MRPArea=MRP區域
MrpSetupPage=MRP模組設定
MenuBOM=物料清單
LatestBOMModified=最新的%s物料清單已修改
-LatestMOModified=Latest %s Manufacturing Orders modified
+LatestMOModified=最新%s筆製造訂單已修改
Bom=物料清單
BillOfMaterials=物料清單
BOMsSetup=BOM模組設定
ListOfBOMs=物料清單-BOM
-ListOfManufacturingOrders=List of Manufacturing Orders
+ListOfManufacturingOrders=製造訂單清單
NewBOM=新物料清單
-ProductBOMHelp=Product to create with this BOM.
Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+ProductBOMHelp=此物料清單建立的產品。
注意:屬性為“原料”的產品 =“原材料”在此清單中不可見。
BOMsNumberingModules=BOM編號範本
BOMsModelModule=BOM文件範本
MOsNumberingModules=MO編號範本
MOsModelModule=MO文件範本
-FreeLegalTextOnBOMs=Free text on document of BOM
-WatermarkOnDraftBOMs=Watermark on draft BOM
-FreeLegalTextOnMOs=Free text on document of MO
-WatermarkOnDraftMOs=Watermark on draft MO
+FreeLegalTextOnBOMs=物料清單文件上的自由文字
+WatermarkOnDraftBOMs=物料清單草稿上的浮水印
+FreeLegalTextOnMOs=MO文件上的自由文字
+WatermarkOnDraftMOs=MO草稿浮水印
ConfirmCloneBillOfMaterials=您確定要複製物料清單%s嗎?
-ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
-ManufacturingEfficiency=Manufacturing efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+ConfirmCloneMo=您確定要複製製造訂單%s嗎?
+ManufacturingEfficiency=製造效率
+ValueOfMeansLoss=數值0.95表示生產期間平均損失5%%
DeleteBillOfMaterials=刪除物料清單
-DeleteMo=Delete Manufacturing Order
+DeleteMo=刪除製造訂單
ConfirmDeleteBillOfMaterials=您確定要刪除此物料清單嗎?
ConfirmDeleteMo=您確定要刪除此物料清單嗎?
-MenuMRP=Manufacturing Orders
-NewMO=New Manufacturing Order
-QtyToProduce=Qty to produce
-DateStartPlannedMo=Date start planned
-DateEndPlannedMo=Date end planned
-KeepEmptyForAsap=Empty means 'As Soon As Possible'
-EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
-ConfirmValidateBom=Are you sure you want to validate the BOM with the reference %s (you will be able to use it to build new Manufacturing Orders)
-ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
-ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
-StatusMOProduced=Produced
-QtyFrozen=Frozen Qty
-QuantityFrozen=Frozen Quantity
-QuantityConsumedInvariable=When this flag is set, the quantity consumed is always the value defined and is not relative to the quantity produced.
-DisableStockChange=Stock change disabled
-DisableStockChangeHelp=When this flag is set, there is no stock change on this product, whatever is the quantity consumed
+MenuMRP=製造訂單
+NewMO=新製造訂單
+QtyToProduce=生產數量
+DateStartPlannedMo=計劃開始日期
+DateEndPlannedMo=計劃結束日期
+KeepEmptyForAsap=空白表示“盡快”
+EstimatedDuration=預計時間
+EstimatedDurationDesc=使用此物料清單估計製造此產品的時間
+ConfirmValidateBom=您確定要使用參考%s來驗證物料清單(您將能夠使用它來建立新的製造訂單)
+ConfirmCloseBom=您確定要取消此物料清單(您將無法再使用它來建立新的製造訂單)?
+ConfirmReopenBom=您確定要重新打開此物料清單嗎(您將能夠使用它來建立新的製造訂單)
+StatusMOProduced=已生產
+QtyFrozen=凍結數量
+QuantityFrozen=凍結數量
+QuantityConsumedInvariable=設定此標誌時,消耗的數量始終是定義的值,並且與產生的數量無關。
+DisableStockChange=已停用庫存更改
+DisableStockChangeHelp=設定此標誌後,無論消耗多少數量,此產品都不會有庫存變化
BomAndBomLines=物料清單和項目
-BOMLine=Line of BOM
-WarehouseForProduction=Warehouse for production
-CreateMO=Create MO
-ToConsume=To consume
-ToProduce=To produce
-QtyAlreadyConsumed=Qty already consumed
-QtyAlreadyProduced=Qty already produced
-ConsumeAndProduceAll=Consume and Produce All
-Manufactured=Manufactured
-TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
-ForAQuantityOf1=For a quantity to produce of 1
-ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
-ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
-ProductionForRefAndDate=Production %s - %s
-AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
-NoStockChangeOnServices=No stock change on services
+BOMLine=物料清單行
+WarehouseForProduction=生產倉庫
+CreateMO=建立MO
+ToConsume=消耗
+ToProduce=生產
+QtyAlreadyConsumed=已消耗數量
+QtyAlreadyProduced=已生產數量
+ConsumeOrProduce=消耗或生產
+ConsumeAndProduceAll=消耗並生產所有產品
+Manufactured=已製造
+TheProductXIsAlreadyTheProductToProduce=要增加的產品已經是要生產的產品。
+ForAQuantityOf1=生產數量為1
+ConfirmValidateMo=您確定要驗證此製造訂單嗎?
+ConfirmProductionDesc=通過點擊“%s”,您將驗證數量設定的消耗量和/或生產量。這還將更新庫存並記錄庫存動向。
+ProductionForRef=生產%s
+AutoCloseMO=如果達到消耗和生產的數量,則自動關閉製造訂單
+NoStockChangeOnServices=服務無庫存變化
+ProductQtyToConsumeByMO=Product quantity still to consume by open MO
+ProductQtyToProduceByMO=Product quentity still to produce by open MO
diff --git a/htdocs/langs/zh_TW/orders.lang b/htdocs/langs/zh_TW/orders.lang
index 7ff9b494ba4..d1b5a76b459 100644
--- a/htdocs/langs/zh_TW/orders.lang
+++ b/htdocs/langs/zh_TW/orders.lang
@@ -78,10 +78,10 @@ OrdersOpened=訂單處理
NoDraftOrders=沒有草稿訂單
NoOrder=沒有訂單
NoSupplierOrder=沒有採購訂單
-LastOrders=最新的%s銷售訂單
-LastCustomerOrders=最新%s銷售訂單
-LastSupplierOrders=最新%s採購訂單
-LastModifiedOrders=最新的%s修改訂單
+LastOrders=最新%s筆銷售訂單
+LastCustomerOrders=最新%s筆銷售訂單
+LastSupplierOrders=最新%s筆採購訂單
+LastModifiedOrders=最新%s筆修改訂單
AllOrders=所有訂單
NbOfOrders=訂單號碼
OrdersStatistics=訂單統計
@@ -141,10 +141,10 @@ OrderByEMail=電子郵件
OrderByWWW=線上網路
OrderByPhone=電話
# Documents models
-PDFEinsteinDescription=可產生一份完整的訂單範本(logo. ..)
-PDFEratostheneDescription=可產生一份完整的訂單範本(logo. ..)
+PDFEinsteinDescription=A complete order model
+PDFEratostheneDescription=A complete order model
PDFEdisonDescription=可產生一份簡單的訂單範本
-PDFProformaDescription=完整的發票型式(logo…)
+PDFProformaDescription=A complete Proforma invoice template
CreateInvoiceForThisCustomer=提單/記名票據
NoOrdersToInvoice=沒有訂單可計費
CloseProcessedOrdersAutomatically=將所有選定訂單分類為“已處理”。
diff --git a/htdocs/langs/zh_TW/other.lang b/htdocs/langs/zh_TW/other.lang
index 22b945d3301..4cb5c9d0a89 100644
--- a/htdocs/langs/zh_TW/other.lang
+++ b/htdocs/langs/zh_TW/other.lang
@@ -2,128 +2,129 @@
SecurityCode=安全代碼
NumberingShort=N°
Tools=工具
-TMenuTools=Tools
-ToolsDesc=All tools not included in other menu entries are grouped here.
All the tools can be accessed via the left menu.
+TMenuTools=工具
+ToolsDesc=所有在其他選單項目中未包含的工具都在此處。
所有工具均可通過左側選單使用。
Birthday=生日
-BirthdayDate=Birthday date
-DateToBirth=Birth date
-BirthdayAlertOn=生日提醒活躍
-BirthdayAlertOff=生日提醒無效
-TransKey=Translation of the key TransKey
-MonthOfInvoice=Month (number 1-12) of invoice date
-TextMonthOfInvoice=Month (text) of invoice date
-PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
-TextPreviousMonthOfInvoice=Previous month (text) of invoice date
-NextMonthOfInvoice=Following month (number 1-12) of invoice date
-TextNextMonthOfInvoice=Following month (text) of invoice date
-ZipFileGeneratedInto=Zip file generated into %s.
-DocFileGeneratedInto=Doc file generated into %s.
-JumpToLogin=Disconnected. Go to login page...
-MessageForm=Message on online payment form
-MessageOK=Message on the return page for a validated payment
-MessageKO=Message on the return page for a canceled payment
+BirthdayDate=生日日期
+DateToBirth=生日
+BirthdayAlertOn=生日提醒啟動中
+BirthdayAlertOff=生日提醒停用中
+TransKey=密鑰TransKey的翻譯
+MonthOfInvoice=發票日期的月份(1-12)
+TextMonthOfInvoice=發票日期的月份(文字)
+PreviousMonthOfInvoice=發票日期的前一個月(1-12)
+TextPreviousMonthOfInvoice=發票日期的前一個月(文字)
+NextMonthOfInvoice=發票日期的下個月(1-12)
+TextNextMonthOfInvoice=發票日期的下個月(文字)
+ZipFileGeneratedInto=壓縮檔案已產生到 %s 中。
+DocFileGeneratedInto=DOC檔案已產生到 %s 中。
+JumpToLogin=已斷線。請前往登入頁面...
+MessageForm=線上付款表單上的訊息
+MessageOK=退貨頁面上有關已驗證付款的訊息
+MessageKO=退貨頁面上關於已取消付款的訊息
ContentOfDirectoryIsNotEmpty=此資料夾的內容不是空的。
-DeleteAlsoContentRecursively=Check to delete all content recursively
+DeleteAlsoContentRecursively=確認以遞歸方式刪除所有內容
+PoweredBy=Powered by
+YearOfInvoice=發票日期年份
+PreviousYearOfInvoice=發票日期的上一年
+NextYearOfInvoice=發票日期的下一年
+DateNextInvoiceBeforeGen=下一張發票的日期(產生前)
+DateNextInvoiceAfterGen=下一張發票的日期(產生後)
-YearOfInvoice=Year of invoice date
-PreviousYearOfInvoice=Previous year of invoice date
-NextYearOfInvoice=Following year of invoice date
-DateNextInvoiceBeforeGen=Date of next invoice (before generation)
-DateNextInvoiceAfterGen=Date of next invoice (after generation)
-
-Notify_ORDER_VALIDATE=Sales order validated
-Notify_ORDER_SENTBYMAIL=Sales order sent by mail
-Notify_ORDER_SUPPLIER_SENTBYMAIL=Purchase order sent by email
-Notify_ORDER_SUPPLIER_VALIDATE=Purchase order recorded
-Notify_ORDER_SUPPLIER_APPROVE=Purchase order approved
-Notify_ORDER_SUPPLIER_REFUSE=Purchase order refused
-Notify_PROPAL_VALIDATE=驗證客戶的客戶提案/建議書
-Notify_PROPAL_CLOSE_SIGNED=Customer proposal closed signed
-Notify_PROPAL_CLOSE_REFUSED=Customer proposal closed refused
-Notify_PROPAL_SENTBYMAIL=通過郵件發送的商業提案/建議書
-Notify_WITHDRAW_TRANSMIT=傳輸撤軍
-Notify_WITHDRAW_CREDIT=信貸撤離
-Notify_WITHDRAW_EMIT=執行撤離
-Notify_COMPANY_CREATE=合作方已新增
-Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
-Notify_BILL_VALIDATE=客戶發票驗證
-Notify_BILL_UNVALIDATE=Customer invoice unvalidated
-Notify_BILL_PAYED=客戶發票已付
-Notify_BILL_CANCEL=客戶發票取消
-Notify_BILL_SENTBYMAIL=通過郵件發送的客戶發票
-Notify_BILL_SUPPLIER_VALIDATE=Vendor invoice validated
-Notify_BILL_SUPPLIER_PAYED=Vendor invoice paid
-Notify_BILL_SUPPLIER_SENTBYMAIL=Vendor invoice sent by mail
-Notify_BILL_SUPPLIER_CANCELED=Vendor invoice cancelled
-Notify_CONTRACT_VALIDATE=合同驗證
-Notify_FICHINTER_VALIDATE=幹預驗證
-Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
-Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
-Notify_SHIPPING_VALIDATE=航運驗證
-Notify_SHIPPING_SENTBYMAIL=通過電子郵件發送的航運
-Notify_MEMBER_VALIDATE=會員驗證
-Notify_MEMBER_MODIFY=Member modified
-Notify_MEMBER_SUBSCRIPTION=會員訂閱
-Notify_MEMBER_RESILIATE=Member terminated
-Notify_MEMBER_DELETE=會員刪除
-Notify_PROJECT_CREATE=Project creation
-Notify_TASK_CREATE=Task created
-Notify_TASK_MODIFY=Task modified
-Notify_TASK_DELETE=Task deleted
-Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
-Notify_EXPENSE_REPORT_APPROVE=Expense report approved
-Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
-Notify_HOLIDAY_APPROVE=Leave request approved
+Notify_ORDER_VALIDATE=銷售訂單已驗證
+Notify_ORDER_SENTBYMAIL=使用郵件寄送的銷售訂單
+Notify_ORDER_SUPPLIER_SENTBYMAIL=使用電子郵件寄送的採購訂單
+Notify_ORDER_SUPPLIER_VALIDATE=採購訂單已記錄
+Notify_ORDER_SUPPLIER_APPROVE=採購訂單已批准
+Notify_ORDER_SUPPLIER_REFUSE=採購訂單已拒絕
+Notify_PROPAL_VALIDATE=客戶提案/建議書已驗證
+Notify_PROPAL_CLOSE_SIGNED=客戶提案/建議書已關閉已簽署
+Notify_PROPAL_CLOSE_REFUSED=客戶提案/建議書已關閉已拒絕
+Notify_PROPAL_SENTBYMAIL=使用郵件寄送的商業提案/建議書
+Notify_WITHDRAW_TRANSMIT=傳送提款
+Notify_WITHDRAW_CREDIT=信用提款
+Notify_WITHDRAW_EMIT=執行提款
+Notify_COMPANY_CREATE=合作方已建立
+Notify_COMPANY_SENTBYMAIL=從合作方卡傳送的郵件
+Notify_BILL_VALIDATE=已驗證客戶發票
+Notify_BILL_UNVALIDATE=未驗證客戶發票
+Notify_BILL_PAYED=已付款客戶發票
+Notify_BILL_CANCEL=已取消客戶發票
+Notify_BILL_SENTBYMAIL=以郵件寄送的客戶發票
+Notify_BILL_SUPPLIER_VALIDATE=已驗證供應商發票
+Notify_BILL_SUPPLIER_PAYED=已付款供應商發票
+Notify_BILL_SUPPLIER_SENTBYMAIL=以郵件寄送的供應商發票
+Notify_BILL_SUPPLIER_CANCELED=已取消供應商發票
+Notify_CONTRACT_VALIDATE=已驗證合約
+Notify_FICHINTER_VALIDATE=已驗證干預
+Notify_FICHINTER_ADD_CONTACT=在干預中增加了聯絡人
+Notify_FICHINTER_SENTBYMAIL=以郵件寄送干預
+Notify_SHIPPING_VALIDATE=已驗證發貨
+Notify_SHIPPING_SENTBYMAIL=以電子郵件寄送的發貨
+Notify_MEMBER_VALIDATE=會員已驗證
+Notify_MEMBER_MODIFY=會員已修改
+Notify_MEMBER_SUBSCRIPTION=會員已訂閱
+Notify_MEMBER_RESILIATE=會員已終止
+Notify_MEMBER_DELETE=會員已刪除
+Notify_PROJECT_CREATE=專案建立
+Notify_TASK_CREATE=任務已建立
+Notify_TASK_MODIFY=任務已修改
+Notify_TASK_DELETE=任務已刪除
+Notify_EXPENSE_REPORT_VALIDATE=費用報告已驗證(需要批准)
+Notify_EXPENSE_REPORT_APPROVE=費用報告已批准
+Notify_HOLIDAY_VALIDATE=休假申請已驗證(需要批准)
+Notify_HOLIDAY_APPROVE=休假申請已批准
SeeModuleSetup=請參閱模組%s的設定
-NbOfAttachedFiles=所附文件數/文件
+NbOfAttachedFiles=所附檔案/文件數
TotalSizeOfAttachedFiles=附件大小總計
-MaxSize=檔案最大
+MaxSize=檔案容量上限
AttachANewFile=附加一個新的檔案/文件
-LinkedObject=鏈接對象
-NbOfActiveNotifications=Number of notifications (no. of recipient emails)
-PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
-PredefinedMailTestHtml=__(Hello)__\nThis is a test mail (the word test must be in bold).
The two lines are separated by a carriage return.
__USER_SIGNATURE__
+LinkedObject=已連結項目
+NbOfActiveNotifications=通知數(收件人電子郵件數量)
+PredefinedMailTest=__(Hello)__\n這是一封測試郵件寄送給 __EMAIL__.\n這兩行使用Enter符號分隔.\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__(Hello)__\n這是一封 測試郵件("測試"必須為粗體).
這兩行使用Enter符號分隔.
__USER_SIGNATURE__
PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached \n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to remind you that the invoice __REF__ seems to have not been paid. A copy of the invoice is attached as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find commercial proposal __REF__ attached \n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nPlease find price request __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendOrder=__(Hello)__\n\nPlease find order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\n請查看已附上之發票 __REF__ \n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\n我們要提醒您發票__REF__ 似乎尚未付款.已附上發票副本.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\n請查看已附上之商業提案/建議書 __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__(Hello)__\n\n請查看已付上之價格要求__REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendOrder=__(Hello)__\n\n請查看已附上之訂單__REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__(Hello)__\n\n請查看已附上之我們的訂單 __REF__ \n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\n請查看已附上之發票__REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendShipping=__(Hello)__\n\n請查看已附上之發貨__REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendFichInter=__(Hello)__\n\n請查看已附上之干預__REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
-ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
-ChooseYourDemoProfilMore=...or build your own profile
(manual module selection)
+PredefinedMailContentLink=如果付款尚未完成您可以點擊以下連結.\n\n%s\n\n
+DemoDesc=Dolibarr是一個嚴謹的ERP / CRM,支援多個業務模組。展示所有模組的DEMO沒有意義,因為這種情況永遠不會發生(有數百種可用)。因此,有幾個DEMO設定檔案可用。
+ChooseYourDemoProfil=選擇最適合您需求的DEMO設定檔案...
+ChooseYourDemoProfilMore=...或建立您自己的設定檔案
(手動選擇模組)
DemoFundation=管理基金會會員
DemoFundation2=管理基金會會員與銀行帳戶
-DemoCompanyServiceOnly=Company or freelance selling service only
-DemoCompanyShopWithCashDesk=管理與現金辦公桌店
-DemoCompanyProductAndStocks=Company selling products with a shop
-DemoCompanyAll=Company with multiple activities (all main modules)
-CreatedBy=建立 by %s
-ModifiedBy=修改 by %s
-ValidatedBy=被%s驗證
-ClosedBy=被%s關閉
-CreatedById=User id who created
-ModifiedById=User id who made latest change
-ValidatedById=User id who validated
-CanceledById=User id who canceled
-ClosedById=User id who closed
-CreatedByLogin=User login who created
-ModifiedByLogin=User login who made latest change
-ValidatedByLogin=User login who validated
-CanceledByLogin=User login who canceled
-ClosedByLogin=User login who closed
-FileWasRemoved=檔案%s被刪除
-DirWasRemoved=資料夾%s被刪除
-FeatureNotYetAvailable=Feature not yet available in the current version
-FeaturesSupported=Supported features
+DemoCompanyServiceOnly=公司或自由業者僅能銷售服務
+DemoCompanyShopWithCashDesk=用收銀台管理商店
+DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
+DemoCompanyManufacturing=Company manufacturing products
+DemoCompanyAll=有多項活動的公司(所有主要模組)
+CreatedBy=由%s建立
+ModifiedBy=由%s修改
+ValidatedBy=由%s驗證
+ClosedBy=由%s關閉
+CreatedById=建立的用戶ID
+ModifiedById=進行最新更改的用戶ID
+ValidatedById=已驗證的用戶ID
+CanceledById=已取消的用戶ID
+ClosedById=已關閉的用戶ID
+CreatedByLogin=已建立的用戶登入名稱
+ModifiedByLogin=進行最新更改的用戶登入名稱
+ValidatedByLogin=已驗證的用戶登入名稱
+CanceledByLogin=已取消的用戶登入名稱
+ClosedByLogin=已關閉的用戶登入名稱
+FileWasRemoved=檔案%s已刪除
+DirWasRemoved=資料夾%s已刪除
+FeatureNotYetAvailable=此功能在目前版本中尚不可用
+FeaturesSupported=已支援功能
Width=寬度
Height=高度
Depth=深度
@@ -131,20 +132,20 @@ Top=頂部
Bottom=底部的
Left=左
Right=右
-CalculatedWeight=計算重量
-CalculatedVolume=計算量
+CalculatedWeight=已計算重量
+CalculatedVolume=已計算體積
Weight=重量
-WeightUnitton=tonne
-WeightUnitkg=Kg(公斤)
-WeightUnitg=g(克)
-WeightUnitmg=mg(毫克)
-WeightUnitpound=pound(英鎊)
-WeightUnitounce=ounce(盎司)
+WeightUnitton=公噸
+WeightUnitkg=kg
+WeightUnitg=g
+WeightUnitmg=mg
+WeightUnitpound=磅
+WeightUnitounce=盎司
Length=長度
-LengthUnitm=m(公尺)
-LengthUnitdm=dm(公寸)
-LengthUnitcm=cm(公分)
-LengthUnitmm=mm(毫米)
+LengthUnitm=m
+LengthUnitdm=dm
+LengthUnitcm=cm
+LengthUnitmm=mm
Surface=面積
SurfaceUnitm2=m²
SurfaceUnitdm2=dm²
@@ -159,117 +160,117 @@ VolumeUnitcm3=cm³ (ml)
VolumeUnitmm3=mm³ (µl)
VolumeUnitfoot3=ft³
VolumeUnitinch3=in³
-VolumeUnitounce=ounce(盎司)
-VolumeUnitlitre=L(升)
-VolumeUnitgallon=gallon(加侖)
-SizeUnitm=m(公尺)
-SizeUnitdm=dm(公寸)
-SizeUnitcm=cm(公分)
-SizeUnitmm=mm(毫米)
-SizeUnitinch=inch(英吋)
-SizeUnitfoot=foot(英呎)
-SizeUnitpoint=point
+VolumeUnitounce=盎司
+VolumeUnitlitre=公升
+VolumeUnitgallon=加侖
+SizeUnitm=m
+SizeUnitdm=dm
+SizeUnitcm=cm
+SizeUnitmm=mm
+SizeUnitinch=英寸
+SizeUnitfoot=英呎
+SizeUnitpoint=點
BugTracker=臭蟲追蹤系統
-SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.
Change will become effective once you click on the confirmation link in the email.
Check your inbox.
-BackToLoginPage=回到登錄頁面
-AuthenticationDoesNotAllowSendNewPassword=認證模式為%s。
在這種模式下,Dolibarr不能知道,也不更改密碼。
聯系您的系統管理員,如果您想更改您的密碼。
-EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
-ProfIdShortDesc=Prof Id %s的信息取決於合作方國家/地區。
例如,對於國家%s ,其代碼為%s 。
-DolibarrDemo=Dolibarr的ERP / CRM的演示
-StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+SendNewPasswordDesc=此表單允許您要求新的密碼。它將傳送到您的電子郵件。
點擊電子郵件中的確認連結後,更改將生效。
檢查您的信箱。
+BackToLoginPage=回到登入頁面
+AuthenticationDoesNotAllowSendNewPassword=認證模式為%s.
在這種模式下,Dolibarr不知道,也不能更改您的密碼。
如果您想更改您的密碼,請聯絡您的系統管理員。
+EnableGDLibraryDesc=在PHP安裝上安裝或啟用GD程式庫以使用此選項。
+ProfIdShortDesc=Prof Id %s的資訊取決於合作方國家/地區。
例如,對於國家%s ,其代碼為%s 。
+DolibarrDemo=Dolibarr的ERP / CRM的DEMO
+StatsByNumberOfUnits=產品/服務數量統計
+StatsByNumberOfEntities=參考實際數量的統計(發票或訂單的數量...)
NumberOfProposals=提案/建議書的數量
-NumberOfCustomerOrders=Number of sales orders
-NumberOfCustomerInvoices=Number of customer invoices
-NumberOfSupplierProposals=Number of vendor proposals
-NumberOfSupplierOrders=Number of purchase orders
-NumberOfSupplierInvoices=Number of vendor invoices
-NumberOfContracts=Number of contracts
-NumberOfUnitsProposals=提案/建議書的單位數量
-NumberOfUnitsCustomerOrders=Number of units on sales orders
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices
-NumberOfUnitsSupplierProposals=Number of units on vendor proposals
-NumberOfUnitsSupplierOrders=Number of units on purchase orders
-NumberOfUnitsSupplierInvoices=Number of units on vendor invoices
-NumberOfUnitsContracts=Number of units on contracts
-EMailTextInterventionAddedContact=A new intervention %s has been assigned to you.
-EMailTextInterventionValidated=幹預%s已被驗證。
-EMailTextInvoiceValidated=Invoice %s has been validated.
-EMailTextInvoicePayed=Invoice %s has been paid.
-EMailTextProposalValidated=Proposal %s has been validated.
-EMailTextProposalClosedSigned=Proposal %s has been closed signed.
-EMailTextOrderValidated=Order %s has been validated.
-EMailTextOrderApproved=Order %s has been approved.
-EMailTextOrderValidatedBy=Order %s has been recorded by %s.
-EMailTextOrderApprovedBy=Order %s has been approved by %s.
-EMailTextOrderRefused=Order %s has been refused.
-EMailTextOrderRefusedBy=Order %s has been refused by %s.
-EMailTextExpeditionValidated=Shipping %s has been validated.
-EMailTextExpenseReportValidated=Expense report %s has been validated.
-EMailTextExpenseReportApproved=Expense report %s has been approved.
-EMailTextHolidayValidated=Leave request %s has been validated.
-EMailTextHolidayApproved=Leave request %s has been approved.
-ImportedWithSet=輸入數據集
+NumberOfCustomerOrders=銷售訂單數量
+NumberOfCustomerInvoices=客戶發票數量
+NumberOfSupplierProposals=供應商提案/建議書數量
+NumberOfSupplierOrders=採購訂單數量
+NumberOfSupplierInvoices=供應商發票數量
+NumberOfContracts=合約數量
+NumberOfUnitsProposals=提案/建議書中的單位數量
+NumberOfUnitsCustomerOrders=銷售訂單中的單位數量
+NumberOfUnitsCustomerInvoices=客戶發票中的單位數量
+NumberOfUnitsSupplierProposals=供應商提案中的單位數量
+NumberOfUnitsSupplierOrders=採購訂單中的單位數量
+NumberOfUnitsSupplierInvoices=供應商發票上的單位數量
+NumberOfUnitsContracts=合約中的單位數量
+EMailTextInterventionAddedContact=一個新的干預%s已分配給您。
+EMailTextInterventionValidated=干預%s已被驗證。
+EMailTextInvoiceValidated=發票%s已通過驗證。
+EMailTextInvoicePayed=發票%s已支付。
+EMailTextProposalValidated=提案/建議書%s已通過驗證。
+EMailTextProposalClosedSigned=提案/建議書%s已關閉簽名。
+EMailTextOrderValidated=訂單%s已通過驗證。
+EMailTextOrderApproved=訂單%s已被批准。
+EMailTextOrderValidatedBy=訂單%s已被%s記錄。
+EMailTextOrderApprovedBy=訂單%s已被%s批准。
+EMailTextOrderRefused=訂單%s已被拒絕。
+EMailTextOrderRefusedBy=訂單%s已被%s拒絕。
+EMailTextExpeditionValidated=發貨%s已通過驗證。
+EMailTextExpenseReportValidated=費用報告%s已通過驗證。
+EMailTextExpenseReportApproved=費用報告%s已批准。
+EMailTextHolidayValidated=休假申請%s已通過驗證。
+EMailTextHolidayApproved=休假申請%s已被批准。
+ImportedWithSet=匯入資料集
DolibarrNotification=自動通知
-ResizeDesc=輸入新的高度新的寬度或 。比率將維持在調整大小...
+ResizeDesc=輸入新的寬度或 新的高度。調整大小時將維持長寬比率...
NewLength=新寬度
NewHeight=新高度
-NewSizeAfterCropping=裁剪後的新尺寸
-DefineNewAreaToPick=定義圖像的新領域挑選(圖像左側單擊然後拖動,直到到達對面角落)
-CurrentInformationOnImage=This tool was designed to help you to resize or crop an image. This is the information on the current edited image
-ImageEditor=圖像編輯器
-YouReceiveMailBecauseOfNotification=您收到此消息,因為您的電子郵件已被添加到列表的目標是特定的事件通知到%%s的軟件第
-YouReceiveMailBecauseOfNotification2=此事件是:
-ThisIsListOfModules=這是一個模塊,此演示配置文件(只有最常見的模塊在此演示中看到)預選名單。編輯本有一個更個性化的演示,並點擊“開始”。
-UseAdvancedPerms=一些模塊使用先進的權限
-FileFormat=文件格式
+NewSizeAfterCropping=剪裁後的新尺寸
+DefineNewAreaToPick=在圖片上定義要選擇的新區域(在圖片上點擊滑鼠左鍵然後拖動直到到達對角)
+CurrentInformationOnImage=此工具被設計來幫助您調整圖片大小或裁剪圖片。這是有關目前編輯圖片的資訊
+ImageEditor=圖片編輯器
+YouReceiveMailBecauseOfNotification=之所以您會收到此訊息,是因為您的電子郵件已被加入到目標清單中,以便將特定事件通知到%s的%s軟體中。
+YouReceiveMailBecauseOfNotification2=此事件如下:
+ThisIsListOfModules=這是此DEMO設定檔案預選的模組清單(此demo中僅可看到最常用的模組)。編輯它以具有更個性化的展示,然後點擊“開始”。
+UseAdvancedPerms=使用某些模組的進階權限
+FileFormat=檔案格式
SelectAColor=選擇一種顏色
-AddFiles=添加文件
+AddFiles=增加檔案
StartUpload=開始上傳
CancelUpload=取消上傳
-FileIsTooBig=文件過大
+FileIsTooBig=檔案過大
PleaseBePatient=請耐心等待...
-NewPassword=New password
-ResetPassword=Reset password
-RequestToResetPasswordReceived=A request to change your password has been received.
-NewKeyIs=This is your new keys to login
-NewKeyWillBe=Your new key to login to software will be
-ClickHereToGoTo=Click here to go to %s
-YouMustClickToChange=You must however first click on the following link to validate this password change
-ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
-IfAmountHigherThan=If amount higher than %s
-SourcesRepository=Repository for sources
-Chart=Chart
-PassEncoding=Password encoding
-PermissionsAdd=Permissions added
-PermissionsDelete=Permissions removed
-YourPasswordMustHaveAtLeastXChars=Your password must have at least %s chars
-YourPasswordHasBeenReset=Your password has been reset successfully
-ApplicantIpAddress=IP address of applicant
-SMSSentTo=SMS sent to %s
-MissingIds=Missing ids
-ThirdPartyCreatedByEmailCollector=Third party created by email collector from email MSGID %s
-ContactCreatedByEmailCollector=Contact/address created by email collector from email MSGID %s
-ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
-TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
-OpeningHoursFormatDesc=Use a - to separate opening and closing hours.
Use a space to enter different ranges.
Example: 8-12 14-18
+NewPassword=新密碼
+ResetPassword=重置密碼
+RequestToResetPasswordReceived=已收到更改密碼的請求。
+NewKeyIs=這是您的新登入密碼
+NewKeyWillBe=您用於登入軟體的新密鑰將為
+ClickHereToGoTo=點擊這裡前往%s
+YouMustClickToChange=您必須先點擊以下連結驗證此密碼更改
+ForgetIfNothing=如果您沒有請求此更改,請忽略此電子郵件。您的憑證仍保持安全狀態。
+IfAmountHigherThan=如果金額高於 %s
+SourcesRepository=資料庫
+Chart=圖表
+PassEncoding=密碼編碼
+PermissionsAdd=權限已增加
+PermissionsDelete=權限已刪除
+YourPasswordMustHaveAtLeastXChars=您的密碼必須至少具有 %s 字元
+YourPasswordHasBeenReset=您的密碼已成功重置
+ApplicantIpAddress=申請人的IP位址
+SMSSentTo=簡訊已傳送至%s
+MissingIds=缺少ID
+ThirdPartyCreatedByEmailCollector=電子郵件收集器從電子郵件MSGID %s建立的合作方
+ContactCreatedByEmailCollector=電子郵件收集器從電子郵件MSGID %s建立的聯絡人/地址
+ProjectCreatedByEmailCollector=電子郵件收集器從電子郵件MSGID %s建立的專案
+TicketCreatedByEmailCollector=電子郵件收集器從電子郵件MSGID %s建立的服務單
+OpeningHoursFormatDesc=使用-分隔營業開始時間和營業結束時間。
使用空格輸入不同的範圍。
範例:8-12 14-18
##### Export #####
ExportsArea=出口地區
-AvailableFormats=可用的格式
+AvailableFormats=可用格式
LibraryUsed=使用的程式庫
-LibraryVersion=Library version
+LibraryVersion=程式庫版本
ExportableDatas=可匯出的資料
-NoExportableData=沒有可匯出的資料(導出加載的數據,或丟失的權限沒有模塊)
+NoExportableData=沒有可匯出的資料(沒有已載入可匯出資料的模組, 或沒有權限)
##### External sites #####
WebsiteSetup=網站模組設定
-WEBSITE_PAGEURL=URL of page
+WEBSITE_PAGEURL=頁面網址
WEBSITE_TITLE=標題
-WEBSITE_DESCRIPTION=廠商品號/品名/商品描述
-WEBSITE_IMAGE=Image
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
-WEBSITE_KEYWORDS=Keywords
-LinesToImport=Lines to import
+WEBSITE_DESCRIPTION=描述
+WEBSITE_IMAGE=圖片
+WEBSITE_IMAGEDesc=影像媒體的相對路徑。您可以將其保留為空,因為它很少使用(動態內容可以使用它在部落格文章清單中顯示縮圖)。如果路徑取決於網站名稱,請在路徑中使用__WEBSITEKEY__。
+WEBSITE_KEYWORDS=關鍵字
+LinesToImport=要匯入的行
-MemoryUsage=Memory usage
-RequestDuration=Duration of request
+MemoryUsage=記憶體使用率
+RequestDuration=請求期限
diff --git a/htdocs/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang
index 927560578bc..cefac44bf5c 100644
--- a/htdocs/langs/zh_TW/projects.lang
+++ b/htdocs/langs/zh_TW/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=專案標籤
ProjectsArea=專案區域
ProjectStatus=專案狀態
SharedProject=每一位
-PrivateProject=專案通訊錄
+PrivateProject=專案聯絡人
ProjectsImContactFor=我的確是聯絡人專案
AllAllowedProjects=我可以讀取的所有專案(我的+公共項目)
AllProjects=所有專案
@@ -77,7 +77,7 @@ MyProjectsArea=專案區
DurationEffective=有效期限
ProgressDeclared=進度宣布
TaskProgressSummary=任務進度
-CurentlyOpenedTasks=目前的開放任務
+CurentlyOpenedTasks=目前的打開任務
TheReportedProgressIsLessThanTheCalculatedProgressionByX=預計進度比計算的進度少%s
TheReportedProgressIsMoreThanTheCalculatedProgressionByX=預計進度比計算的進度多%s
ProgressCalculated=進度計算
@@ -99,159 +99,163 @@ ListContractAssociatedProject=與專案相關的合約清單
ListShippingAssociatedProject=與專案相關的運送清單
ListFichinterAssociatedProject=與專案相關的干預措施清單
ListExpenseReportsAssociatedProject=與專案相關的費用報告清單
-ListDonationsAssociatedProject=List of donations related to the project
-ListVariousPaymentsAssociatedProject=List of miscellaneous payments related to the project
-ListSalariesAssociatedProject=List of payments of salaries related to the project
-ListActionsAssociatedProject=List of events related to the project
-ListTaskTimeUserProject=List of time consumed on tasks of project
-ListTaskTimeForTask=List of time consumed on task
-ActivityOnProjectToday=Activity on project today
-ActivityOnProjectYesterday=Activity on project yesterday
-ActivityOnProjectThisWeek=對項目活動周
-ActivityOnProjectThisMonth=本月初對項目活動
-ActivityOnProjectThisYear=今年對項目活動
-ChildOfProjectTask=專案/任務的子項
-ChildOfTask=任務的子項
-TaskHasChild=任務有子項任務
-NotOwnerOfProject=不是所有者的私人項目
-AffectedTo=受影響
-CantRemoveProject=這個項目不能刪除,因為它是由一些(其他對象引用的發票,訂單或其他)。見參照資訊標簽。
+ListDonationsAssociatedProject=與專案相關的捐款清單
+ListVariousPaymentsAssociatedProject=與專案相關的雜項付款清單
+ListSalariesAssociatedProject=與專案相關的工資支付清單
+ListActionsAssociatedProject=與專案相關的事件清單
+ListTaskTimeUserProject=專案的花費時間清單
+ListTaskTimeForTask=任務花費時間清單
+ActivityOnProjectToday=今天的專案活動
+ActivityOnProjectYesterday=昨天的專案活動
+ActivityOnProjectThisWeek=這週的專案活動
+ActivityOnProjectThisMonth=本月的專案活動
+ActivityOnProjectThisYear=今年的專案活動
+ChildOfProjectTask=專案/任務的子項目
+ChildOfTask=任務的子項目
+TaskHasChild=任務有子任務
+NotOwnerOfProject=不是此私人專案的所有者
+AffectedTo=分配給
+CantRemoveProject=這個專案不能刪除,因為它是由一些(其他項目引用的發票,訂單或其他)。請參照參考分頁。
ValidateProject=驗證專案
-ConfirmValidateProject=Are you sure you want to validate this project?
-CloseAProject=結束專案
-ConfirmCloseAProject=您確定要結束此專案?
-AlsoCloseAProject=也含已結專案(若您仍需要在此中專案中跟追產品任務,請持續開放)
-ReOpenAProject=打開的項目
-ConfirmReOpenAProject=Are you sure you want to re-open this project?
-ProjectContact=項目聯系人
-TaskContact=Task contacts
-ActionsOnProject=行動項目
-YouAreNotContactOfProject=你是不是這個私人項目聯系
-UserIsNotContactOfProject=User is not a contact of this private project
-DeleteATimeSpent=刪除的時間
-ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
-DoNotShowMyTasksOnly=See also tasks not assigned to me
-ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Contacts of task
-ProjectsDedicatedToThisThirdParty=致力於該合作方的項目
-NoTasks=該項目沒有任務
-LinkedToAnotherCompany=鏈接到其他合作方
-TaskIsNotAssignedToUser=Task not assigned to user. Use button '%s' to assign task now.
-ErrorTimeSpentIsEmpty=所花費的時間是空的
-ThisWillAlsoRemoveTasks=這一行動也將刪除所有項目任務(%s任務的時刻),花全部的時間都投入。
-IfNeedToUseOtherObjectKeepEmpty=如果某些對象(發票,訂單,...),屬於其他第三方,必須與該項目以創建,保持這個空項目多的第三方。
-CloneTasks=Clone tasks
-CloneContacts=Clone contacts
-CloneNotes=Clone notes
-CloneProjectFiles=Clone project joined files
-CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
-CloneMoveDate=Update project/tasks dates from now?
-ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task dates according to new project start date
-ErrorShiftTaskDate=Impossible to shift task date according to new project start date
-ProjectsAndTasksLines=Projects and tasks
+ConfirmValidateProject=您確定要驗證此專案嗎?
+CloseAProject=關閉專案
+ConfirmCloseAProject=您確定要關閉此專案?
+AlsoCloseAProject=同時關閉專案(如果仍然需要執行生產任務,請保持打開狀態)
+ReOpenAProject=打開的專案
+ConfirmReOpenAProject=您確定要重新打開此專案嗎?
+ProjectContact=專案聯絡人
+TaskContact=任務聯絡人
+ActionsOnProject=專案事件
+YouAreNotContactOfProject=你是不是這個私人專案的聯絡人
+UserIsNotContactOfProject=用戶不是此私人專案的聯絡人
+DeleteATimeSpent=刪除花費的時間
+ConfirmDeleteATimeSpent=您確定要刪除此花費的時間嗎?
+DoNotShowMyTasksOnly=另請參閱未分配給我的任務
+ShowMyTasksOnly=查看僅分配給我的任務
+TaskRessourceLinks=任務聯絡人
+ProjectsDedicatedToThisThirdParty=此合作方的專案
+NoTasks=此專案沒有任務
+LinkedToAnotherCompany=連結到其他合作方
+TaskIsNotAssignedToUser=任務未分配給用戶。現在使用按鈕'%s'分配任務。
+ErrorTimeSpentIsEmpty=花費的時間是空的
+ThisWillAlsoRemoveTasks=此操作將刪除專案(此刻%s任務)的所有任務和所有輸入的花費時間。
+IfNeedToUseOtherObjectKeepEmpty=如果必須將屬於另一個合作方的某些項目(發票,訂單等)連結到要建立的專案,請將該欄位保留為空白以使此專案為多個合作方。
+CloneTasks=複製任務
+CloneContacts=複製聯絡人
+CloneNotes=複製註記
+CloneProjectFiles=複製專案連結檔案
+CloneTaskFiles=複製任務連結檔案(如果已複製任務)
+CloneMoveDate=從現在開始更新專案/任務日期?
+ConfirmCloneProject=您確定要複製此專案嗎?
+ProjectReportDate=根據新專案的開始日期更改任務日期
+ErrorShiftTaskDate=不可能根據新專案的開始日期更改任務日期
+ProjectsAndTasksLines=專案與任務
ProjectCreatedInDolibarr=專案 %s 已建立
-ProjectValidatedInDolibarr=Project %s validated
+ProjectValidatedInDolibarr=專案%s已驗證
ProjectModifiedInDolibarr=專案 %s 已修改
-TaskCreatedInDolibarr=Task %s created
-TaskModifiedInDolibarr=Task %s modified
-TaskDeletedInDolibarr=Task %s deleted
-OpportunityStatus=Lead status
-OpportunityStatusShort=Lead status
-OpportunityProbability=Lead probability
-OpportunityProbabilityShort=Lead probab.
-OpportunityAmount=Lead amount
-OpportunityAmountShort=Lead amount
-OpportunityAmountAverageShort=Average lead amount
-OpportunityAmountWeigthedShort=Weighted lead amount
-WonLostExcluded=Won/Lost excluded
+TaskCreatedInDolibarr=任務%s已建立
+TaskModifiedInDolibarr=任務%s已修改
+TaskDeletedInDolibarr=任務%s已刪除
+OpportunityStatus=潛在狀態
+OpportunityStatusShort=潛在狀態
+OpportunityProbability=潛在可能性
+OpportunityProbabilityShort=潛在機率。
+OpportunityAmount=潛在金額
+OpportunityAmountShort=潛在金額
+OpportunityAmountAverageShort=平均潛在金額
+OpportunityAmountWeigthedShort=加權潛在金額
+WonLostExcluded=不包含已獲得/遺失
##### Types de contacts #####
-TypeContact_project_internal_PROJECTLEADER=專案負責人
-TypeContact_project_external_PROJECTLEADER=專案負責人
-TypeContact_project_internal_PROJECTCONTRIBUTOR=投稿
-TypeContact_project_external_PROJECTCONTRIBUTOR=投稿
+TypeContact_project_internal_PROJECTLEADER=內部專案負責人
+TypeContact_project_external_PROJECTLEADER=外部專案負責人
+TypeContact_project_internal_PROJECTCONTRIBUTOR=內部提案人
+TypeContact_project_external_PROJECTCONTRIBUTOR=外部提案人
TypeContact_project_task_internal_TASKEXECUTIVE=執行任務
TypeContact_project_task_external_TASKEXECUTIVE=執行任務
-TypeContact_project_task_internal_TASKCONTRIBUTOR=投稿
-TypeContact_project_task_external_TASKCONTRIBUTOR=投稿
-SelectElement=Select element
-AddElement=Link to element
+TypeContact_project_task_internal_TASKCONTRIBUTOR=內部提案人
+TypeContact_project_task_external_TASKCONTRIBUTOR=外部提案人
+SelectElement=選擇元件
+AddElement=連結到元件
# Documents models
-DocumentModelBeluga=連結專案概述的文件範本
+DocumentModelBeluga=已連結項目概述的專案文件範本
DocumentModelBaleine=任務的專案文件範本
DocumentModelTimeSpent=花費時間的專案報告範本
-PlannedWorkload=Planned workload
-PlannedWorkloadShort=Workload
+PlannedWorkload=計劃的工作量
+PlannedWorkloadShort=工作量
ProjectReferers=相關項目
-ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
-InputPerDay=Input per day
-InputPerWeek=Input per week
-InputDetail=Input detail
-TimeAlreadyRecorded=This is 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
-ResourceNotAssignedToTheTask=Not assigned to the task
-NoUserAssignedToTheProject=No users assigned to this project
-TimeSpentBy=Time spent by
-TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
-AssignTaskToUser=Assign task to %s
-SelectTaskToAssign=Select task to assign...
-AssignTask=Assign
-ProjectOverview=Overview
-ManageTasks=Use projects to follow tasks and/or report time spent (timesheets)
-ManageOpportunitiesStatus=專案用於以下潛在/有機會的客戶
-ProjectNbProjectByMonth=No. of created projects by month
-ProjectNbTaskByMonth=No. of created tasks by month
-ProjectOppAmountOfProjectsByMonth=Amount of leads by month
-ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=專案/潛在客戶的統計
+ProjectMustBeValidatedFirst=必須先驗證專案
+FirstAddRessourceToAllocateTime=為任務分配用戶資源以分配時間
+InputPerDay=每天輸入
+InputPerWeek=每週輸入
+InputDetail=輸入詳細訊息
+TimeAlreadyRecorded=這是為此任務/天和用戶%s已經記錄的花費時間
+ProjectsWithThisUserAsContact=與此用戶聯絡人的專案
+TasksWithThisUserAsContact=分配給此用戶的任務
+ResourceNotAssignedToProject=未分配給專案
+ResourceNotAssignedToTheTask=未分配給任務
+NoUserAssignedToTheProject=沒有分配給此專案的用戶
+TimeSpentBy=花費時間者
+TasksAssignedTo=任務分配給
+AssignTaskToMe=分配任務給我
+AssignTaskToUser=將任務分配給%s
+SelectTaskToAssign=選擇要分配的任務...
+AssignTask=分配
+ProjectOverview=總覽
+ManageTasks=使用專案來追踪任務和/或報告所花費的時間(時間表)
+ManageOpportunitiesStatus=使用專案來追蹤潛在/機會
+ProjectNbProjectByMonth=每月建立的專案數
+ProjectNbTaskByMonth=每月建立的任務數
+ProjectOppAmountOfProjectsByMonth=每月的潛在客戶數量
+ProjectWeightedOppAmountOfProjectsByMonth=每月加權的潛在客戶數量
+ProjectOpenedProjectByOppStatus=依照潛在狀態打開專案/ 潛在
+ProjectsStatistics=專案/潛在客戶統計
TasksStatistics=專案/潛在客戶任務的統計
-TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
-IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
-OpenedProjectsByThirdparties=Open projects by third parties
-OnlyOpportunitiesShort=Only leads
-OpenedOpportunitiesShort=Open leads
-NotOpenedOpportunitiesShort=Not an open lead
-NotAnOpportunityShort=Not a lead
-OpportunityTotalAmount=Total amount of leads
-OpportunityPonderatedAmount=Weighted amount of leads
-OpportunityPonderatedAmountDesc=Leads amount weighted with probability
+TaskAssignedToEnterTime=任務已分配。應該可以輸入此任務的時間。
+IdTaskTime=任務時間ID
+YouCanCompleteRef=如果要使用一些後綴來完成引用,則建議增加-字元以將其分隔,因此自動編號仍可正確用於下一個專案。例如%s-MYSUFFIX
+OpenedProjectsByThirdparties=開啟合作方專案
+OnlyOpportunitiesShort=僅潛在機會
+OpenedOpportunitiesShort=開啟潛在機會
+NotOpenedOpportunitiesShort=不是打開的潛在機會
+NotAnOpportunityShort=不是潛在機會
+OpportunityTotalAmount=潛在機會總數量
+OpportunityPonderatedAmount=權重潛在機會數量
+OpportunityPonderatedAmountDesc=潛在機會數量加權機率
OppStatusPROSP=潛在機會
-OppStatusQUAL=Qualification
+OppStatusQUAL=符合資格條件
OppStatusPROPO=提案/建議書
-OppStatusNEGO=Negociation
+OppStatusNEGO=談判交涉
OppStatusPENDING=待辦中
-OppStatusWON=Won
-OppStatusLOST=Lost
-Budget=Budget
-AllowToLinkFromOtherCompany=Allow to link project from other company
Supported values:
- Keep empty: Can link any project of the company (default)
- "all": Can link any projects, even projects of other companies
- A list of third-party ids separated by commas: can link all projects of these third partys (Example: 123,4795,53)
-LatestProjects=Latest %s projects
-LatestModifiedProjects=Latest %s modified projects
-OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks found (assign project/tasks to the current user from the top select box to enter time on it)
-ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
+OppStatusWON=獲得
+OppStatusLOST=失去
+Budget=預算
+AllowToLinkFromOtherCompany=允許連結其他公司的專案
支援的值:
-保留為空:可以連結公司的任何專案(預設)
-“全部”:可以連結任何專案,甚至其他公司的專案
-用逗號分隔的合作方ID清單:可以連結這些合作方的所有專案(例如:123,4795,53)
+LatestProjects=最新%s的專案
+LatestModifiedProjects=最新%s件修改專案
+OtherFilteredTasks=其他過濾任務
+NoAssignedTasks=找不到分配的任務(從頂部選擇框向目前用戶分配專案/任務以輸入時間)
+ThirdPartyRequiredToGenerateInvoice=必須在專案上定義合作方才能開立發票。
# Comments trans
-AllowCommentOnTask=Allow user comments on tasks
-AllowCommentOnProject=Allow user comments on projects
-DontHavePermissionForCloseProject=You do not have permissions to close the project %s
-DontHaveTheValidateStatus=The project %s must be open to be closed
-RecordsClosed=%s project(s) closed
-SendProjectRef=Information project %s
-ModuleSalaryToDefineHourlyRateMustBeEnabled=Module 'Salaries' must be enabled to define employee hourly rate to have time spent valorized
-NewTaskRefSuggested=Task ref already used, a new task ref is required
-TimeSpentInvoiced=Time spent billed
-TimeSpentForInvoice=所花費的時間
-OneLinePerUser=One line per user
-ServiceToUseOnLines=Service to use on lines
-InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets).
-ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks
-UsageOpportunity=Usage: Opportunity
-UsageTasks=Usage: Tasks
-UsageBillTimeShort=使用:帳單時間
+AllowCommentOnTask=允許用戶對任務發表評論
+AllowCommentOnProject=允許用戶對專案發表評論
+DontHavePermissionForCloseProject=您沒有關閉專案%s的權限
+DontHaveTheValidateStatus=必須打開專案%s才能將其關閉
+RecordsClosed=%s專案已關閉
+SendProjectRef=專案%s的資訊
+ModuleSalaryToDefineHourlyRateMustBeEnabled=必須啟用“工資”模組來定義員工的每小時工資,以使所花費的時間保持平衡
+NewTaskRefSuggested=任務參考已使用,需要新的任務參考
+TimeSpentInvoiced=花費時間已計費
+TimeSpentForInvoice=花費時間
+OneLinePerUser=每位用戶一行
+ServiceToUseOnLines=行上使用的服務
+InvoiceGeneratedFromTimeSpent=根據專案花費的時間產生了發票%s
+ProjectBillTimeDescription=請勾選如果您輸入了有關專案任務的時間表,並計劃從此時間表中產生發票以向此專案的客戶開立帳單(不要勾選如果您打算建立不基於輸入時間表的發票)。注意:要產生發票,請前往專案的“花費時間”分頁上,並選擇要包括的行。
+ProjectFollowOpportunity=追蹤機會
+ProjectFollowTasks=追蹤任務
+UsageOpportunity=用法:機會
+UsageTasks=用法:任務
+UsageBillTimeShort=用法:帳單時間
+InvoiceToUse=發票草稿
+NewInvoice=新發票
+OneLinePerTask=每個任務一行
+OneLinePerPeriod=每個週期一行
diff --git a/htdocs/langs/zh_TW/propal.lang b/htdocs/langs/zh_TW/propal.lang
index f5311b13cd8..bd722968a43 100644
--- a/htdocs/langs/zh_TW/propal.lang
+++ b/htdocs/langs/zh_TW/propal.lang
@@ -28,7 +28,7 @@ ShowPropal=顯示提案/建議書
PropalsDraft=草稿
PropalsOpened=開放
PropalStatusDraft=草案(等待驗證)
-PropalStatusValidated=驗證(提案/建議書已開放)
+PropalStatusValidated=驗證(建議打開)
PropalStatusSigned=簽名(需要收費)
PropalStatusNotSigned=不簽署(非公開)
PropalStatusBilled=已開票
@@ -76,8 +76,8 @@ TypeContact_propal_external_BILLING=客戶發票聯絡人
TypeContact_propal_external_CUSTOMER=後續提案/建議書的客戶聯絡人
TypeContact_propal_external_SHIPPING=客戶交貨聯絡人
# Document models
-DocModelAzurDescription=一個完整的提案/建議書模型(logo. ..)
-DocModelCyanDescription=一個完整的提案/建議書模型(logo. ..)
+DocModelAzurDescription=A complete proposal model
+DocModelCyanDescription=A complete proposal model
DefaultModelPropalCreate=預設模型建立
DefaultModelPropalToBill=當關閉企業提案/建議書時使用的預設範本(開立發票)
DefaultModelPropalClosed=當關閉企業提案/建議書時使用的預設範本(未開票)
diff --git a/htdocs/langs/zh_TW/stocks.lang b/htdocs/langs/zh_TW/stocks.lang
index 66d3188a618..9d95c3de609 100644
--- a/htdocs/langs/zh_TW/stocks.lang
+++ b/htdocs/langs/zh_TW/stocks.lang
@@ -143,6 +143,7 @@ InventoryCode=移動或庫存代碼
IsInPackage=包含在包裝中
WarehouseAllowNegativeTransfer=庫存可為負值
qtyToTranferIsNotEnough=您的來源倉庫中沒有足夠的庫存,並且您的設定不允許出現負值庫存。
+qtyToTranferLotIsNotEnough=您的原始倉庫中沒有足夠的此批號庫存,並且您的設定不允許出現負庫存(在倉庫'%s'中批號為'%s'的產品'%s'數量為%s)。
ShowWarehouse=顯示倉庫
MovementCorrectStock=產品%s的庫存更正
MovementTransferStock=將產品%s庫存轉移到另一個倉庫
@@ -192,6 +193,7 @@ TheoricalQty=理論數量
TheoricalValue=理論數量
LastPA=最新BP
CurrentPA=目前BP
+RecordedQty=Recorded Qty
RealQty=實際數量
RealValue=實際價值
RegulatedQty=調整數量
diff --git a/htdocs/langs/zh_TW/stripe.lang b/htdocs/langs/zh_TW/stripe.lang
index 48eb8c3517d..c8f6da33455 100644
--- a/htdocs/langs/zh_TW/stripe.lang
+++ b/htdocs/langs/zh_TW/stripe.lang
@@ -1,70 +1,70 @@
# Dolibarr language file - Source file is en_US - stripe
-StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via Stripe. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
-StripeOrCBDoPayment=Pay with credit card or Stripe
-FollowingUrlAreAvailableToMakePayments=以下網址可提供給客戶的網頁上,能夠作出Dolibarr支付對象
-PaymentForm=付款方式
-WelcomeOnPaymentPage=歡迎使用我們的在線支付服務
-ThisScreenAllowsYouToPay=這個屏幕允許你進行網上支付%s。
-ThisIsInformationOnPayment=這是在做付款信息
-ToComplete=要完成
-YourEMail=付款確認的電子郵件
-STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
+StripeSetup=Stripe模組設定
+StripeDesc=通過 Stripe 為客戶提供一個Stripe線上支付頁面,以使用信用卡/簽帳卡付款。這可允許您的客戶進行臨時付款或用於與特定Dolibarr項目(發票,訂單等)有關的付款。
+StripeOrCBDoPayment=用信用卡或Stripe付款
+FollowingUrlAreAvailableToMakePayments=以下網址可用於向客戶提供頁面以對Dolibarr項目進行付款
+PaymentForm=付款表單
+WelcomeOnPaymentPage=歡迎使用我們的線上支付服務
+ThisScreenAllowsYouToPay=這個畫面允許你進行線上支付到%s。
+ThisIsInformationOnPayment=這是關於付款的資訊
+ToComplete=完成
+YourEMail=接收付款確認的電子郵件
+STRIPE_PAYONLINE_SENDEMAIL=付款後的電子郵件通知(成功或失敗)
Creditor=債權人
PaymentCode=付款代碼
-StripeDoPayment=Pay with Stripe
-YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
-Continue=未來
-ToOfferALinkForOnlinePayment=網址為%s支付
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment page for a sales order
-ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment page for a customer invoice
-ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment page for a contract line
-ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment page of any amount with no existing object
-ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment page for a member subscription
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment page for payment of a donation
-YouCanAddTagOnUrl=You can also add url parameter &tag=value to any of those URL (mandatory only for payment not linked to an object) to add your own payment comment tag.
For the URL of payments with no existing object, you may also add the parameter &noidempotency=1 so the same link with same tag can be used several times (some payment mode may limit the payment to 1 for each different link without this parameter)
-SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url %s to have payment created automatically when validated by Stripe.
+StripeDoPayment=用Stripe付款
+YouWillBeRedirectedOnStripe=您將在“Stripe”頁面上重新轉向以輸入您的信用卡資訊
+Continue=下一步
+ToOfferALinkForOnlinePayment=%s付款的網址
+ToOfferALinkForOnlinePaymentOnOrder=提供%s銷售訂單線上支付頁面的網址
+ToOfferALinkForOnlinePaymentOnInvoice=提供%s客戶發票線上支付頁面的網址
+ToOfferALinkForOnlinePaymentOnContractLine=提供%s合約行線上支付頁面的網址
+ToOfferALinkForOnlinePaymentOnFreeAmount=提供%s沒有現有項目的任意金額線上支付頁面網址
+ToOfferALinkForOnlinePaymentOnMemberSubscription=提供%s會員訂閱線上支付頁面的網址
+ToOfferALinkForOnlinePaymentOnDonation=提供%s捐款支付的線上支付頁面網址
+YouCanAddTagOnUrl=您還可以將網址參數&tag=value 加到任何這些網址中(僅對於未連結到項目的付款有強制性),以增加您自己的付款註釋標籤。
對於沒有現有項目的支付網址,您還可以增加參數&noidempotency=1,因此具有相同標籤的同一連結可以多次使用(某些付款方式可能會將每個沒有這個參數的不同連結支付限制為1)
+SetupStripeToHavePaymentCreatedAutomatically=使用網址 %s 設定您的Stripe,以便在Stripe驗證後自動建立付款。
AccountParameter=帳戶參數
UsageParameter=使用參數
-InformationToFindParameters=幫助,找到你的%s帳戶信息
-STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
+InformationToFindParameters=尋找您%s帳戶資訊的幫助
+STRIPE_CGI_URL_V2=Stripe CGI模組的付款網址
VendorName=供應商名稱
-CSSUrlForPaymentForm=付款方式的CSS樣式表的URL
-NewStripePaymentReceived=New Stripe payment received
-NewStripePaymentFailed=New Stripe payment tried but failed
-STRIPE_TEST_SECRET_KEY=Secret test key
-STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
-STRIPE_TEST_WEBHOOK_KEY=Webhook test key
-STRIPE_LIVE_SECRET_KEY=Secret live key
-STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
-STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
-ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done
(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
-StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
-StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
-StripeGateways=Stripe gateways
-OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
-OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
-BankAccountForBankTransfer=Bank account for fund payouts
-StripeAccount=Stripe account
-StripeChargeList=List of Stripe charges
-StripeTransactionList=List of Stripe transactions
-StripeCustomerId=Stripe customer id
-StripePaymentModes=Stripe payment modes
-LocalID=Local ID
+CSSUrlForPaymentForm=CSS樣式付款表單網址
+NewStripePaymentReceived=收到新的Stripe付款
+NewStripePaymentFailed=已嘗試新的Stripe付款但失敗
+STRIPE_TEST_SECRET_KEY=秘密測試金鑰
+STRIPE_TEST_PUBLISHABLE_KEY=可發布的測試金鑰
+STRIPE_TEST_WEBHOOK_KEY=Webhook測試金鑰
+STRIPE_LIVE_SECRET_KEY=秘密live金鑰
+STRIPE_LIVE_PUBLISHABLE_KEY=可發布的live金鑰
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live金鑰
+ONLINE_PAYMENT_WAREHOUSE=完成線上支付時用於減少庫存的庫存
(待辦事項 如果針對發票操作完成了減少庫存的選項,在線支付也同時產生發票?)
+StripeLiveEnabled=啟用Stripe live模式(否則為測試/沙盒模式)
+StripeImportPayment=匯入Stripe付款
+ExampleOfTestCreditCard=用於信用卡測試的範例:%s =>有效,%s =>錯誤CVC,%s =>已過期,%s =>加值失敗
+StripeGateways=Stripe閘道
+OAUTH_STRIPE_TEST_ID=Stripe Connect客戶端ID(ca _...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect客戶端ID(ca _...)
+BankAccountForBankTransfer=銀行帳戶中的資金支出
+StripeAccount=Stripe帳戶
+StripeChargeList=Stripe加值清單
+StripeTransactionList=Stripe交易清單
+StripeCustomerId=Stripe客戶編號
+StripePaymentModes=Stripe付款方式
+LocalID=本地ID
StripeID=Stripe ID
-NameOnCard=Name on card
-CardNumber=Card Number
-ExpiryDate=Expiry Date
+NameOnCard=卡片上的名字
+CardNumber=卡片號碼
+ExpiryDate=到期日
CVN=CVN
-DeleteACard=Delete Card
-ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
-CreateCustomerOnStripe=Create customer on Stripe
-CreateCardOnStripe=Create card on Stripe
-ShowInStripe=Show in Stripe
-StripeUserAccountForActions=User account to use for email notification of some Stripe events (Stripe payouts)
-StripePayoutList=List of Stripe payouts
-ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mode)
-ToOfferALinkForLiveWebhook=Link to setup Stripe WebHook to call the IPN (live mode)
-PaymentWillBeRecordedForNextPeriod=Payment will be recorded for the next period.
-ClickHereToTryAgain=Click here to try again...
+DeleteACard=刪除卡片
+ConfirmDeleteCard=您確定要刪除此信用卡或金融信用卡嗎?
+CreateCustomerOnStripe=在Stripe上建立客戶
+CreateCardOnStripe=在Stripe上建立卡片
+ShowInStripe=在Stripe上顯示
+StripeUserAccountForActions=用於某些Stripe事件的電子郵件通知用戶帳戶(Stripe支出)
+StripePayoutList=Stripe支出清單
+ToOfferALinkForTestWebhook=連結到Stripe WebHook設定以呼叫IPN(測試模式)
+ToOfferALinkForLiveWebhook=連結到Stripe WebHook設定以呼叫IPN(live模式)
+PaymentWillBeRecordedForNextPeriod=付款將記錄在下一個期間。
+ClickHereToTryAgain=點擊此處重試...
diff --git a/htdocs/langs/zh_TW/supplier_proposal.lang b/htdocs/langs/zh_TW/supplier_proposal.lang
index df0ce225564..7bb87f2607e 100644
--- a/htdocs/langs/zh_TW/supplier_proposal.lang
+++ b/htdocs/langs/zh_TW/supplier_proposal.lang
@@ -32,7 +32,7 @@ SupplierProposalStatusValidatedShort=已驗證
SupplierProposalStatusClosedShort=已關閉
SupplierProposalStatusSignedShort=已接受
SupplierProposalStatusNotSignedShort=已拒絕
-CopyAskFrom=複製現有要求以新增價格要求
+CopyAskFrom=複製現有要求以建立價格要求
CreateEmptyAsk=新增空白的要求
ConfirmCloneAsk=您確定要複製價格請求%s嗎?
ConfirmReOpenAsk=您確定要重新打開價格請求%s嗎?
diff --git a/htdocs/langs/zh_TW/website.lang b/htdocs/langs/zh_TW/website.lang
index 80b43ddfc1b..e8dc9b98c3f 100644
--- a/htdocs/langs/zh_TW/website.lang
+++ b/htdocs/langs/zh_TW/website.lang
@@ -1,84 +1,84 @@
# Dolibarr language file - Source file is en_US - website
-Shortname=碼
-WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
-DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
-WEBSITE_TYPE_CONTAINER=Type of page/container
-WEBSITE_PAGE_EXAMPLE=Web page to use as example
-WEBSITE_PAGENAME=Page name/alias
-WEBSITE_ALIASALT=Alternative page names/aliases
-WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:
alternativename1, alternativename2, ...
-WEBSITE_CSS_URL=URL of external CSS file
-WEBSITE_CSS_INLINE=CSS file content (common to all pages)
-WEBSITE_JS_INLINE=Javascript file content (common to all pages)
-WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
-WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Website .htaccess file
-WEBSITE_MANIFEST_JSON=Website manifest.json file
-WEBSITE_README=README.md file
-EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
-HtmlHeaderPage=HTML header (specific to this page only)
-PageNameAliasHelp=Name or alias of the page.
This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias.
-EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
-MediaFiles=Media library
-EditCss=Edit website properties
-EditMenu=Edit menu
-EditMedias=Edit medias
-EditPageMeta=Edit page/container properties
-EditInLine=Edit inline
-AddWebsite=Add website
-Webpage=Web page/container
-AddPage=Add page/container
-HomePage=Home Page
-PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'.
-RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
-SiteDeleted=Web site '%s' deleted
-PageContent=Page/Contenair
-PageDeleted=Page/Contenair '%s' of website %s deleted
-PageAdded=Page/Contenair '%s' added
-ViewSiteInNewTab=View site in new tab
-ViewPageInNewTab=View page in new tab
-SetAsHomePage=Set as Home page
-RealURL=Real URL
-ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=Use with Apache/NGinx/...
If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on
%s
then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
-YouCanAlsoTestWithPHPS=Use with PHP embedded server
On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running
php -S 0.0.0.0:8080 -t %s
+Shortname=代碼
+WebsiteSetupDesc=在此處建立您要使用的網站。然後進入選單網站進行編輯。
+DeleteWebsite=刪除網站
+ConfirmDeleteWebsite=您確定要刪除此網站嗎?其所有頁面和內容也將被刪除。上傳的文件(例如進入medias資料夾,ECM模組等)將保留。
+WEBSITE_TYPE_CONTAINER=頁面/容器的類型
+WEBSITE_PAGE_EXAMPLE=範本網頁
+WEBSITE_PAGENAME=頁面名稱/別名
+WEBSITE_ALIASALT=備用頁面名稱/別名
+WEBSITE_ALIASALTDesc=使用此處的其他名稱/別名清單,因此也可以使用此其他名稱/別名來訪問頁面(例如,重命名別名以使舊連結/名稱保持反向連結正常工作後的舊名稱)。語法是:
Alternativename1,Alternativename2,...
+WEBSITE_CSS_URL=外部CSS檔案的網址
+WEBSITE_CSS_INLINE=CSS檔案內容(所有頁面共有)
+WEBSITE_JS_INLINE=Javascript檔案內容(所有頁面共有)
+WEBSITE_HTML_HEADER=附加在HTML標頭底部(所有頁面共有)
+WEBSITE_ROBOT=Robot檔案(robots.txt)
+WEBSITE_HTACCESS=網站.htaccess檔案
+WEBSITE_MANIFEST_JSON=網站manifest.json檔案
+WEBSITE_README=README.md檔案
+EnterHereLicenseInformation=在此處輸入meta data或許可證資訊以填入README.md檔案。如果您以模板型式發佈網站,則檔案將包含在模板軟體包中。
+HtmlHeaderPage=HTML標頭(僅用於此頁面)
+PageNameAliasHelp=頁面的名稱或別名。
當從Web伺服器的虛擬主機(如Apacke,Nginx等)執行網站時,此別名還用於偽造SEO網址。使用按鈕“ %s ”編輯此別名。
+EditTheWebSiteForACommonHeader=注意:如果要為所有頁面定義個性化標題,請在網站級別而不是頁面/容器上編輯標題。
+MediaFiles=媒體庫
+EditCss=編輯網站屬性
+EditMenu=編輯選單
+EditMedias=編輯媒體
+EditPageMeta=編輯頁面/容器屬性
+EditInLine=編輯嵌入
+AddWebsite=新增網站
+Webpage=網頁/容器
+AddPage=增加頁面/容器
+HomePage=首頁
+PageContainer=頁面/容器
+PreviewOfSiteNotYetAvailable=您的網站%s預覽尚不可用。您必須先“ 導入完整的網站模板 ”或僅“ 新增頁面/容器 ”。
+RequestedPageHasNoContentYet=要求ID為%s的頁面尚無內容,或暫存檔案.tpl.php被刪除。編輯頁面內容以解決此問題。
+SiteDeleted=網站'%s'已刪除
+PageContent=頁面/內容
+PageDeleted=網站%s的頁面/內容'%s'已刪除
+PageAdded=頁面/內容'%s'已增加
+ViewSiteInNewTab=在新分頁中檢視網站
+ViewPageInNewTab=在新分頁中檢視頁面
+SetAsHomePage=設為首頁
+RealURL=真實網址
+ViewWebsiteInProduction=使用家庭網址檢視網站
+SetHereVirtualHost=如果您會建立請使用Apache/NGinx/...
, 在您的網站伺服器上 (Apache, Nginx, ...), 已啟用PHP的專用虛擬主機並且根資料夾位於
%s
然後在網站的屬性中設定您建立的虛擬主機名稱, 因此也可以預覽此網站伺服器而不是內部Dolibarr伺服器.
+YouCanAlsoTestWithPHPS=在開發環境中使用嵌入式PHP伺服器
, 您也許想要使用
php -S 0.0.0.0:8080 -t %s 來測試此嵌入式PHP伺服器 (需要PHP 5.5) 的網站
YouCanAlsoDeployToAnotherWHP=Run your web site with another Dolibarr Hosting provider
If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on https://saas.dolibarr.org
CheckVirtualHostPerms=Check also that virtual host has permission %s on files into
%s
ReadPerm=閱讀
-WritePerm=Write
-TestDeployOnWeb=Test/deploy on web
+WritePerm=寫入
+TestDeployOnWeb=上線測試/部署
PreviewSiteServedByWebServer=Preview %s in a new tab.
The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:
%s
URL served by external server:
%s
PreviewSiteServedByDolibarr=Preview %s in a new tab.
The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.
The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.
URL served by Dolibarr:
%s
To use your own external web server to serve this web site, create a virtual host on your web server that point on directory
%s
then enter the name of this virtual server and click on the other preview button.
-VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
-NoPageYet=No pages yet
-YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
-SyntaxHelp=Help on specific syntax tips
-YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
+VirtualHostUrlNotDefined=未定義由外部網站伺服器提供服務的虛擬主機網址
+NoPageYet=暫無頁面
+YouCanCreatePageOrImportTemplate=您可以建立一個新頁面或匯入完整的網站模板
+SyntaxHelp=有關特定語法提示的幫助
+YouCanEditHtmlSourceckeditor=您可以使用編輯器中的“Source”按鈕來編輯HTML源代碼。
YouCanEditHtmlSource=
You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.
You can also include content of another Page/Container with the following syntax:
<?php includeContainer('alias_of_container_to_include'); ?>
You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):
<?php redirectToContainer('alias_of_container_to_redirect_to'); ?>
To add a link to another page, use the syntax:
<a href="alias_of_page_to_link_to.php">mylink<a>
To include a link to download a file stored into the documents directory, use the document.php wrapper:
Example, for a file into documents/ecm (need to be logged), syntax is:
<a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
For a file into documents/medias (open directory for public access), syntax is:
<a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
For a file shared with a share link (open access using the sharing hash key of file), syntax is:
<a href="/document.php?hashp=publicsharekeyoffile">
To include an image stored into the documents directory, use the viewimage.php wrapper:
Example, for an image into documents/medias (open directory for public access), syntax is:
<img src="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
More examples of HTML or dynamic code available on the wiki documentation
.
-ClonePage=Clone page/container
-CloneSite=Clone site
-SiteAdded=Website added
+ClonePage=複製頁面/容器
+CloneSite=複製網站
+SiteAdded=網站已增加
ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
-PageIsANewTranslation=The new page is a translation of the current page ?
+PageIsANewTranslation=新頁面是目前頁面的翻譯?
LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
-ParentPageId=Parent page ID
-WebsiteId=Website ID
+ParentPageId=母頁面ID
+WebsiteId=網站ID
CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
OrEnterPageInfoManually=Or create page from scratch or from a page template...
-FetchAndCreate=Fetch and Create
-ExportSite=Export website
-ImportSite=Import website template
-IDOfPage=Id of page
+FetchAndCreate=提取與建立
+ExportSite=匯出網站
+ImportSite=匯入網站模板
+IDOfPage=頁面ID
Banner=Banner
-BlogPost=Blog post
-WebsiteAccount=Website account
+BlogPost=部落格文章
+WebsiteAccount=網站帳號
WebsiteAccounts=網站帳號
-AddWebsiteAccount=Create web site account
+AddWebsiteAccount=建立網站帳號
BackToListOfThirdParty=Back to list for Third Party
DisableSiteFirst=Disable website first
-MyContainerTitle=My web site title
+MyContainerTitle=我的網站標題
AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
@@ -92,32 +92,32 @@ WebsiteRootOfImages=Root directory for website images
SubdirOfPage=Sub-directory dedicated to page
AliasPageAlreadyExists=Alias page %s already exists
CorporateHomePage=Corporate Home page
-EmptyPage=Empty page
-ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+EmptyPage=空白頁
+ExternalURLMustStartWithHttp=外部網址必須以http://或https://開始
ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
-InternalURLOfPage=Internal URL of page
+ShowSubcontainers=包含動態內容
+InternalURLOfPage=頁面的內部網址
ThisPageIsTranslationOf=This page/container is a translation of
ThisPageHasTranslationPages=This page/container has translation
NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
-GoTo=Go to
+GoTo=前往
DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '%s' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
-NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
-ReplaceWebsiteContent=Search or Replace website content
-DeleteAlsoJs=Delete also all javascript files specific to this website?
-DeleteAlsoMedias=Delete also all medias files specific to this website?
-MyWebsitePages=My website pages
-SearchReplaceInto=Search | Replace into
-ReplaceString=New string
-CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:
#mycssselector, input.myclass:hover { ... }
must be
.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }
Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
-LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
-Dynamiccontent=Sample of a page with dynamic content
-ImportSite=Import website template
-EditInLineOnOff=Mode 'Edit inline' is %s
-ShowSubContainersOnOff=Mode to execute 'dynamic content' is %s
-GlobalCSSorJS=Global CSS/JS/Header file of web site
-BackToHomePage=Back to home page...
-TranslationLinks=Translation links
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not a website page
-UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 characters
+NotAllowedToAddDynamicContent=您沒有權限在網站中增加或編輯PHP動態內容。請求權限或僅將代碼保留在未經修改的php標籤中。
+ReplaceWebsiteContent=搜尋或替換網站內容
+DeleteAlsoJs=還要刪除網站的所有JavaScript檔案嗎?
+DeleteAlsoMedias=還要刪除此網站的所有媒體檔案嗎?
+MyWebsitePages=我的網站頁面
+SearchReplaceInto=搜尋|替換成
+ReplaceString=新字串
+CSSContentTooltipHelp=在此處輸入CSS內容。為避免與應用程式的CSS發生任何衝突,請確保在所有聲明之前增加.bodywebsite類別。例如:
#mycssselector, input.myclass:hover { ... }
must be
.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }
注意:如果您有一個沒有此前綴的大檔案,則可以使用“ lessc”將其轉換為.bodywebsite前綴並附加到任何地方。
+LinkAndScriptsHereAreNotLoadedInEditor=警告:僅當從伺服器訪問站台時,才輸出此內容。它在“編輯”模式下不使用,因此,如果您還需要在“編輯”模式下載入javascript文件,只需在頁面中增加標籤“ script src = ...”即可。
+Dynamiccontent=具有動態內容的頁面範例
+ImportSite=匯入網站模板
+EditInLineOnOff=模式“內聯編輯”為%s
+ShowSubContainersOnOff=執行“動態內容”的模式為%s
+GlobalCSSorJS=網站的全域CSS / JS / Header檔案
+BackToHomePage=返回首頁...
+TranslationLinks=翻譯連結
+YouTryToAccessToAFileThatIsNotAWebsitePage=您嘗試訪問不是網站頁面的頁面
+UseTextBetween5And70Chars=為了獲得良好的SEO實踐,請使用5到70個字元的文字
diff --git a/htdocs/langs/zh_TW/withdrawals.lang b/htdocs/langs/zh_TW/withdrawals.lang
index ae8bdbd3fd6..bb934a14939 100644
--- a/htdocs/langs/zh_TW/withdrawals.lang
+++ b/htdocs/langs/zh_TW/withdrawals.lang
@@ -1,119 +1,119 @@
# Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=直接付款(Direct Debit Payment)訂單區域
-SuppliersStandingOrdersArea=直接信用付款(Direct Credit Payment)訂單區
-StandingOrdersPayment=直接付款訂單
-StandingOrderPayment=直接付款訂單
-NewStandingOrder=新直接付款訂單
+CustomersStandingOrdersArea=直接轉帳付款訂單區
+SuppliersStandingOrdersArea=直接信用付款訂單區
+StandingOrdersPayment=直接轉帳付款訂單
+StandingOrderPayment=直接轉帳付款訂單
+NewStandingOrder=新直接轉帳付款訂單
StandingOrderToProcess=處理
-WithdrawalsReceipts=直接付款訂單(s)
-WithdrawalReceipt=直接付款訂單
-LastWithdrawalReceipts=最新的%s直接扣款文件
-WithdrawalsLines=直接扣款訂單行
-RequestStandingOrderToTreat=要求直接付款訂單處理
-RequestStandingOrderTreated=要求直接付款的付款訂單已處理
-NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
-NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
-InvoiceWaitingWithdraw=Invoice waiting for direct debit
-AmountToWithdraw=收回的款額
-WithdrawsRefused=Direct debit refused
-NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=User Responsible
-WithdrawalsSetup=Direct debit payment setup
-WithdrawStatistics=Direct debit payment statistics
-WithdrawRejectStatistics=Direct debit payment reject statistics
-LastWithdrawalReceipt=Latest %s direct debit receipts
-MakeWithdrawRequest=Make a direct debit payment request
-WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Third-party bank code
-NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode %s.
-ClassCredited=分類記
-ClassCreditedConfirm=你確定要分類這一撤離收據上記入您的銀行帳戶?
-TransData=數據傳輸
-TransMetod=傳輸的方法
-Send=發送
-Lines=線路
+WithdrawalsReceipts=直接轉帳付款訂單
+WithdrawalReceipt=直接轉帳付款訂單
+LastWithdrawalReceipts=最新%s個直接轉帳付款檔案
+WithdrawalsLines=直接轉帳付款訂單行
+RequestStandingOrderToTreat=直接轉帳付款訂單處理要求
+RequestStandingOrderTreated=直接轉帳付款訂單要求已處理
+NotPossibleForThisStatusOfWithdrawReceiptORLine=尚不可能。在特定行中宣佈拒絕之前,必須將“退款”狀態設定為“已記入”。
+NbOfInvoiceToWithdraw=等待直接轉帳付款訂單的合格發票數
+NbOfInvoiceToWithdrawWithInfo=具有已定義銀行帳戶資訊的直接轉帳付款訂單客戶發票數量
+InvoiceWaitingWithdraw=等待直接轉帳付款的發票
+AmountToWithdraw=提款金額
+WithdrawsRefused=直接轉帳付款被拒絕
+NoInvoiceToWithdraw=沒有打開“直接轉帳付款請求”的客戶發票。在發票卡上的分頁“ %s”上進行請求。
+ResponsibleUser=用戶負責
+WithdrawalsSetup=直接轉帳付款設定
+WithdrawStatistics=直接轉帳付款統計
+WithdrawRejectStatistics=直接轉帳付款拒絕統計
+LastWithdrawalReceipt=最新%s張直接轉帳付款收據
+MakeWithdrawRequest=提出直接轉帳付款請求
+WithdrawRequestsDone=已記錄%s直接轉帳付款請求
+ThirdPartyBankCode=合作方銀行代碼
+NoInvoiceCouldBeWithdrawed=沒有直接轉帳成功的發票。檢查發票上是否有有效IBAN的公司,以及IBAN是否具有模式為 %s 的UMR(唯一授權參考)。
+ClassCredited=分類為已記入
+ClassCreditedConfirm=您確定要將此提款收據分類為銀行帳戶中的已記入嗎?
+TransData=傳送日期
+TransMetod=傳送方式
+Send=寄送
+Lines=行
StandingOrderReject=發出拒絕
-WithdrawalRefused=提款Refuseds
-WithdrawalRefusedConfirm=你確定要輸入一個社會拒絕撤出
-RefusedData=日期拒收
-RefusedReason=拒絕的原因
+WithdrawalRefused=提款被拒絕
+WithdrawalRefusedConfirm=您確定要為協會輸入拒絕提款嗎?
+RefusedData=拒絕日期
+RefusedReason=拒絕原因
RefusedInvoicing=開具拒絕單
-NoInvoiceRefused=拒絕不收
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
-StatusDebitCredit=Status debit/credit
+NoInvoiceRefused=此拒絕不收費
+InvoiceRefused=發票被拒絕(向客戶收取拒絕費用)
+StatusDebitCredit=借項/貸項狀況
StatusWaiting=等候
-StatusTrans=傳播
-StatusCredited=計入
-StatusRefused=拒絕
+StatusTrans=傳送
+StatusCredited=已記入
+StatusRefused=已拒絕
StatusMotif0=未指定
-StatusMotif1=提供insuffisante
-StatusMotif2=Tirage conteste
-StatusMotif3=No direct debit payment order
+StatusMotif1=不充足的資金
+StatusMotif2=請求有爭議
+StatusMotif3=沒有直接轉帳付款訂單
StatusMotif4=銷售訂單
-StatusMotif5=肋inexploitable
-StatusMotif6=帳戶無余額
+StatusMotif5=無法使用RIB
+StatusMotif6=帳戶沒有餘額
StatusMotif7=司法判決
StatusMotif8=其他原因
-CreateForSepaFRST=Create direct debit file (SEPA FRST)
-CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
-CreateAll=Create direct debit file (all)
+CreateForSepaFRST=建立直接轉帳付款檔案(SEPA FRST)
+CreateForSepaRCUR=建立直接轉帳付款檔案(SEPA RCUR)
+CreateAll=建立直接轉帳付款檔案(全部)
CreateGuichet=只有辦公室
CreateBanque=只有銀行
-OrderWaiting=等待治療
-NotifyTransmision=提款傳輸
-NotifyCredit=提款信用
-NumeroNationalEmetter=國家發射數
-WithBankUsingRIB=有關銀行賬戶,使用肋
-WithBankUsingBANBIC=使用的IBAN / BIC / SWIFT的銀行帳戶
-BankToReceiveWithdraw=Receiving Bank Account
+OrderWaiting=等待處理
+NotifyTransmision=提款轉帳
+NotifyCredit=提款額度
+NumeroNationalEmetter=國際轉帳編號
+WithBankUsingRIB=用於RIB的銀行帳戶
+WithBankUsingBANBIC=用於IBAN / BIC / SWIFT的銀行帳戶
+BankToReceiveWithdraw=收款銀行帳戶
CreditDate=信貸
-WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Show Direct Debit Order
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
-WithdrawalFile=Withdrawal file
-SetToStatusSent=Set to status "File Sent"
-ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
-StatisticsByLineStatus=Statistics by status of lines
+WithdrawalFileNotCapable=無法為您的國家/地區產生提款收據檔案%s(不支援您的國家/地區)
+ShowWithdraw=顯示直接轉帳付款訂單
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=但是,如果發票中至少有一個直接轉帳付款訂單尚未處理,則不會將其設定為已付款以允許事先提款管理。
+DoStandingOrdersBeforePayments=此分頁可讓您請求直接轉帳付款訂單。完成後,進入選單銀行->直接轉帳訂單以管理直接轉帳付款訂單。關閉付款訂單後,將自動記錄發票付款,如果剩餘付款為空,則關閉發票。
+WithdrawalFile=提款檔案
+SetToStatusSent=設定狀態為“檔案已傳送”
+ThisWillAlsoAddPaymentOnInvoice=這將記錄對發票的付款,如果剩餘應付款為空,則將其分類為“已付款”
+StatisticsByLineStatus=依照行狀態統計
RUM=UMR
-DateRUM=Mandate signature date
-RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
-WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Amount of Direct debit request:
-WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
-SepaMandate=SEPA Direct Debit Mandate
-SepaMandateShort=SEPA Mandate
-PleaseReturnMandate=Please return this mandate form by email to %s or by mail to
-SEPALegalText=By signing this mandate form, you authorize (A) %s to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
-CreditorIdentifier=Creditor Identifier
-CreditorName=Creditor Name
-SEPAFillForm=(B) Please complete all the fields marked *
-SEPAFormYourName=Your name
-SEPAFormYourBAN=Your Bank Account Name (IBAN)
-SEPAFormYourBIC=Your Bank Identifier Code (BIC)
-SEPAFrstOrRecur=Type of payment
-ModeRECUR=Recurring payment
-ModeFRST=One-off payment
-PleaseCheckOne=Please check one only
-DirectDebitOrderCreated=Direct debit order %s created
-AmountRequested=Amount requested
+DateRUM=委託簽名日期
+RUMLong=唯一授權參考
+RUMWillBeGenerated=如果為空,則在保存銀行帳戶資訊後將產生UMR(唯一授權參考)。
+WithdrawMode=直接轉帳付款模式 (FRST or RECUR)
+WithdrawRequestAmount=直接轉帳付款請求金額:
+WithdrawRequestErrorNilAmount=無法為空金額建立直接轉帳付款請求。
+SepaMandate=SEPA直接轉帳付款授權
+SepaMandateShort=SEPA授權
+PleaseReturnMandate=請以電子郵件將本授權書退回至%s或郵寄至
+SEPALegalText=通過簽署此授權書,您授權(A)%s向您的銀行發送指示以從您的帳戶中扣款,並(B)您的銀行根據%s的指示向您的帳戶直接轉帳。作為您權利的一部分,您有權根據與銀行達成的協議的條款和條件從銀行退款。必須從您的帳戶扣除之日起8週內要求退款。您可以從銀行獲得的聲明中了解您對上述授權的權利。
+CreditorIdentifier=債權人識別碼
+CreditorName=債權人名稱
+SEPAFillForm=(B)請填寫所有標有*的欄位
+SEPAFormYourName=您的名字
+SEPAFormYourBAN=您的銀行帳戶名稱(IBAN)
+SEPAFormYourBIC=您的銀行識別碼(BIC)
+SEPAFrstOrRecur=付款方式
+ModeRECUR=定期付款
+ModeFRST=一次性付款
+PleaseCheckOne=請只確認一個
+DirectDebitOrderCreated=已建立直接轉帳付款訂單%s
+AmountRequested=要求的金額
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
-ADDDAYS=Add days to Execution Date
+ExecutionDate=執行日期
+CreateForSepa=建立直接轉帳付款檔案
+ICS=債權人識別碼
+END_TO_END="EndToEndId" SEPA XML標籤- 每筆交易分配的唯一ID
+USTRD="Unstructured" SEPA XML標籤
+ADDDAYS=將天數加到執行日期
### Notifications
-InfoCreditSubject=Payment of direct debit payment order %s by the bank
-InfoCreditMessage=The direct debit payment order %s has been paid by the bank
Data of payment: %s
-InfoTransSubject=Transmission of direct debit payment order %s to bank
-InfoTransMessage=The direct debit payment order %s has been sent to bank by %s %s.
-InfoTransData=金額:%s
metode:%s
日期:%s
-InfoRejectSubject=Direct debit payment order refused
-InfoRejectMessage=Hello,
the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.
--
%s
-ModeWarning=實模式下的選項沒有設置,我們停止後,這個模擬
+InfoCreditSubject=銀行支付直接轉帳付款訂單%s
+InfoCreditMessage=直接轉帳付款訂單%s已由銀行
支付。付款資料:%s
+InfoTransSubject=將直接轉帳付款訂單%s傳輸到銀行
+InfoTransMessage=直接轉帳付款訂單%s已由%s %s傳送到銀行。
+InfoTransData=金額:%s
方式:%s
日期:%s
+InfoRejectSubject=直接轉帳付款訂單已被拒絕
+InfoRejectMessage=您好,
銀行拒絕了與公司%s相關的發票%s的直接轉帳付款訂單 。%s的金額已被銀行拒絕
--
%s
+ModeWarning=未設定實際模式選項,我們將在此模擬後停止
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index 5717eecf83a..b879f3d740f 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -24,7 +24,7 @@
/**
* \file htdocs/livraison/card.php
* \ingroup livraison
- * \brief Fiche descriptive d'un bon de livraison=reception
+ * \brief Page to describe a delivery receipt
*/
require '../main.inc.php';
@@ -247,50 +247,9 @@ $upload_dir = $conf->expedition->dir_output.'/receipt';
$permissiontoadd = $user->rights->expedition->creer;
include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
-
-/*
- * Build document
- */
-/*
-if ($action == 'builddoc') // En get ou en post
-{
- // Save last template used to generate document
- if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
-
- // Define output language
- $outputlangs = $langs;
- $newlang='';
- if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
- if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->thirdparty->default_lang;
- if (! empty($newlang))
- {
- $outputlangs = new Translate("",$conf);
- $outputlangs->setDefaultLang($newlang);
- }
- $ret=$object->fetch($id); // Reload to get new records
- $result= $object->generateDocument($object->modelpdf, $outputlangs);
- if ($result < 0)
- {
- setEventMessages($object->error, $object->errors, 'errors');
- $action='';
- }
-}
-
-// Delete file in doc form
-elseif ($action == 'remove_file')
-{
- require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
- $upload_dir = $conf->expedition->dir_output . "/receipt";
- $file = $upload_dir . '/' . GETPOST('file');
- $ret=dol_delete_file($file,0,0,0,$object);
- if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
- else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
-}
-*/
-
include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
+
/*
* View
*/
@@ -300,20 +259,10 @@ llxHeader('', $langs->trans('Delivery'), 'Livraison');
$form = new Form($db);
$formfile = new FormFile($db);
-/*********************************************************************
- *
- * Mode creation
- *
- *********************************************************************/
-if ($action == 'create') // Seems to no be used
+if ($action == 'create') // Create. Seems to no be used
{
}
-else
-/* *************************************************************************** */
-/* */
-/* Mode vue et edition */
-/* */
-/* *************************************************************************** */
+else // View
{
if ($object->id > 0)
{
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index e28f2e7324f..c8a3275dced 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -838,8 +838,8 @@ class Livraison extends CommonObject
/**
* Renvoi le libelle d'un statut donne
*
- * @param int $status Id status
- * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+ * @param int $status Id status
+ * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
* @return string Label
*/
public function LibStatut($status, $mode)
@@ -847,36 +847,23 @@ class Livraison extends CommonObject
// phpcs:enable
global $langs;
- if ($mode==0)
+ if (empty($this->labelStatus) || empty($this->labelStatusShort))
{
- if ($status==-1) return $langs->trans('StatusDeliveryCanceled');
- elseif ($status==0) return $langs->trans('StatusDeliveryDraft');
- elseif ($status==1) return $langs->trans('StatusDeliveryValidated');
- }
- elseif ($mode==1)
- {
- if ($status==-1) return $langs->trans($this->statuts[$status]);
- elseif ($status==0) return $langs->trans($this->statuts[$status]);
- elseif ($status==1) return $langs->trans($this->statuts[$status]);
- }
- elseif ($mode == 3)
- {
- if ($status==-1) return img_picto($langs->trans('StatusDeliveryCanceled'), 'statut5');
- if ($status==0) return img_picto($langs->trans('StatusDeliveryDraft'), 'statut0');
- if ($status==1) return img_picto($langs->trans('StatusDeliveryValidated'), 'statut4');
- }
- elseif ($mode == 4)
- {
- if ($status==-1) return img_picto($langs->trans('StatusDeliveryCanceled'), 'statut5').' '.$langs->trans('StatusDeliveryCanceled');
- elseif ($status==0) return img_picto($langs->trans('StatusDeliveryDraft'), 'statut0').' '.$langs->trans('StatusDeliveryDraft');
- elseif ($status==1) return img_picto($langs->trans('StatusDeliveryValidated'), 'statut4').' '.$langs->trans('StatusDeliveryValidated');
- }
- elseif ($mode == 6)
- {
- if ($status==-1) return $langs->trans('StatusDeliveryCanceled').' '.img_picto($langs->trans('StatusDeliveryCanceled'), 'statut5');
- elseif ($status==0) return $langs->trans('StatusDeliveryDraft').' '.img_picto($langs->trans('StatusDeliveryDraft'), 'statut0');
- elseif ($status==1) return $langs->trans('StatusDeliveryValidated').' '.img_picto($langs->trans('StatusDeliveryValidated'), 'statut4');
+ global $langs;
+ //$langs->load("mymodule");
+ $this->labelStatus[-1] = $langs->trans('StatusDeliveryCanceled');
+ $this->labelStatus[0] = $langs->trans('StatusDeliveryDraft');
+ $this->labelStatus[1] = $langs->trans('StatusDeliveryValidated');
+ $this->labelStatusShort[-1] = $langs->trans('StatusDeliveryCanceled');
+ $this->labelStatusShort[0] = $langs->trans('StatusDeliveryDraft');
+ $this->labelStatusShort[1] = $langs->trans('StatusDeliveryValidated');
}
+
+ $statusType = 'status0';
+ if ($status == -1) $statusType = 'status5';
+ if ($status == 1) $statusType = 'status4';
+
+ return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
}
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 8540612f3a7..cc87e83d5c0 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -311,7 +311,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
}
// Call Hook formConfirm
- $parameters = array('lineid' => $lineid);
+ $parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index 0c3e1927de0..973e964a1cf 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -406,7 +406,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
}
// Call Hook formConfirm
- $parameters = array('lineid' => $lineid);
+ $parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 3a10a7d13c8..8dffd3dad19 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -442,7 +442,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
}
// Call Hook formConfirm
- $parameters = array('lineid' => $lineid);
+ $parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index 0c913834738..3d389cf7eb2 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -240,7 +240,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
}
// Call Hook formConfirm
- $parameters = array('lineid' => $lineid);
+ $parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index f43f1fc3b1c..b6021c82cb8 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -174,7 +174,7 @@ if ($object->id > 0)
}
// Call Hook formConfirm
- $parameters = array('lineid' => $lineid);
+ $parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 849f4f700e1..d0a1fc5db76 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -362,7 +362,7 @@ else
}
// Call Hook formConfirm
- $parameters = array();
+ $parameters = array('formConfirm' => $formconfirm);
$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 50942b8b363..8ae94aa536b 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -826,6 +826,14 @@ foreach ($listofreferent as $key => $value)
elseif (in_array($tablename, array('expensereport_det', 'don', 'projet_task', 'stock_mouvement', 'payment_salary'))) print $langs->trans("User");
else print $langs->trans("ThirdParty");
print '';
+ // Duration of intervention
+ if($tablename == 'fichinter')
+ {
+ print '';
+ print $langs->trans("TotalDuration");
+ $total_duration = 0;
+ print ' | ';
+ }
// Amount HT
//if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print ''.$langs->trans("AmountHT").' | ';
//elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print ''.$langs->trans("Amount").' | ';
@@ -1024,6 +1032,15 @@ foreach ($listofreferent as $key => $value)
}
print '';
+ // Add duration and store it in counter for fichinter
+ if($tablename == 'fichinter')
+ {
+ print '';
+ print convertSecondToTime($element->duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY);
+ $total_duration += $element->duration;
+ print ' | ';
+ }
+
// Amount without tax
$warning = '';
if (empty($value['disableamount']))
@@ -1201,6 +1218,8 @@ foreach ($listofreferent as $key => $value)
}
//if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print ''.$langs->trans("TotalHT").' : '.price($total_ht).' | ';
//elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print ''.$langs->trans("Total").' : '.price($total_ht).' | ';
+ // If fichinter add the total_duration
+ if($tablename == 'fichinter') print ''.convertSecondToTime($total_duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).' | ';
print '';
if (empty($value['disableamount']))
{
diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php
index dd4845111e1..83e757b78f8 100644
--- a/htdocs/public/onlinesign/newonlinesign.php
+++ b/htdocs/public/onlinesign/newonlinesign.php
@@ -15,9 +15,6 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
- *
- * For paypal test: https://developer.paypal.com/
- * For paybox test: ???
*/
/**
@@ -26,8 +23,9 @@
* \brief File to offer a way to make an online signature for a particular Dolibarr entity
*/
-define("NOLOGIN", 1); // This means this output page does not require to be logged.
-define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+if (!defined('NOLOGIN')) define("NOLOGIN", 1); // This means this output page does not require to be logged.
+if (!defined('NOCSRFCHECK')) define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+if (!defined('NOIPCHECK')) define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
// For MultiCompany module.
// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
@@ -41,12 +39,13 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+// Load translation files
+$langs->loadLangs(array("main", "other", "dict", "bills", "companies", "errors", "paybox"));
+
// Security check
// No check on module enabled. Done later according to $validpaymentmethod
-$langs->loadLangs(array("main", "other", "dict", "bills", "companies", "errors", "paybox"));
-
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
// Input are:
// type ('invoice','order','contractline'),
@@ -55,7 +54,7 @@ $action = GETPOST('action', 'alpha');
// tag (a free text, required if type is empty)
// currency (iso code)
-$suffix = GETPOST("suffix", 'alpha');
+$suffix = GETPOST("suffix", 'aZ09');
$source = GETPOST("source", 'alpha');
$ref = $REF = GETPOST("ref", 'alpha');
@@ -71,9 +70,6 @@ if (!$action)
}
-$paymentmethod = '';
-$validpaymentmethod = array();
-
@@ -133,7 +129,8 @@ if (!empty($conf->global->MAIN_SIGN_CSS_URL)) $head = 'dol_hide_topmenu = 1;
$conf->dol_hide_leftmenu = 1;
-llxHeader($head, $langs->trans("OnlineSignature"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
+$replacemainarea = (empty($conf->dol_hide_leftmenu) ? '' : '').' ';
+llxHeader($head, $langs->trans("OnlineSignature"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea);
// Check link validity
if (!empty($source) && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_ref', 'order_ref', '')))
@@ -171,23 +168,32 @@ elseif (!empty($conf->global->ONLINE_SIGN_LOGO)) $logosmall = $conf->global->ONL
//print ''."\n";
// Define urllogo
$urllogo = '';
+$urllogofull = '';
if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall))
{
$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
+ $urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
+ $width = 150;
}
elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
{
$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
- $width = 96;
+ $urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
+ $width = 150;
}
// Output html code for logo
if ($urllogo)
{
- print ' ';
- print ' ';
+ print '';
+ print '  | ';
- print ' '."\n";
+ print '>';
+ print ' ';
+ if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+ print ' ';
+ }
+ print ' ';
}
// Output introduction text
@@ -209,7 +215,7 @@ print $text;
// Output payment summary form
print ' | ';
print '';
-print '| '.$langs->trans("ThisIsInformationOnDocumentToSign").' : | '."\n";
+print '| '.$langs->trans("ThisIsInformationOnDocumentToSign").' : | '."\n";
$found = false;
$error = 0;
diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php
index c4a3b71e6ad..b3e94d5ceb2 100644
--- a/htdocs/public/ticket/create_ticket.php
+++ b/htdocs/public/ticket/create_ticket.php
@@ -28,6 +28,7 @@ if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1');
if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', '1');
if (!defined('NOLOGIN')) define("NOLOGIN", 1); // This means this output page does not require to be logged.
if (!defined('NOCSRFCHECK')) define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+if (!defined('NOIPCHECK')) define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/ticket/class/actions_ticket.class.php';
@@ -53,6 +54,7 @@ $extrafields = new ExtraFields($db);
$extrafields->fetch_name_optionals_label($object->table_element);
+
/*
* Actions
*/
diff --git a/htdocs/public/ticket/index.php b/htdocs/public/ticket/index.php
index 031ef2793b5..bbe831c1a84 100644
--- a/htdocs/public/ticket/index.php
+++ b/htdocs/public/ticket/index.php
@@ -25,6 +25,7 @@
if (!defined('NOCSRFCHECK')) define('NOCSRFCHECK', '1');
if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1');
if (!defined("NOLOGIN")) define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
+if (!defined('NOIPCHECK')) define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
// For MultiCompany module.
// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index eaec20db955..b2723a0ce6a 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -1277,7 +1277,7 @@ elseif ($id || $ref)
}
if (!$formconfirm) {
- $parameters = array();
+ $parameters = array('formConfirm' => $formconfirm);
$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index 7dbf4dd6089..77bd1d918bf 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -215,7 +215,7 @@ if (!$rowid)
print "\n";
// Origine
print "";
- if ($charge->metadata->dol_type=="order") {
+ if ($charge->metadata->dol_type=="order" || $charge->metadata->dol_type=="commande") {
$object = new Commande($db);
$object->fetch($charge->metadata->dol_id);
if ($object->id > 0) {
@@ -223,7 +223,7 @@ if (!$rowid)
} else {
print $FULLTAG;
}
- } elseif ($charge->metadata->dol_type=="invoice") {
+ } elseif ($charge->metadata->dol_type=="invoice" || $charge->metadata->dol_type=="facture") {
$object = new Facture($db);
$object->fetch($charge->metadata->dol_id);
if ($object->id > 0) {
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index f01ad4c0b1b..5067a4935bc 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1441,7 +1441,7 @@ if ($action == 'create')
}
// Call Hook formConfirm
- $parameters = array('lineid' => $lineid);
+ $parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index 0e40f2c3f36..f1308d8c309 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -132,7 +132,7 @@ print ' | |