diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index 880a39d6ab8..08bc1b4a34b 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -7,7 +7,11 @@ * Copyright (C) 2013 Cédric Salvador * Copyright (C) 2013 Alexandre Spangaro * Copyright (C) 2015 Jean-François Ferry +<<<<<<< HEAD * Copyright (C) 2018 Nicolas ZABOURI +======= + * Copyright (C) 2018 Juanjo Menent +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -303,6 +307,7 @@ if (strlen($search_phone_mobile)) $sql.= natural_search('p.phone_mobile', $sea if (strlen($search_fax)) $sql.= natural_search('p.fax', $search_fax); if (strlen($search_skype)) $sql.= natural_search('p.skype', $search_skype); if (strlen($search_email)) $sql.= natural_search('p.email', $search_email); +if (strlen($search_zip)) $sql.= natural_search("p.zip",$search_zip); if ($search_status != '' && $search_status >= 0) $sql.= " AND p.statut = ".$db->escape($search_status); if ($search_import_key) $sql.= natural_search("p.import_key",$search_import_key); if ($type == "o") // filtre sur type diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php index dcd1cf15cf8..d18f9e5bfff 100644 --- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php +++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php @@ -398,15 +398,16 @@ class pdf_canelle extends ModelePDFSuppliersInvoices $pdf->MultiCell($this->posxqty-$this->posxup-0.8, 3, $up_excl_tax, 0, 'R', 0); // Quantity + $qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails); $pdf->SetXY($this->posxqty, $curY); // Enough for 6 chars if($conf->global->PRODUCT_USE_UNITS) { - $pdf->MultiCell($this->posxunit-$this->posxqty-0.8, 4, $object->lines[$i]->qty, 0, 'R'); + $pdf->MultiCell($this->posxunit-$this->posxqty-0.8, 4, $qty, 0, 'R'); } else { - $pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 4, $object->lines[$i]->qty, 0, 'R'); + $pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 4, $qty, 0, 'R'); } // Unit @@ -421,7 +422,8 @@ class pdf_canelle extends ModelePDFSuppliersInvoices $pdf->SetXY($this->posxdiscount, $curY); if ($object->lines[$i]->remise_percent) { - $pdf->MultiCell($this->postotalht-$this->posxdiscount-1, 3, $object->lines[$i]->remise_percent."%", 0, 'R'); + $remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails); + $pdf->MultiCell($this->postotalht-$this->posxdiscount-1, 3, $remise_percent."%", 0, 'R'); } // Total HT line diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php index c3a8fcaac44..0e560393c4b 100644 --- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -479,15 +479,16 @@ class pdf_muscadet extends ModelePDFSuppliersOrders $pdf->MultiCell($this->posxqty-$this->posxup-0.8, 3, $up_excl_tax, 0, 'R', 0); // Quantity + $qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails); $pdf->SetXY($this->posxqty, $curY); // Enough for 6 chars if($conf->global->PRODUCT_USE_UNITS) { - $pdf->MultiCell($this->posxunit-$this->posxqty-0.8, 4, $object->lines[$i]->qty, 0, 'R'); + $pdf->MultiCell($this->posxunit-$this->posxqty-0.8, 4, $qty, 0, 'R'); } else { - $pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 4, $object->lines[$i]->qty, 0, 'R'); + $pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 4, $qty, 0, 'R'); } // Unit @@ -502,7 +503,8 @@ class pdf_muscadet extends ModelePDFSuppliersOrders $pdf->SetXY($this->posxdiscount, $curY); if ($object->lines[$i]->remise_percent) { - $pdf->MultiCell($this->postotalht-$this->posxdiscount-1, 3, $object->lines[$i]->remise_percent."%", 0, 'R'); + $remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails); + $pdf->MultiCell($this->postotalht-$this->posxdiscount-1, 3, $remise_percent."%", 0, 'R'); } // Total HT line diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql index 465f408eb1b..4d3461db873 100644 --- a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql +++ b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql @@ -99,6 +99,8 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_SUBSCRIPTION_MODIFY','Member subscribtion modified','Executed when a member subscribtion is modified','member',24); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_SUBSCRIPTION_DELETE','Member subscribtion deleted','Executed when a member subscribtion is deleted','member',24); +-- VPGSQL8.4 ALTER TABLE llx_product_attribute DROP CONSTRAINT unique_ref; + ALTER TABLE llx_product_attribute_value DROP INDEX unique_ref; ALTER TABLE llx_product_attribute_value ADD UNIQUE INDEX uk_product_attribute_value (fk_product_attribute, ref); diff --git a/htdocs/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang index f919c0d7c12..b4e2dcadb2d 100644 --- a/htdocs/langs/bs_BA/accountancy.lang +++ b/htdocs/langs/bs_BA/accountancy.lang @@ -239,7 +239,11 @@ AccountingJournalType2=Sales AccountingJournalType3=Purchases AccountingJournalType4=Banka AccountingJournalType5=Expenses report +<<<<<<< HEAD AccountingJournalType8=Inventory +======= +AccountingJournalType8=Inventar +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git AccountingJournalType9=Has-new ErrorAccountingJournalIsAlreadyUse=This journal is already use AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s diff --git a/htdocs/langs/bs_BA/agenda.lang b/htdocs/langs/bs_BA/agenda.lang index 78a6dcd0c6d..7c02ab7ff46 100644 --- a/htdocs/langs/bs_BA/agenda.lang +++ b/htdocs/langs/bs_BA/agenda.lang @@ -5,7 +5,11 @@ Agenda=Agenda TMenuAgenda=Agenda Agendas=Agende LocalAgenda=Lokalni kalendar +<<<<<<< HEAD ActionsOwnedBy=Event owned by +======= +ActionsOwnedBy=Događaj u vlasništvu +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git ActionsOwnedByShort=Vlasnik AffectedTo=Dodijeljeno korisniku Event=Događaj @@ -14,7 +18,7 @@ EventsNb=Broj događaja ListOfActions=Lista događaja EventReports=Event reports Location=Lokacija -ToUserOfGroup=To any user in group +ToUserOfGroup=Bilo koji korisnik u grupi EventOnFullDay=Događaj za cijeli dan(e) MenuToDoActions=Svi nepotpuni događaji MenuDoneActions=Sve završeni događaji @@ -28,45 +32,60 @@ ActionAssignedTo=Događaj dodijeljen ViewCal=Mjesečni pregled ViewDay=Dnevni pregled ViewWeek=Sedmični pregled -ViewPerUser=Per user view -ViewPerType=Per type view +ViewPerUser=Pregled po korisniku +ViewPerType=Pregled po vrsti AutoActions= Automatsko popunjavanje -AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked, only manual actions will be included in logged and visible into agenda. Automatic tracking of business actions done on objects (validation, status change) will not be saved. +AgendaAutoActionDesc= Ovdje definirajte događaje za koje želite da Dolibarr automatski napravi događaj u kalendaru. Ako ništa nije obilježeno, samo ručno unesene akcije će biti uključene i vidljive u kalendaru. Automatsko praćenje biznis akcija urađenih na objektima (validacija, promjena statusa) neće biti spremljene. AgendaSetupOtherDesc= Ova stranica pruža mogućnosti izvoza svojih Dolibarr događaja u eksterni kalendar (Thunderbird, Google Calendar, ...) AgendaExtSitesDesc=Ova stranica omogućava definisanje eksternih izvora kalendara da vidite svoje događaje u Dolibarr agendi. ActionsEvents=Događaji za koje će Dolibarr stvoriti akciju u dnevni red automatski EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into Agenda module setup. ##### Agenda event labels ##### NewCompanyToDolibarr=Kreirana treća strana %s +<<<<<<< HEAD ContractValidatedInDolibarr=Contract %s validated PropalClosedSignedInDolibarr=Proposal %s signed PropalClosedRefusedInDolibarr=Proposal %s refused +======= +ContractValidatedInDolibarr=Ugovor %s potvrđen +PropalClosedSignedInDolibarr=Prijedlog %s potpisan +PropalClosedRefusedInDolibarr=Prijedlog %s odbijen +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git PropalValidatedInDolibarr=Prijedlog %s potvrđen -PropalClassifiedBilledInDolibarr=Proposal %s classified billed +PropalClassifiedBilledInDolibarr=Prijedlog %s klasificiran kao fakturisan InvoiceValidatedInDolibarr=Faktura %s potvrđena InvoiceValidatedInDolibarrFromPos=Račun %s odobren na POSu InvoiceBackToDraftInDolibarr=Faktura %s vraćena u status izrade InvoiceDeleteDolibarr=Faktura %s obrisana -InvoicePaidInDolibarr=Invoice %s changed to paid -InvoiceCanceledInDolibarr=Invoice %s canceled -MemberValidatedInDolibarr=Member %s validated +InvoicePaidInDolibarr=Faktura %s promijenjena u status plaćeno +InvoiceCanceledInDolibarr=Faktura %s otkazana +MemberValidatedInDolibarr=Član %s potvrđen MemberModifiedInDolibarr=Member %s modified +<<<<<<< HEAD MemberResiliatedInDolibarr=Member %s terminated MemberDeletedInDolibarr=Member %s deleted MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted ShipmentValidatedInDolibarr=Shipment %s validated +======= +MemberResiliatedInDolibarr=Član %s ugašen +MemberDeletedInDolibarr=Član%s obrisan +MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added +MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified +MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted +ShipmentValidatedInDolibarr=Pošiljka %s odobrena +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git ShipmentClassifyClosedInDolibarr=Shipment %s classified billed ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened ShipmentDeletedInDolibarr=Shipment %s deleted OrderCreatedInDolibarr=Order %s created OrderValidatedInDolibarr=Narudžba %s potvrđena -OrderDeliveredInDolibarr=Order %s classified delivered +OrderDeliveredInDolibarr=Narudžba %s klasificirana kao isporučena OrderCanceledInDolibarr=Narudžba %s otkazana -OrderBilledInDolibarr=Order %s classified billed +OrderBilledInDolibarr=Narudžba %s klasificirana kao fakturisana OrderApprovedInDolibarr=Narudžba %s odobrena -OrderRefusedInDolibarr=Order %s refused +OrderRefusedInDolibarr=Narudžba %s odbijena OrderBackToDraftInDolibarr=NArudžbu %s vratiti u status izrade ProposalSentByEMail=Poslovni prijedlog %s poslan putem e-maila ContractSentByEMail=Contract %s sent by EMail @@ -75,11 +94,15 @@ InvoiceSentByEMail=Fakture za kupca %s poslana putem e-maila SupplierOrderSentByEMail=Narudžba za dobavljača %s poslan putem e-maila SupplierInvoiceSentByEMail=Predračun dobavljača %s poslan putem e-maila ShippingSentByEMail=Pošiljka%s poslana emailom +<<<<<<< HEAD ShippingValidated= Shipment %s validated +======= +ShippingValidated= Pošiljka %s odobrena +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git InterventionSentByEMail=Intervencija %s poslana putem e-maila -ProposalDeleted=Proposal deleted -OrderDeleted=Order deleted -InvoiceDeleted=Invoice deleted +ProposalDeleted=Ponuda obrisana +OrderDeleted=Narudžba obrisana +InvoiceDeleted=Faktura obrisana PRODUCT_CREATEInDolibarr=Product %s created PRODUCT_MODIFYInDolibarr=Product %s modified PRODUCT_DELETEInDolibarr=Product %s deleted @@ -105,16 +128,21 @@ AgendaShowBirthdayEvents=Pokaži rođendane kontakata AgendaHideBirthdayEvents=Sakrij rođendane kontakata Busy=Zauzet ExportDataset_event1=Lista događaja u agendi -DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6) -DefaultWorkingHours=Default working hours in day (Example: 9-18) +DefaultWorkingDays=Postavljeni period radnih dana u sedmici (naprimjer: 1-5, 1-6) +DefaultWorkingHours=Postavljeni radni sati u danu (naprimjer: 9-18) # External Sites ical ExportCal=Export kalendara ExtSites=Import eksternih kalendara -ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users. +ExtSitesEnableThisTool=Prikazuje vanjske kalendare (definirane gobalnim postavkama) u agendi. Ne utječe na vanjske kalendare koje definiraju korisnici. ExtSitesNbOfAgenda=Broj kalendara +<<<<<<< HEAD AgendaExtNb=Calendar no. %s +======= +AgendaExtNb=Kalendar br. %s +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git ExtSiteUrlAgenda=URL za pristup .ical fajla ExtSiteNoLabel=Nema opisa +<<<<<<< HEAD VisibleTimeRange=Visible time range VisibleDaysRange=Visible days range AddEvent=Napravi događaj @@ -129,3 +157,19 @@ EveryMonth=Svakog mjeseca DayOfMonth=Day of month DayOfWeek=Day of week DateStartPlusOne=Date start + 1 hour +======= +VisibleTimeRange=Vidljivi raspon vremena +VisibleDaysRange=Vidljivi raspon dana +AddEvent=Napravi događaj +MyAvailability=Moja dostupnost +ActionType=Vrsta događaja +DateActionBegin=Početni datum događaja +CloneAction=Kloniraj događaj +ConfirmCloneEvent=Jeste li sigurni da želite duplirati događaj %s? +RepeatEvent=Ponovi događaj +EveryWeek=Svake sedmice +EveryMonth=Svakog mjeseca +DayOfMonth=Dan u mjesecu +DayOfWeek=Dan u sedmici +DateStartPlusOne=Datum početka + 1 sat +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git diff --git a/htdocs/langs/bs_BA/companies.lang b/htdocs/langs/bs_BA/companies.lang index 5fe2667b7bc..8e611ebd64d 100644 --- a/htdocs/langs/bs_BA/companies.lang +++ b/htdocs/langs/bs_BA/companies.lang @@ -267,7 +267,11 @@ Prospect=Mogući klijent CustomerCard=Kartica kupca Customer=Kupac CustomerRelativeDiscount=Relativni popust kupca +<<<<<<< HEAD SupplierRelativeDiscount=Relative supplier discount +======= +SupplierRelativeDiscount=Relativni popust dobavljača +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git CustomerRelativeDiscountShort=Relativni popust CustomerAbsoluteDiscountShort=Fiksni popust CompanyHasRelativeDiscount=Ovaj kupca ima defaultni popust od %s%% diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang index 76845a3add3..6b8ad5ad4c3 100644 --- a/htdocs/langs/bs_BA/main.lang +++ b/htdocs/langs/bs_BA/main.lang @@ -64,14 +64,22 @@ ErrorNoVATRateDefinedForSellerCountry=Greška, nije definirana PDV stopa za drž ErrorNoSocialContributionForSellerCountry=Greška, nisu definirane vrste doprinosa i poreza za državu '%s'. ErrorFailedToSaveFile=Greška, neuspjelo spremanje datoteke. ErrorCannotAddThisParentWarehouse=Pokušavate dodati nadređeno skladište koje je već podređeno skladište ovom trenutnom +<<<<<<< HEAD MaxNbOfRecordPerPage=Max number of record per page +======= +MaxNbOfRecordPerPage=Maks broj unosa po stranici +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git NotAuthorized=Niste ovlašteni da to uradite. SetDate=Postavi datum SelectDate=Odaberi datum SeeAlso=Također pogledajte %s SeeHere=Pogledaj ovdje ClickHere=Klikni ovdje +<<<<<<< HEAD Here=Here +======= +Here=Ovdje +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git Apply=Primijeniti BackgroundColorByDefault=Osnovna boja pozadine FileRenamed=Datoteka je uspješno preimenovana @@ -866,7 +874,11 @@ FileNotShared=Datoteka nije dijeljena vanjskim korisnicima Project=Projekt Projects=Projekti Rights=Dozvole +<<<<<<< HEAD LineNb=Line no. +======= +LineNb=Red br. +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git IncotermLabel=Incoterms # Week day Monday=Ponedjeljak diff --git a/htdocs/langs/bs_BA/other.lang b/htdocs/langs/bs_BA/other.lang index 3a7b64383a0..3e54ae37590 100644 --- a/htdocs/langs/bs_BA/other.lang +++ b/htdocs/langs/bs_BA/other.lang @@ -47,7 +47,7 @@ Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail Notify_WITHDRAW_TRANSMIT=Transmission withdrawal Notify_WITHDRAW_CREDIT=Credit withdrawal Notify_WITHDRAW_EMIT=Perform withdrawal -Notify_COMPANY_CREATE=Trća stranka kreirana +Notify_COMPANY_CREATE=Treća stranka kreirana Notify_COMPANY_SENTBYMAIL=Mails sent from third party card Notify_BILL_VALIDATE=Customer invoice validated Notify_BILL_UNVALIDATE=Customer invoice unvalidated @@ -246,4 +246,8 @@ WEBSITE_PAGEURL=URL of page WEBSITE_TITLE=Titula WEBSITE_DESCRIPTION=Opis WEBSITE_KEYWORDS=Keywords +<<<<<<< HEAD LinesToImport=Lines to import +======= +LinesToImport=Linija za uvoz +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git diff --git a/htdocs/langs/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang index 65b0a46f87d..1abc7a6b648 100644 --- a/htdocs/langs/bs_BA/projects.lang +++ b/htdocs/langs/bs_BA/projects.lang @@ -226,4 +226,8 @@ 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 +<<<<<<< HEAD SendProjectRef=About project %s +======= +SendProjectRef=O projektu %s +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git diff --git a/htdocs/langs/bs_BA/stocks.lang b/htdocs/langs/bs_BA/stocks.lang index 38403e646ce..9db682cf5b8 100644 --- a/htdocs/langs/bs_BA/stocks.lang +++ b/htdocs/langs/bs_BA/stocks.lang @@ -8,9 +8,17 @@ WarehouseEdit=Modifikovanje skladišta MenuNewWarehouse=Novo skladište WarehouseSource=Izvorno skladište WarehouseSourceNotDefined=Nema definisanog skladišta, +<<<<<<< HEAD AddWarehouse=Create warehouse +======= +AddWarehouse=Napravi skladište +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git AddOne=Dodaj jedno +<<<<<<< HEAD DefaultWarehouse=Default warehouse +======= +DefaultWarehouse=Glavno skladište +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git WarehouseTarget=Ciljano skladište ValidateSending=Obriši slanje CancelSending=Poništi slanje @@ -24,7 +32,11 @@ Movements=Kretanja ErrorWarehouseRefRequired=Referentno ime skladište je potrebno ListOfWarehouses=Lista skladišta ListOfStockMovements=Lista kretanja zaliha +<<<<<<< HEAD ListOfInventories=List of inventories +======= +ListOfInventories=Spisak inventara +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git MovementId=Movement ID StockMovementForId=Movement ID %d ListMouvementStockProject=List of stock movements associated to project @@ -161,7 +173,7 @@ inventoryCreatePermission=Create new inventory inventoryReadPermission=View inventories inventoryWritePermission=Update inventories inventoryValidatePermission=Validate inventory -inventoryTitle=Inventory +inventoryTitle=Inventar inventoryListTitle=Inventories inventoryListEmpty=No inventory in progress inventoryCreateDelete=Create/Delete inventory @@ -177,7 +189,7 @@ inventoryMvtStock=By inventory inventoryWarningProductAlreadyExists=This product is already into list SelectCategory=Category filter SelectFournisseur=Supplier filter -inventoryOnDate=Inventory +inventoryOnDate=Inventar INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement have date of inventory diff --git a/htdocs/langs/bs_BA/withdrawals.lang b/htdocs/langs/bs_BA/withdrawals.lang index ff670b631b4..7c60c9af042 100644 --- a/htdocs/langs/bs_BA/withdrawals.lang +++ b/htdocs/langs/bs_BA/withdrawals.lang @@ -100,7 +100,11 @@ DirectDebitOrderCreated=Direct debit order %s created AmountRequested=Amount requested SEPARCUR=SEPA CUR SEPAFRST=SEPA FRST +<<<<<<< HEAD ExecutionDate=Execution date +======= +ExecutionDate=Datum izvršenja +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git CreateForSepa=Create direct debit file ### Notifications diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang index ba6ffcf42ad..dd7fb9db672 100644 --- a/htdocs/langs/ca_ES/accountancy.lang +++ b/htdocs/langs/ca_ES/accountancy.lang @@ -234,7 +234,11 @@ AccountingJournal=Diari comptable NewAccountingJournal=Nou diari comptable ShowAccoutingJournal=Mostrar diari comptable Nature=Caràcter +<<<<<<< HEAD AccountingJournalType1=Miscellaneous operations +======= +AccountingJournalType1=Operacions diverses +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git AccountingJournalType2=Vendes AccountingJournalType3=Compres AccountingJournalType4=Banc diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang index 2b3aab45d9b..c9649df73f0 100644 --- a/htdocs/langs/ca_ES/admin.lang +++ b/htdocs/langs/ca_ES/admin.lang @@ -470,7 +470,11 @@ WatermarkOnDraftExpenseReports=Marca d'aigua en informes de despeses esborrany AttachMainDocByDefault=Establiu-lo a 1 si voleu adjuntar el document principal al correu electrònic de manera predeterminada (si escau) FilesAttachedToEmail=Adjuntar fitxer SendEmailsReminders=Enviar recordatoris d'agenda per correu electrònic +<<<<<<< HEAD davDescription=Add a component to be a DAV server +======= +davDescription=Afegeix un component per ser un servidor DAV +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git # Modules Module0Name=Usuaris i grups Module0Desc=Gestió d'usuaris / empleats i grups @@ -838,11 +842,21 @@ Permission1251=Llançar les importacions en massa a la base de dades (càrrega d Permission1321=Exporta factures de clients, atributs i cobraments Permission1322=Reobrir una factura pagada Permission1421=Exporta comandes de clients i atributs +<<<<<<< HEAD Permission20001=Read leave requests (your leaves and the one of your subordinates) Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates) +======= +Permission20001=Consulta els dies de lliure disposició (els propis i els dels teus subordinats) +Permission20002=Crea/modifica els teus dies de lliure disposició (els propis i els dels teus subordinats) +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git Permission20003=Elimina les peticions de dies lliures retribuïts +<<<<<<< HEAD Permission20004=Read all leave requests (even of user not subordinates) Permission20005=Create/modify leave requests for everybody (even of user not subordinates) +======= +Permission20004=Consulta tots els dies de lliure disposició (inclòs els usuaris no subordinats) +Permission20005=Crea/modifica els dies de lliure disposició per tothom (inclòs els usuaris no subordinats) +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git Permission20006=Administra els dies de lliure disposició (configura i actualitza el balanç) Permission23001=Consulta les tasques programades Permission23002=Crear/Modificar les tasques programades @@ -1448,9 +1462,15 @@ SyslogFilename=Nom i ruta de l'arxiu YouCanUseDOL_DATA_ROOT=Utilitza DOL_DATA_ROOT/dolibarr.log per un fitxer de registre en la carpeta documents de Dolibarr. Tanmateix, es pot definir una carpeta diferent per guardar aquest fitxer. ErrorUnknownSyslogConstant=La constant %s no és una constant syslog coneguda OnlyWindowsLOG_USER=Windows només suporta LOG_USER +<<<<<<< HEAD CompressSyslogs=Syslog files compression and backup SyslogFileNumberOfSaves=Còpies del log ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency +======= +CompressSyslogs=Compressió i còpia de seguretat d'arxius Syslog +SyslogFileNumberOfSaves=Còpies del log +ConfigureCleaningCronjobToSetFrequencyOfSaves=Configura la tasca programada de neteja per establir la freqüència de còpia de seguretat del registre +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git ##### Donations ##### DonationsSetup=Configuració del mòdul donacions DonationsReceiptModel=Plantilla de rebut de donació @@ -1547,11 +1567,19 @@ FailedToInitializeMenu=Error al inicialitzar el menú ##### Tax ##### TaxSetup=Configuració del mòdul d'impostos varis i dividends OptionVatMode=Opció de càrrega d'IVA +<<<<<<< HEAD OptionVATDefault=Standard basis +======= +OptionVATDefault=Base estàndard +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git OptionVATDebitOption=Dèbit OptionVatDefaultDesc=La càrrega de l'IVA és:
-en l'enviament dels béns (en la pràctica s'usa la data de la factura)
-sobre el pagament pels serveis OptionVatDebitOptionDesc=La càrrega de l'IVA és:
-en l'enviament dels béns en la pràctica s'usa la data de la factura
-sobre la facturació dels serveis +<<<<<<< HEAD OptionPaymentForProductAndServices=Cash basis for products and services +======= +OptionPaymentForProductAndServices=Base de caixa de productes i serveis +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git OptionPaymentForProductAndServicesDesc=VAT is due:
- on payment for goods
- on payments for services SummaryOfVatExigibilityUsedByDefault=Moment d'exigibilitat per defecte l'IVA per a l'opció escollida: OnDelivery=Al lliurament @@ -1730,7 +1758,11 @@ MailToSendContract=Per a enviar un contracte MailToThirdparty=Per enviar correu electrònic des de la pàgina del tercer MailToMember=Enviar correu electrònic des de la pàgina del membre MailToUser=Enviar correu electrònic des de la pàgina d'usuari +<<<<<<< HEAD MailToProject= To send email from project page +======= +MailToProject= Enviar correu electrònic des de la pàgina de projecte +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git ByDefaultInList=Mostra per defecte en la vista del llistat YouUseLastStableVersion=Estàs utilitzant l'última versió estable TitleExampleForMajorRelease=Exemple de missatge que es pot utilitzar per anunciar aquesta actualització de versió (ets lliure d'utilitzar-ho a les teves webs) @@ -1779,7 +1811,11 @@ MAIN_PDF_MARGIN_TOP=Marge superior al PDF MAIN_PDF_MARGIN_BOTTOM=Marge inferior al PDF SetToYesIfGroupIsComputationOfOtherGroups=Estableixi a SÍ si aquest grup és un càlcul d'altres grups EnterCalculationRuleIfPreviousFieldIsYes=Introduïu la regla de càlculs si el camp anterior ha estat posat a SÍ (Per exemple 'CODEGRP1 + CODEGRP2') +<<<<<<< HEAD SeveralLangugeVariatFound=Several language variants found +======= +SeveralLangugeVariatFound=S'ha trobat diverses variants d'idiomes +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git WebDavServer=URL of %s server : %s ##### Resource #### ResourceSetup=Configuració del mòdul Recurs diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang index a780879f865..220d5a62766 100644 --- a/htdocs/langs/ca_ES/bills.lang +++ b/htdocs/langs/ca_ES/bills.lang @@ -348,10 +348,17 @@ NextDateToExecution=Data de la propera generació de factures NextDateToExecutionShort=Data següent gen. DateLastGeneration=Data de l'última generació DateLastGenerationShort=Data última gen. +<<<<<<< HEAD MaxPeriodNumber=Max number of invoice generation NbOfGenerationDone=Number of invoice generation already done NbOfGenerationDoneShort=Number of generation done MaxGenerationReached=Maximum number of generations reached +======= +MaxPeriodNumber=Número màxim de generació de factures +NbOfGenerationDone=Número de generació de factura ja realitzat +NbOfGenerationDoneShort=Número de generació realitzat +MaxGenerationReached=Número màxim de generacions aconseguides +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git InvoiceAutoValidate=Valida les factures automàticament GeneratedFromRecurringInvoice=Generat des de la plantilla de factura recurrent %s DateIsNotEnough=Encara no s'ha arribat a la data diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang index d6d14deb6b5..684b87aa3f5 100644 --- a/htdocs/langs/ca_ES/companies.lang +++ b/htdocs/langs/ca_ES/companies.lang @@ -267,23 +267,40 @@ Prospect=Client potencial CustomerCard=Fitxa client Customer=Client CustomerRelativeDiscount=Descompte client relatiu +<<<<<<< HEAD SupplierRelativeDiscount=Relative supplier discount +======= +SupplierRelativeDiscount=Descompte relatiu de proveïdor +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git CustomerRelativeDiscountShort=Descompte relatiu CustomerAbsoluteDiscountShort=Descompte fixe CompanyHasRelativeDiscount=Aquest client té un descompte per defecte de %s%% CompanyHasNoRelativeDiscount=Aquest client no té descomptes relatius per defecte HasRelativeDiscountFromSupplier=You have a default discount of %s%% from this supplier +<<<<<<< HEAD HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier +======= +HasNoRelativeDiscountFromSupplier=No tens descomptes relatius per defecte d'aquest proveïdor +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git CompanyHasAbsoluteDiscount=Aquest client té descomptes disponibles (notes de crèdit o bestretes) per %s %s CompanyHasDownPaymentOrCommercialDiscount=Aquest client té un descompte disponible (comercial, de pagament) per a %s%s CompanyHasCreditNote=Aquest client encara té abonaments per %s %s +<<<<<<< HEAD HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier +======= +HasNoAbsoluteDiscountFromSupplier=No tens crèdit disponible per descomptar d'aquest proveïdor +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for %s %s from this supplier HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for %s %s from this supplier HasCreditNoteFromSupplier=You have credit notes for %s %s from this supplier CompanyHasNoAbsoluteDiscount=Aquest client no té més descomptes fixos disponibles +<<<<<<< HEAD CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users) CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself) +======= +CustomerAbsoluteDiscountAllUsers=Descomptes absoluts dels clients (concedits per tots els usuaris) +CustomerAbsoluteDiscountMy=Descomptes absoluts dels clients (concedits per tu mateix) +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users) SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself) DiscountNone=Cap @@ -390,7 +407,11 @@ NoDolibarrAccess=Sense accés d'usuari ExportDataset_company_1=Tercers (empreses/entitats/persones físiques) i propietats ExportDataset_company_2=Contactes de tercers i atributs ImportDataset_company_1=Tercers (empreses/entitats/persones físiques) i propietats +<<<<<<< HEAD ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes +======= +ImportDataset_company_2=Contactes/Adreces (de tercers o no) i atributs +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git ImportDataset_company_3=Comptes bancaris de tercers ImportDataset_company_4=Tercers/Comercials (Assigna usuaris comercials a tercers) PriceLevel=Nivell de preus diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang index 1ff1d21c026..c6a94b93fb1 100644 --- a/htdocs/langs/ca_ES/compta.lang +++ b/htdocs/langs/ca_ES/compta.lang @@ -169,9 +169,15 @@ LT1ReportByCustomers=Report tax 2 by third party LT2ReportByCustomers=Report tax 3 by third party LT1ReportByCustomersES=Informe de RE per tercers LT2ReportByCustomersES=Informe per tercer del IRPF +<<<<<<< HEAD VATReport=Sale tax report VATReportByPeriods=Sale tax report by period VATReportByCustomers=Sale tax report by customer +======= +VATReport=Informe d'IVA de vendes +VATReportByPeriods=Sale tax report by period +VATReportByCustomers=Informe d'IVA sobre vendes per client +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git VATReportByCustomersInInputOutputMode=Informe per clients d'IVA cobrat i pagat VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid LT1ReportByQuarters=Report tax 2 by rate diff --git a/htdocs/langs/ca_ES/cron.lang b/htdocs/langs/ca_ES/cron.lang index f6815f7a4ad..243a8302d80 100644 --- a/htdocs/langs/ca_ES/cron.lang +++ b/htdocs/langs/ca_ES/cron.lang @@ -43,7 +43,11 @@ CronNoJobs=Sense treballs actualment CronPriority=Prioritat CronLabel=Etiqueta CronNbRun=Nº execucions +<<<<<<< HEAD CronMaxRun=Max number launch +======= +CronMaxRun=Número màxim d'execucions +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git CronEach=Tota (s) JobFinished=Tasques llançades i finalitzades #Page card diff --git a/htdocs/langs/ca_ES/holiday.lang b/htdocs/langs/ca_ES/holiday.lang index d0a062b1b82..f24eaf1d822 100644 --- a/htdocs/langs/ca_ES/holiday.lang +++ b/htdocs/langs/ca_ES/holiday.lang @@ -39,9 +39,15 @@ TypeOfLeaveId=Tipus d'identificador de baixa TypeOfLeaveCode=Tipus de codi de baixa TypeOfLeaveLabel=Tipus d'etiqueta de baixa NbUseDaysCP=Nombre de dies lliures consumits +<<<<<<< HEAD NbUseDaysCPShort=Days consumed NbUseDaysCPShortInMonth=Days consumed in month DateStartInMonth=Start date in month +======= +NbUseDaysCPShort=Dies consumits +NbUseDaysCPShortInMonth=Dies consumits al mes +DateStartInMonth=Data d'inici al mes +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git DateEndInMonth=End date in month EditCP=Modificar DeleteCP=Eliminar @@ -97,7 +103,11 @@ AllHolidays=Totes les sol·licituds de permís HalfDay=Mig dia NotTheAssignedApprover=No sou l'aprovador assignat LEAVE_PAID=Vacances pagades +<<<<<<< HEAD LEAVE_SICK=Sick leave +======= +LEAVE_SICK=Baixa per enfermetat +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git LEAVE_OTHER=Other leave LEAVE_PAID_FR=Vacances pagades ## Configuration du Module ## diff --git a/htdocs/langs/ca_ES/loan.lang b/htdocs/langs/ca_ES/loan.lang index 5458b01f336..a759cfa5cfc 100644 --- a/htdocs/langs/ca_ES/loan.lang +++ b/htdocs/langs/ca_ES/loan.lang @@ -52,4 +52,8 @@ LOAN_ACCOUNTING_ACCOUNT_INTEREST=Compte comptable per al interès per defecte LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Compte comptable de l'assegurança per defecte FinancialCommitment=Financial commitment CreateCalcSchedule=Edit financial commitment +<<<<<<< HEAD InterestAmount=Interest amount +======= +InterestAmount=Import d'interès +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git diff --git a/htdocs/langs/ca_ES/mails.lang b/htdocs/langs/ca_ES/mails.lang index 93b7fe3e0f5..12f60619fa8 100644 --- a/htdocs/langs/ca_ES/mails.lang +++ b/htdocs/langs/ca_ES/mails.lang @@ -78,7 +78,11 @@ ResultOfMailSending=Resultat de l'enviament massiu d'e-mails NbSelected=Nº seleccionats NbIgnored=Nº ignorats NbSent=Nº enviats +<<<<<<< HEAD SentXXXmessages=%s message(s) sent. +======= +SentXXXmessages=%s missatge(s) enviat(s). +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git ConfirmUnvalidateEmailing=Are you sure you want to change email %s to draft status? MailingModuleDescContactsWithThirdpartyFilter=Contacte amb filtres de client MailingModuleDescContactsByCompanyCategory=Contactes per categoria de tercer diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang index c42ba9da1e6..57aeb431d9a 100644 --- a/htdocs/langs/ca_ES/main.lang +++ b/htdocs/langs/ca_ES/main.lang @@ -64,14 +64,22 @@ ErrorNoVATRateDefinedForSellerCountry=Error, cap tipus d'IVA definit per al paí ErrorNoSocialContributionForSellerCountry=Error, cap tipus d'impost varis definit per al país '%s'. ErrorFailedToSaveFile=Error, el registre del fitxer ha fallat. ErrorCannotAddThisParentWarehouse=Està intentant afegir un magatzem pare que ja és fill de l'actual +<<<<<<< HEAD MaxNbOfRecordPerPage=Max number of record per page +======= +MaxNbOfRecordPerPage=Número màxim de registres per pàgina +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git NotAuthorized=No està autoritzat per fer-ho. SetDate=Indica la data SelectDate=Seleccioneu una data SeeAlso=Veure també %s SeeHere=Mira aquí ClickHere=Fes clic aquí +<<<<<<< HEAD Here=Here +======= +Here=Aquí +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git Apply=Aplicar BackgroundColorByDefault=Color de fons FileRenamed=L'arxiu s'ha renombrat correctament @@ -328,7 +336,11 @@ Default=Defecte DefaultValue=Valor per defecte DefaultValues=Valors per defecte Price=Preu +<<<<<<< HEAD PriceCurrency=Price (currency) +======= +PriceCurrency=Preu (moneda) +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git UnitPrice=Preu unitari UnitPriceHT=Preu base UnitPriceHTCurrency=Unit price (net) (currency) @@ -438,7 +450,11 @@ ActionsOnMember=Esdeveniments d'aquest soci ActionsOnProduct=Esdeveniments sobre aquest producte NActionsLate=%s en retard ToDo=A realitzar +<<<<<<< HEAD Completed=Completed +======= +Completed=Finalitzat +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git Running=En progrés RequestAlreadyDone=Sol·licitud ja recollida Filter=Filtre @@ -866,7 +882,11 @@ FileNotShared=Fitxer no compartit amb el públic extern Project=Projecte Projects=Projectes Rights=Permisos +<<<<<<< HEAD LineNb=Line no. +======= +LineNb=Núm. línia +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git IncotermLabel=Incoterms # Week day Monday=Dilluns @@ -933,11 +953,20 @@ CommentDeleted=Comentari suprimit Everybody=Projecte compartit PayedBy=Pagat per PayedTo=Pagat a +<<<<<<< HEAD Monthly=Monthly Quarterly=Quarterly Annual=Annual Local=Local Remote=Remote LocalAndRemote=Local and Remote +======= +Monthly=Mensual +Quarterly=Trimestral +Annual=Anual +Local=Local +Remote=Remot +LocalAndRemote=Local i remota +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git KeyboardShortcut=Keyboard shortcut AssignedTo=Assignada a diff --git a/htdocs/langs/ca_ES/members.lang b/htdocs/langs/ca_ES/members.lang index 2c8f350545d..050d74521bd 100644 --- a/htdocs/langs/ca_ES/members.lang +++ b/htdocs/langs/ca_ES/members.lang @@ -117,7 +117,11 @@ SendingEmailOnCancelation=Sending email on cancelation YourMembershipRequestWasReceived=Your membership was received. YourMembershipWasValidated=Your membership was validated YourSubscriptionWasRecorded=Your new subscription was recorded +<<<<<<< HEAD SubscriptionReminderEmail=Subscription reminder +======= +SubscriptionReminderEmail=Recordatori de subscripció +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git YourMembershipWasCanceled=Your membership was canceled CardContent=Contingut de la seva fitxa de soci # Text of email templates diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang index 3f968449ad6..d410724304e 100644 --- a/htdocs/langs/ca_ES/other.lang +++ b/htdocs/langs/ca_ES/other.lang @@ -246,4 +246,8 @@ WEBSITE_PAGEURL=URL de pàgina WEBSITE_TITLE=Títol WEBSITE_DESCRIPTION=Descripció WEBSITE_KEYWORDS=Paraules clau +<<<<<<< HEAD LinesToImport=Lines to import +======= +LinesToImport=Línies per importar +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang index feded59ec43..b97e5315228 100644 --- a/htdocs/langs/ca_ES/projects.lang +++ b/htdocs/langs/ca_ES/projects.lang @@ -140,7 +140,11 @@ ProjectReportDate=Canvia les dates de les tasques en funció de la nova data d'i ErrorShiftTaskDate=S'ha produït un error en el canvi de les dates de les tasques ProjectsAndTasksLines=Projectes i tasques ProjectCreatedInDolibarr=Projecte %s creat +<<<<<<< HEAD ProjectValidatedInDolibarr=Project %s validated +======= +ProjectValidatedInDolibarr=Projecte %s validat +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git ProjectModifiedInDolibarr=Projecte %s modificat TaskCreatedInDolibarr=La tasca %s a sigut creada TaskModifiedInDolibarr=La tasca %s a sigut modificada @@ -225,5 +229,10 @@ AllowCommentOnTask=Permet comentaris dels usuaris a les tasques AllowCommentOnProject=Permetre comentaris dels usuaris als projectes DontHavePermissionForCloseProject=You do not have permissions to close the project %s DontHaveTheValidateStatus=The project %s must be open to be closed +<<<<<<< HEAD RecordsClosed=%s project(s) closed SendProjectRef=About project %s +======= +RecordsClosed=%s projecte(s) tancat(s) +SendProjectRef=Sobre el projecte %s +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git diff --git a/htdocs/langs/ca_ES/salaries.lang b/htdocs/langs/ca_ES/salaries.lang index 9de2324c398..fb0315b9f84 100644 --- a/htdocs/langs/ca_ES/salaries.lang +++ b/htdocs/langs/ca_ES/salaries.lang @@ -15,4 +15,8 @@ THMDescription=Aquest valor es pot utilitzar per calcular el cost del temps cons TJMDescription=Aquest valor només és informatiu i no s'utilitza en cap càlcul LastSalaries=Últims %s pagaments de salari AllSalaries=Tots els pagaments de salari +<<<<<<< HEAD SalariesStatistics=Statistiques salaires +======= +SalariesStatistics=Estadistiques de salaris +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git diff --git a/htdocs/langs/ca_ES/stocks.lang b/htdocs/langs/ca_ES/stocks.lang index ecaaa5beceb..48ca7fd499d 100644 --- a/htdocs/langs/ca_ES/stocks.lang +++ b/htdocs/langs/ca_ES/stocks.lang @@ -8,9 +8,17 @@ WarehouseEdit=Edició magatzem MenuNewWarehouse=Nou magatzem WarehouseSource=Magatzem origen WarehouseSourceNotDefined=Sense magatzems definits, +<<<<<<< HEAD AddWarehouse=Create warehouse +======= +AddWarehouse=Crea un magatzem +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git AddOne=Afegir un +<<<<<<< HEAD DefaultWarehouse=Default warehouse +======= +DefaultWarehouse=Magatzem predeterminat +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git WarehouseTarget=Magatzem destinació ValidateSending=Elimina l'enviament CancelSending=Cancel·la l'enviament @@ -24,7 +32,11 @@ Movements=Moviments ErrorWarehouseRefRequired=El nom de referència del magatzem és obligatori ListOfWarehouses=Llistat de magatzems ListOfStockMovements=Llistat de moviments de estoc +<<<<<<< HEAD ListOfInventories=List of inventories +======= +ListOfInventories=Llista d'inventaris +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git MovementId=ID del moviment StockMovementForId=ID de moviment %d ListMouvementStockProject=Llista de moviments d'estoc associats al projecte diff --git a/htdocs/langs/ca_ES/stripe.lang b/htdocs/langs/ca_ES/stripe.lang index 71ba200bb44..4fea61fd51a 100644 --- a/htdocs/langs/ca_ES/stripe.lang +++ b/htdocs/langs/ca_ES/stripe.lang @@ -47,6 +47,7 @@ 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 +<<<<<<< HEAD StripeAccount=Stripe account StripeChargeList=List of Stripe charges StripeTransactionList=List of Stripe transactions @@ -63,3 +64,21 @@ ConfirmDeleteCard=Are you sure you want to delete this Card record? CreateCustomerOnStripe=Create customer on Stripe CreateCardOnStripe=Create card on Stripe ShowInStripe=Show in Stripe +======= +StripeAccount=Compte de Stripe +StripeChargeList=Llista de càrregues de Stripe +StripeTransactionList=Llista de transaccions de Stripe +StripeCustomerId=ID de client de Stripe +StripePaymentModes=Formes de pagament de Stripe +LocalID=ID local +StripeID=ID de Stripe +NameOnCard=Nom a la targeta +CardNumber=Número de targeta +ExpiryDate=Data de caducitat +CVN=CVN +DeleteACard=Delete Card record +ConfirmDeleteCard=Estàs segur que vols eliminar aquest registre de la targeta? +CreateCustomerOnStripe=Crea un client a Stripe +CreateCardOnStripe=Crea una targeta a Stripe +ShowInStripe=Mostra a Stripe +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git diff --git a/htdocs/langs/ca_ES/website.lang b/htdocs/langs/ca_ES/website.lang index 17dbd595ffe..1c18f49dbe7 100644 --- a/htdocs/langs/ca_ES/website.lang +++ b/htdocs/langs/ca_ES/website.lang @@ -40,7 +40,11 @@ SetHereVirtualHost=Si pots crear, al teu servidor web (Apache, Nginx...), un Hos YouCanAlsoTestWithPHPS=En l'entorn de desenvolupament, és possible que preferiu provar el lloc amb el servidor web incrustat de PHP (requereix PHP 5.5) executant-se
php -S 0.0.0.0:8080 -t %s CheckVirtualHostPerms=Check also that virtual host has permission %s on files into
%s ReadPerm=Llegit +<<<<<<< HEAD WritePerm=Write +======= +WritePerm=Escriu +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git PreviewSiteServedByWebServer=
  • Vista prèvia %s en una nova pestanya.


    • El %s serà servit per un servidor web extern (com ara Apache, Nginx, IIS). Heu d'instal·lar i configurar aquest servidor abans d'apuntar al directori:
    %s
    URL servit per un servidor extern:
    %s
    PreviewSiteServedByDolibarr= Previsualitza %s en una nova pestanya.

    El servidor %s serà servit pel servidor Dolibarr d'aquesta manera no es necessita instal·la cap servidor web addicional (com ara Apache, Nginx, IIS).
    L'inconvenient és que l'URL de les pàgines no son amigables i començen per la ruta del vostre Dolibarr.
    URL servit per Dolibarr:
    %s

    Per utilitzar el vostre propi servidor web extern per a servir a aquest lloc web, creeu un amfitrió ('host') virtual al vostre servidor web que apunti al directori
    %s
    , llavors introduïu el nom d'aquest servidor virtual i feu clic a l'altre botó de vista prèvia (botó de 'preview'). VirtualHostUrlNotDefined=No s'ha definit la URL de l'amfitrió virtual que serveix el servidor web extern diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang index 8b9fa906494..37afcba976a 100644 --- a/htdocs/langs/ca_ES/withdrawals.lang +++ b/htdocs/langs/ca_ES/withdrawals.lang @@ -100,7 +100,11 @@ DirectDebitOrderCreated=S'ha creat l'ordre de domiciliació bancària %s AmountRequested=Quantitat sol·licitada SEPARCUR=SEPA CUR SEPAFRST=SEPA FRST +<<<<<<< HEAD ExecutionDate=Execution date +======= +ExecutionDate=Data d'execució +>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git CreateForSepa=Create direct debit file ### Notifications