From 6d72dd69fdf627ae4182af50b50412795c1a6a01 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 16 Mar 2024 22:59:27 +0000 Subject: [PATCH 1/7] Bump follow-redirects from 1.15.4 to 1.15.6 in /client Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.4 to 1.15.6. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.4...v1.15.6) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] --- client/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index ab949b0..d58b5e3 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -5699,9 +5699,9 @@ } }, "node_modules/follow-redirects": { - "version": "1.15.4", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", - "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", "funding": [ { "type": "individual", From 23f67b6739c63c207303193f318e3893e61a2ecd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Mar 2024 02:53:53 +0000 Subject: [PATCH 2/7] Bump express from 4.18.2 to 4.19.2 in /client Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](https://github.com/expressjs/express/compare/4.18.2...4.19.2) --- updated-dependencies: - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] --- client/package-lock.json | 55 ++++++---------------------------------- 1 file changed, 8 insertions(+), 47 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index ab949b0..76f8463 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -4352,9 +4352,9 @@ "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==" }, "node_modules/cookie": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", - "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", "dev": true, "engines": { "node": ">= 0.6" @@ -5172,17 +5172,17 @@ "integrity": "sha512-02CGZG9Kduc0l9ErJ5b+99+PjeQIyoeVGz+f7/Yc04V4YKNPbdT63sQqBC5RW05va4w0MZen7pQpf92H3funYw==" }, "node_modules/express": { - "version": "4.18.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", - "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==", + "version": "4.19.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", + "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", "dev": true, "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.1", + "body-parser": "1.20.2", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.5.0", + "cookie": "0.6.0", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", @@ -5213,30 +5213,6 @@ "node": ">= 0.10.0" } }, - "node_modules/express/node_modules/body-parser": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", - "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", - "dev": true, - "dependencies": { - "bytes": "3.1.2", - "content-type": "~1.0.4", - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "on-finished": "2.4.1", - "qs": "6.11.0", - "raw-body": "2.5.1", - "type-is": "~1.6.18", - "unpipe": "1.0.0" - }, - "engines": { - "node": ">= 0.8", - "npm": "1.2.8000 || >= 1.4.16" - } - }, "node_modules/express/node_modules/debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -5273,21 +5249,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/express/node_modules/raw-body": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", - "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", - "dev": true, - "dependencies": { - "bytes": "3.1.2", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "unpipe": "1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, "node_modules/extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", From cc19079bd9a8d56066641062463c59a036f6a64c Mon Sep 17 00:00:00 2001 From: Roberto Besser Date: Wed, 20 Mar 2024 13:01:47 +0100 Subject: [PATCH 3/7] Translated using Weblate (Portuguese) Currently translated at 100.0% (241 of 241 strings) Co-authored-by: Roberto Besser Translate-URL: https://hosted.weblate.org/projects/spoolman/web-client/pt/ Translation: Spoolman/Web Client --- client/public/locales/pt/common.json | 80 ++++++++++++++-------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/client/public/locales/pt/common.json b/client/public/locales/pt/common.json index 259ee93..068cebb 100644 --- a/client/public/locales/pt/common.json +++ b/client/public/locales/pt/common.json @@ -90,19 +90,19 @@ "printerMarginTop": "Área Segura Superior" }, "spoolSelect": { - "selectedTotal_one": "{{count}} rolo selecionado", - "selectedTotal_many": "{{count}} rolos selecionados", - "selectedTotal_other": "{{count}} rolos selecionados", - "noSpoolsSelected": "Você não selecionou nenhum rolo.", - "title": "Selecionar Rolos", - "description": "Selecione os rolos para imprimir os códigos QR.", + "selectedTotal_one": "{{count}} carretel selecionado", + "selectedTotal_many": "{{count}} carretéis selecionados", + "selectedTotal_other": "{{count}} carretéis selecionados", + "noSpoolsSelected": "Você não selecionou nenhum carretel.", + "title": "Selecionar Carretéis", + "description": "Selecione os carretéis para imprimir os códigos QR.", "showArchived": "Mostrar Arquivado", "selectAll": "Selecionar/Desmarcar Tudo" }, "qrcode": { "title": "Imprimindo Códigos QR", "button": "Imprimir Códigos QR", - "spoolWeight": "Peso do Rolo: {{weight}}", + "spoolWeight": "Peso do Carretel: {{weight}}", "lotNr": "Número do Lote: {{lot}}", "bedTemp": "Temperatura da Mesa: {{temp}}", "extruderTemp": "Temperatura do Bico: {{temp}}", @@ -111,9 +111,9 @@ "showVendor": "Fornecedor", "showContent": "Imprimir Etiqueta", "showLotNr": "Número do Lote", - "showSpoolWeight": "Peso do Rolo", + "showSpoolWeight": "Peso do Carretel", "showTemperatures": "Temperaturas", - "showSpoolComment": "Comentário sobre o Rolo", + "showSpoolComment": "Comentário sobre o Carretel", "showFilamentComment": "Comentário sobre o Filamento", "showVendorComment": "Comentário sobre o Fornecedor" } @@ -140,31 +140,31 @@ "price": "Preço" }, "fields_help": { - "weight_to_use": "Selecione qual valor de peso inserir. O peso medido só estará disponível se o peso do rolo estiver definido para o filamento selecionado.", - "lot_nr": "Número de lote do fabricante. Pode ser usado para garantir que uma impressão tenha cores consistentes se vários rolos forem usados.", - "used_weight": "Quanto filamento foi usado do rolo. Um novo rolo deve ter 0gr usado.", - "remaining_weight": "Quanto filamento resta no rolo. Para um rolo novo, isso deve corresponder ao peso do rolo.", - "measured_weight": "Quanto pesa o filamento e o rolo.", - "location": "Onde o rolo está localizado se você tiver vários locais onde armazena seus rolos.", - "price": "Preço de um rolo completo na moeda definida no sistema. Se não for definido, o preço do filamento será presumido." + "weight_to_use": "Selecione qual valor de peso inserir. O peso medido só estará disponível se o peso do carretel estiver definido para o filamento selecionado.", + "lot_nr": "Número de lote do fabricante. Pode ser usado para garantir que uma impressão tenha cores consistentes se vários carretéis forem usados.", + "used_weight": "Quanto filamento foi usado do carretel. Um novo carretel deve ter 0gr usado.", + "remaining_weight": "Quanto filamento resta no carretel. Para um carretel novo, isso deve corresponder ao peso do carretel.", + "measured_weight": "Quanto pesa o filamento e o carretel.", + "location": "Onde o carretel está localizado se você tiver vários locais onde armazena seus carretéis.", + "price": "Preço de um carretel completo na moeda definida no sistema. Se não for definido, o preço do filamento será presumido." }, "titles": { - "create": "Criar Rolo", - "clone": "Clonar Rolo", - "edit": "Editar Rolo", - "list": "Rolos", - "show": "Mostrar Rolo", - "show_title": "[Rolo #{{id}}] {{name}}", - "archive": "Arquivar Rolo" + "create": "Criar Carretel", + "clone": "Clonar Carretel", + "edit": "Editar Carretel", + "list": "Carretéis", + "show": "Mostrar Carretel", + "show_title": "[Carretel #{{id}}] {{name}}", + "archive": "Arquivar Carretel" }, "form": { "new_location_prompt": "Insira um novo local", - "spool_updated": "Este rolo foi atualizado por alguém desde que você abriu esta página. Salvar substituirá essas alterações!" + "spool_updated": "Este carretel foi atualizado por alguém desde que você abriu esta página. Salvar substituirá essas alterações!" }, "messages": { - "archive": "Tem certeza de que deseja arquivar este rolo?" + "archive": "Tem certeza de que deseja arquivar este carretel?" }, - "spool": "Rolos" + "spool": "Carretéis" }, "filament": { "filament": "Filamentos", @@ -175,7 +175,7 @@ "price": "Preço", "diameter": "Diâmetro", "weight": "Peso", - "spool_weight": "Peso do Rolo", + "spool_weight": "Peso do Carretel", "article_number": "Número do Artigo", "registered": "Registrado", "vendor": "Fornecedor", @@ -185,15 +185,15 @@ "settings_extruder_temp": "Temperatura do Bico", "settings_bed_temp": "Temperatura da Mesa", "color_hex": "Cor", - "spools": "Mostrar Rolos" + "spools": "Mostrar Carretéis" }, "fields_help": { "article_number": "Por exemplo EAN, UPC, etc.", - "price": "Preço de um rolo completo.", + "price": "Preço de um carretel completo.", "name": "Nome do filamento, para distinguir este tipo de filamento entre outros do mesmo fornecedor. Deve conter a cor, por exemplo.", "material": "Por exemplo PLA, ABS, PETG, etc.", - "weight": "O peso do filamento de um rolo cheio (peso líquido). Isso não deve incluir o peso do rolo em si, apenas o filamento. É o que normalmente está escrito na embalagem.", - "spool_weight": "O peso de um rolo vazio. Usado para determinar o peso medido de um rolo." + "weight": "O peso do filamento de um carretel cheio (peso líquido). Isso não deve incluir o peso do carretel em si, apenas o filamento. É o que normalmente está escrito na embalagem.", + "spool_weight": "O peso de um carretel vazio. Usado para determinar o peso medido de um carretel." }, "titles": { "create": "Criar Filamento", @@ -207,7 +207,7 @@ "filament_updated": "Este filamento foi atualizado por alguém desde que você abriu esta página. Salvar substituirá essas alterações!" }, "buttons": { - "add_spool": "Adicionar Rolo" + "add_spool": "Adicionar Carretel" } }, "vendor": { @@ -237,10 +237,10 @@ "help": "Ajuda", "resources": { "filament": "Marcas de filamento. Eles têm propriedades como nome, material, cor, diâmetro e muito mais.", - "spool": "Rolos físicos individuais de um filamento específico.", + "spool": "Carretéis físicos individuais de um filamento específico.", "vendor": "As empresas que fabricam o filamento." }, - "description": "Ajuda

Aqui estão algumas dicas para você começar.

O Spoolman contém três tipos diferentes de dados:

Para adicionar um novo rolo para o banco de dados, comece criando um Filamento. Feito isso, prossiga para criar um Rolo para esse rolo específico. Se você adquirir rolos adicionais do mesmo filamento posteriormente, simplesmente gere Rolos adicionais e reutilize o mesmo objeto Filamento.

Opcionalmente, você também pode criar um Fornecedor para a empresa que fabrica o filamento, se desejar rastrear essas informações.

Você tem a opção de vincular outros serviços de impressora 3D ao Spoolman, como o Moonraker, que pode monitorar automaticamente o uso do filamento e atualizar os rolos para você. Consulte o README do Spoolman para obter orientação sobre como configurar isso.

" + "description": "Ajuda

Aqui estão algumas dicas para você começar.

O Spoolman contém três tipos diferentes de dados:

Para adicionar um novo carretel para o banco de dados, comece criando um Filamento. Feito isso, prossiga para criar um Carretel para esse carretel específico. Se você adquirir carretéis adicionais do mesmo filamento posteriormente, simplesmente gere Carretéis adicionais e reutilize o mesmo objeto Filamento.

Opcionalmente, você também pode criar um Fornecedor para a empresa que fabrica o filamento, se desejar rastrear essas informações.

Você tem a opção de vincular outros serviços de impressora 3D ao Spoolman, como o Moonraker, que pode monitorar automaticamente o uso do filamento e atualizar os carretéis para você. Consulte o README do Spoolman para obter orientação sobre como configurar isso.

" }, "documentTitle": { "suffix": " | Spoolman", @@ -258,11 +258,11 @@ "clone": "#{{id}} Clonar filamento | Spoolman" }, "spool": { - "list": "Rolos | Spoolman", - "show": "#{{id}} Mostrar Rolo | Spoolman", - "edit": "#{{id}} Editar Rolo | Spoolman", - "create": "Criar Rolo | Spoolman", - "clone": "#{{id}} Clonar Rolo | Spoolman" + "list": "Carretéis | Spoolman", + "show": "#{{id}} Mostrar Carretel | Spoolman", + "edit": "#{{id}} Editar Carretel | Spoolman", + "create": "Criar Carretel | Spoolman", + "clone": "#{{id}} Clonar Carretel | Spoolman" }, "vendor": { "show": "#{{id}} Mostrar Fornecedor | Spoolman", @@ -276,7 +276,7 @@ "no": "Não", "scanner": { "title": "Leitor de Código QR", - "description": "Digitalize um código QR do Spoolman para ver detalhes sobre o rolo.", + "description": "Digitalize um código QR do Spoolman para ver detalhes sobre o carretel.", "error": { "notAllowed": "Você não deu permissão de acesso à câmera.", "insecureContext": "A página não é protegida por HTTPS.", From a49f150560a4364ee8e7e3c1c26810bca6d3c07e Mon Sep 17 00:00:00 2001 From: Karter87 Date: Wed, 20 Mar 2024 13:01:47 +0100 Subject: [PATCH 4/7] Translated using Weblate (Dutch) Currently translated at 100.0% (241 of 241 strings) Co-authored-by: Karter87 Translate-URL: https://hosted.weblate.org/projects/spoolman/web-client/nl/ Translation: Spoolman/Web Client --- client/public/locales/nl/common.json | 42 ++++++++++++++-------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/client/public/locales/nl/common.json b/client/public/locales/nl/common.json index a9ababf..85b452a 100644 --- a/client/public/locales/nl/common.json +++ b/client/public/locales/nl/common.json @@ -9,16 +9,16 @@ "showArchived": "Gearchiveerd tonen", "archive": "Archiveren", "hideColumns": "Kolommen verbergen", - "confirm": "Weet je het zeker?", + "confirm": "Weet u het zeker?", "delete": "Verwijderen", "undo": "Ongedaan maken", "import": "Importeren", "logout": "Uitloggen", "refresh": "Vernieuwen", - "notAccessTitle": "Je hebt geen toegang tot", + "notAccessTitle": "U heeft geen toegang tot", "hideArchived": "Gearchiveerd verbergen", "clearFilters": "Filters leegmaken", - "unArchive": "Dearchiveren", + "unArchive": "Terugzetten", "clone": "Klonen", "clear": "Wissen", "saveAndAdd": "Opslaan en Toevoegen" @@ -39,10 +39,10 @@ "helpPrinterMargin": "Safe-Zone moet worden ingesteld op hoe dicht bij de papierrand uw printer kan afdrukken. Als u deze wijzigt, heeft dit geen invloed op het hele raster.", "previewScale": "Voorbeeldschaal", "helpMargin": "Marges moeten worden geconfigureerd zodat ze overeenkomen met je labelpapier en printer. Als u deze wijzigt, heeft dit invloed op de grootte van het hele raster.", - "skipItems": "Items overlaan", + "skipItems": "Items overslaan", "paperSize": "Papierformaat", "columns": "Kolommen", - "description": "Stem de onderstaande instellingen af om de gewenste printlay-out te krijgen. Houd er rekening mee dat printers en je besturingssysteem hun eigen marges en schaling kunnen toepassen, dus het kan zijn dat je met wat instellingen moet spelen voordat alles correct is. Test het op een stuk gewoon papier voordat u op de daadwerkelijke etiketten afdrukt.", + "description": "Stem de onderstaande instellingen af om de gewenste print lay-out te krijgen. Houd er rekening mee dat printers en je besturingssysteem hun eigen marges en schaling kunnen toepassen, dus het kan zijn dat je met wat instellingen moet spelen voordat alles correct is. Test het op een stuk gewoon papier voordat u op de daadwerkelijke etiketten afdrukt.", "showBorder": "Rand tonen", "dimensions": "Afmetingen", "print": "Printen", @@ -75,9 +75,9 @@ "textSize": "Inhoud tekstgrootte", "title": "QR-Code afdrukken", "showSpoolmanIcon": "Spoolman icoon tonen", - "showLotNr": "Lotnr", + "showLotNr": "Lotnummer", "bedTemp": "BT: {{temp}}", - "lotNr": "Lotnr: {{lot}}", + "lotNr": "Lotnummer: {{lot}}", "showFilamentComment": "Opmerking filament", "button": "QR-Codes afdrukken" }, @@ -87,15 +87,15 @@ "description": "Selecteer spoelen waarvoor je QR-codes wilt afdrukken.", "showArchived": "Gearchiveerde tonen", "title": "Spoelen selecteren", - "selectAll": "Alles selecteren/deselecteren", - "noSpoolsSelected": "Je hebt geen spoelen geselecteerd." + "selectAll": "Alles (de)selecteren", + "noSpoolsSelected": "U heeft geen spoelen geselecteerd." } }, "notifications": { "deleteSuccess": "{{resource}} succesvol verwijderd", "error": "Fout (fout code {{statusCode}})", "editError": "Fout opgetreden bij het bewerken van {{resource}} (status code {{statusCode}})", - "undoable": "Je hebt {{seconds}} seconden om ongedaan te maken.", + "undoable": "U heeft {{seconds}} seconden om ongedaan te maken.", "importProgress": "Importeren: {{processed}}/{{total}}", "createError": "Er is een fout opgetreden bij het aanmaken van {{resource}} (status code {{statusCode}})", "success": "Succesvol", @@ -109,7 +109,7 @@ "unknown": "Onbekend", "yes": "Ja", "version": "Versie", - "warnWhenUnsavedChanges": "Weet je zeker dat je wil vertrekken? Er zijn niet-opgeslagen wijzigingen.", + "warnWhenUnsavedChanges": "Weet u zeker dat u deze pagina wilt verlaten? Er zijn niet-opgeslagen wijzigingen.", "loading": "Laden", "dashboard": { "title": "Dashboard" @@ -154,7 +154,7 @@ "last_used": "Laatst gebruikt", "material": "Materiaal", "weight_to_use": "Gewicht", - "lot_nr": "Lotnr", + "lot_nr": "Lotnummer", "filament_name": "Filament", "comment": "Opmerking", "filament": "Filament", @@ -180,16 +180,16 @@ }, "fields_help": { "used_weight": "Hoeveel filament er van de spoel is gebruikt. Op een nieuwe spoel zal 0g gebruikt zijn.", - "weight_to_use": "Selecteer welke gewichtswaarde je wilt invoeren. Het gemeten gewicht is alleen beschikbaar als het spoelgewicht is ingesteld voor het geselecteerde filament.", + "weight_to_use": "Selecteer welke gewichtswaarde u wilt invoeren. Het gemeten gewicht is alleen beschikbaar als het spoelgewicht is ingesteld voor het geselecteerde filament.", "measured_weight": "Hoeveel het filament en de spoel wegen.", "lot_nr": "Lotnummer van de fabrikant. Kan worden gebruikt om ervoor te zorgen dat een afdruk een consistente kleur heeft als er meerdere spoelen worden gebruikt.", "remaining_weight": "Hoeveel filament zit er nog op de spoel. Bij een nieuwe spoel zal dit overeenkomen met het spoelgewicht.", - "location": "Waar de spoel zich bevindt als je meerdere locaties hebt waar je jouw spoelen opslaat.", + "location": "Waar de spoel zich bevindt, wanneer er meerdere opslag locaties zijn.", "price": "Prijs van een volledige spoel. Als dit niet wordt ingevuld, wordt in plaats daarvan uitgegaan van de prijs van het filament." }, "spool": "Spoelen", "messages": { - "archive": "Weet je zeker dat je deze spoel wil archiveren?" + "archive": "Weet u zeker dat u deze spoel wil archiveren?" }, "form": { "new_location_prompt": "Voer een nieuwe locatie in", @@ -221,13 +221,13 @@ "density": "Dichtheid", "id": "ID", "color_hex": "Kleur", - "article_number": "Artiekelnummer", + "article_number": "Artikel nummer", "spools": "Spoelen tonen" }, "titles": { - "clone": "Flimanent klonen", + "clone": "Filament klonen", "show": "Filament tonen", - "create": "Flimament maken", + "create": "Filament maken", "edit": "Filament bewerken", "list": "Filamenten", "show_title": "[Filament #{{id}}] {{name}}" @@ -269,11 +269,11 @@ }, "vendor": "Fabrikanten", "form": { - "vendor_updated": "Deze leverancier is bijgewerkt dor iemand/iets anders sinds je deze pagina geopend hebt. De veranderingen worden overschreven als je opslaat!" + "vendor_updated": "Deze leverancier is bijgewerkt door iemand/iets anders sinds je deze pagina geopend hebt. De veranderingen worden overschreven als je opslaat!" } }, "table": { - "actions": "Akties" + "actions": "Acties" }, "help": { "resources": { @@ -322,7 +322,7 @@ "boolean_false": "Nee", "choices_missing_error": "U kunt geen keuzes verwijderen. De volgende keuzes ontbreken: {{choices}}", "non_unique_key_error": "De key moet uniek zijn.", - "key_not_changed": "Verander de key in iets anders.", + "key_not_changed": "Key niet gewijzigd.", "delete_confirm": "Veld {{name}} verwijderen?", "delete_confirm_description": "Hierdoor worden het veld en alle bijbehorende gegevens voor alle entiteiten verwijderd.", "description": "

Hier kunt u extra aangepaste velden toevoegen aan uw entiteiten.

Zodra een veld is toegevoegd, kunt u de key of het type ervan niet wijzigen, en voor velden met keuzetypes kunt u geen keuzes verwijderen of de meervoudige velden wijzigen. Als u een veld verwijdert, worden de bijbehorende gegevens voor alle entiteiten verwijderd.

De key is hoe andere programma's de gegevens lezen/schrijven, dus of uw aangepaste veld moet worden geïntegreerd met een derde partij programma, zorg ervoor dat u het correct instelt. De standaardwaarde wordt alleen toegepast op nieuwe items.

Extra velden kunnen niet worden gesorteerd of gefilterd in de tabelweergaven.

" From 9dd87049d28a8ee78796af8da94907df760c8db5 Mon Sep 17 00:00:00 2001 From: srbjessen Date: Wed, 20 Mar 2024 13:01:47 +0100 Subject: [PATCH 5/7] Translated using Weblate (Danish) Currently translated at 100.0% (241 of 241 strings) Co-authored-by: srbjessen Translate-URL: https://hosted.weblate.org/projects/spoolman/web-client/da/ Translation: Spoolman/Web Client --- client/public/locales/da/common.json | 54 +++++++++++++++++++++++++--- 1 file changed, 50 insertions(+), 4 deletions(-) diff --git a/client/public/locales/da/common.json b/client/public/locales/da/common.json index fe0ed14..f68beeb 100644 --- a/client/public/locales/da/common.json +++ b/client/public/locales/da/common.json @@ -132,7 +132,7 @@ "lot_nr": "Producentens \"batchnummer\". Kan bruges til at sikre ensartede farver ved brug af flere ruller.", "remaining_weight": "Hvor meget filament er der tilbage på spolen. For en ny spole bør dette matches spolens vægt.", "location": "Placering af spolen. Hvis du har flere lokationer.", - "price": "Pris for en fuld spole, i den i systemet konfigurerede valuta. Hvis ikke indstillet, vil prisen bliver estimeret." + "price": "Pris for en fuld spole. Hvis ikke indstillet, vil prisen bliver estimeret." }, "spool": "Spoler", "messages": { @@ -168,7 +168,7 @@ "name": "Filament navn, for at adskille dette filament fra andre fra samme producent. Kan for eksempel indeholde farven.", "article_number": "f.eks. EAN, UPC osv.", "spool_weight": "Vægten af en tom spole. Bruges til at angive den målte vægt af en spole.", - "price": "Pris for en ny spole i systemets valutaenhed.", + "price": "Pris for en ny spole.", "weight": "Filamentets vægt på en ny spole (Netto vægt). Dette bør ikke inkludere vægten af selve spolen, kun filamentet. Det er som regel den angivne vægt på pakken.", "material": "f.eks. PLA, ABS, PETG osv." }, @@ -202,7 +202,10 @@ "form": { "filament_updated": "Dette filament er blevet redigeret af nogen/noget andet siden du åbnede denne side. Hvis du gemmer overskrives disse ændringer!" }, - "filament": "Filamenter" + "filament": "Filamenter", + "buttons": { + "add_spool": "Tilføj spole" + } }, "actions": { "create": "Opret", @@ -253,7 +256,9 @@ "success": "Succes", "editSuccess": "Redigering af {{resource}} lykkedes", "deleteError": "Fejl ved sletning af {{resource}} (status kode: {{statusCode}})", - "createSuccess": "Oprettelse af {{resource}} lykkedes" + "createSuccess": "Oprettelse af {{resource}} lykkedes", + "saveSuccessful": "Gemt!", + "validationError": "Kunne ikke gennemføres: {{error}}" }, "no": "Nej", "unknown": "Ukendt", @@ -282,5 +287,46 @@ "kofi": "Donér på Ko-fi", "home": { "home": "Hjem" + }, + "settings": { + "header": "Indstillinger", + "general": { + "tab": "Generelt", + "currency": { + "label": "Valuta" + } + }, + "extra_fields": { + "params": { + "key": "Nøgle", + "name": "Navn", + "field_type": "Type", + "unit": "Enhed", + "order": "Sortering", + "default_value": "Standard-værdi", + "multi_choice": "Multi-valg", + "choices": "Valgmuligheder" + }, + "field_type": { + "integer_range": "Heltals spænd", + "float": "Decimaltal", + "float_range": "Decimaltal spænd", + "datetime": "Dato-tid", + "boolean": "Boolean (Ja/Nej)", + "choice": "Valg", + "text": "Tekst", + "integer": "Heltal" + }, + "choices_missing_error": "Du kan ikke fjerne valg. De følgende valg mangler: {{choices}}", + "tab": "Ekstra felter", + "description": "

Her kan du tilføje ekstra felter til dine poster.

Når et felt er tilføjet kan du ikke redigere Nøgle og Type, og for visse felttyper kan du ikke fjerne valg, eller ændre multi-valgs status. Hvis du fjerner et felt, vil associerede data i alle poster blive slettet.

Nøglen er hvad andre programmer læser/skriver data som, så hvis dit felt skal integreres med en tredje parts program, skal du sørge for at indstille det korrekt. Standard-værdi bliver kun tilføjet til nye felter.

Ekstra felter kan ikke bruges til sortering eller filtrering i oversigterne.

", + "boolean_true": "Ja", + "boolean_false": "Nej", + "non_unique_key_error": "Nøglen skal være Unik.", + "key_not_changed": "Ændr venligst nøglen til noget andet.", + "delete_confirm": "Slet felt: {{name}}?", + "delete_confirm_description": "Dette vil slette feltet samt alle associerede data for alle poster." + }, + "settings": "Indstillinger" } } From db18a5f19d31385c396507a9216e3af1a6fab698 Mon Sep 17 00:00:00 2001 From: Donkie Date: Mon, 1 Apr 2024 22:15:27 +0200 Subject: [PATCH 6/7] Added libffi to fix armv7 builds Thanks @spyder007 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 77fb47d..f438449 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM python:3.11-alpine as python-builder -RUN apk add --no-cache g++ python3-dev libpq-dev libstdc++ shadow +RUN apk add --no-cache g++ python3-dev libpq-dev libstdc++ shadow libffi-dev # Add local user so we don't run as root RUN groupmod -g 1000 users \ From e391d041ac4df4c9df45b1922d4cef7bd8594dff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Apr 2024 17:59:40 +0000 Subject: [PATCH 7/7] Bump vite from 5.0.12 to 5.0.13 in /client Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.0.12 to 5.0.13. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/v5.0.13/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v5.0.13/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- client/package-lock.json | 8 ++++---- client/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 78e05c3..1dcb0e9 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -44,7 +44,7 @@ "eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-react-refresh": "^0.4.5", "typescript": "^5.3.3", - "vite": "^5.0.12", + "vite": "^5.0.13", "vite-plugin-mkcert": "^1.17.1" }, "engines": { @@ -11171,9 +11171,9 @@ } }, "node_modules/vite": { - "version": "5.0.12", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.12.tgz", - "integrity": "sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==", + "version": "5.0.13", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.13.tgz", + "integrity": "sha512-/9ovhv2M2dGTuA+dY93B9trfyWMDRQw2jdVBhHNP6wr0oF34wG2i/N55801iZIpgUpnHDm4F/FabGQLyc+eOgg==", "dev": true, "dependencies": { "esbuild": "^0.19.3", diff --git a/client/package.json b/client/package.json index 2ceb41a..d57eaef 100644 --- a/client/package.json +++ b/client/package.json @@ -43,7 +43,7 @@ "eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-react-refresh": "^0.4.5", "typescript": "^5.3.3", - "vite": "^5.0.12", + "vite": "^5.0.13", "vite-plugin-mkcert": "^1.17.1" }, "scripts": {