From 38d8992e2c611cb9040133427062e345f9a2f3fd Mon Sep 17 00:00:00 2001
From: khaledsherkawi <khaled@mr-beam.org>
Date: Wed, 16 Aug 2023 14:55:42 +0200
Subject: [PATCH 1/2] SW-3685 Update material settings

---
 .../files/material_settings/materials.csv     | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/octoprint_mrbeam/files/material_settings/materials.csv b/octoprint_mrbeam/files/material_settings/materials.csv
index 4cbd73828..2d52a7de5 100644
--- a/octoprint_mrbeam/files/material_settings/materials.csv
+++ b/octoprint_mrbeam/files/material_settings/materials.csv
@@ -228,7 +228,7 @@ MrB II Dreamcut,,#c5935f,"0,6",100,750,2,3,0,no,calculated
 Do Not Use,Latex,#ffffff,,,,,3,,,
 MrB II Dreamcut,Plywood Birch,#e8d4bc,Engrave,0-80,1500-1150,1,3,0,no,
 MrB II Dreamcut,,#e8d4bc,"1,5",100,200,3,3,0,no,tested
-MrB II Dreamcut,,#e8d4bc,3,100,100,3,3,0,no,tested
+MrB II Dreamcut,,#e8d4bc,3,100,100,3,3,0,no,tested 
 MrB II Dreamcut,Stamp Rubber,#41c500,Engrave,100,1500-400,2,3,0,no,tested
 MrB II Dreamcut,Sign Material,#dedede,Engrave,0-60,1500-300,1,3,0,no,tested
 MrB II Dreamcut,Sign Material,#dedede,"1,5",100,240,3,3,0,no,tested
@@ -254,6 +254,8 @@ MrB II Dreamcut S,,#434343,2,100,300,4,3,0,no,
 MrB II Dreamcut S,,#434343,3,100,300,5,3,0,no,
 MrB II Dreamcut S,,#ff0000,Engrave,0-90,1500-1500,1,3,0,no,
 MrB II Dreamcut S,,#ff0000,2,100,200,5,3,0,no,
+MrB II Dreamcut S,,#fc791e,Engrave,0-90,1500-1500,1,3,0,no,
+MrB II Dreamcut S,,#fc791e,3,100,200,4,3,0,no,tested by Jessie
 MrB II Dreamcut S,Balsa Wood,#d4b26f,Engrave,0-50,1500-1300,1,3,0,no,
 MrB II Dreamcut S,,#d4b26f,1,100,1300,2,3,0,no,
 MrB II Dreamcut S,,#d4b26f,2,100,1300,2,3,0,no,
@@ -271,7 +273,7 @@ MrB II Dreamcut S,,#8b624a,5,100,400,4,3,0,no,
 MrB II Dreamcut S,Cork,#c19c73,Engrave,0-15,1500-1500,1,3,0,no,tested - customer
 MrB II Dreamcut S,Felt,#6fa8dc,Engrave,0-75,1500-1200,1,3,0,no,
 MrB II Dreamcut S,,#6fa8dc,3,100,400,2,3,0,no,
-MrB II Dreamcut S,,#b7b7b7,Engrave,100,400,1,3,0,no,
+MrB II Dreamcut S,,#b7b7b7,Engrave,20,400,1,3,0,no,
 MrB II Dreamcut S,,#b7b7b7,3,100,400,4,3,0,no,
 MrB II Dreamcut S,,#293365,Engrave,0-35,1500-1500,1,3,0,no,
 MrB II Dreamcut S,,#293365,3,100,900,2,3,0,no,
@@ -393,10 +395,12 @@ MrB II Dreamcut S,Stainless Steel,#cbcccb,Engrave,100,500-300,1,0,0,no,tested by
 ,,,,,,,,,,
 ,DREAMCUT X,,,,,,,,,
 MrB II Dreamcut x,Anodized Aluminum,#000000,Engrave,0-100,2000-700,1,2,0,no,
+MrB II Dreamcut x,Stiftebox (eloxiertes Aluminium),#000000,Engrave,0-25,1700-1500,1,3,0,no,tested by Ellen 25% - 1500
+,,#ff0000,,,,,,,,
 MrB II Dreamcut x,Acrylic,#ffd966,Engrave,0-50,2000-1700,1,3,0,no,
 MrB II Dreamcut x,,#ffd966,3,100,300,5,3,0,no,
 MrB II Dreamcut x,,#93c47d,Engrave,0-50,2000-1700,1,3,0,no,
-MrB II Dreamcut x,,#93c47d,3,100,300,5,3,0,no,Tested by Jessie https://mrbeamworkspace.slack.com/archives/C04BURW22UT/p1682694335700929
+MrB II Dreamcut x,,#93c47d,3,100,300,5,3,0,no,Tested by Jessie https://mrbeamworkspace.slack.com/archives/C04BURW22UT/p1682694335700929 
 MrB II Dreamcut x,,#434343,Engrave,0-50,2000-2000,1,3,0,no,
 MrB II Dreamcut x,,#434343,2,100,500,4,3,0,no,
 MrB II Dreamcut x,,#434343,3,100,500,5,3,0,no,
@@ -404,10 +408,12 @@ MrB II Dreamcut x,,#ff0000,Engrave,0-80,2000-2000,1,3,0,no,
 MrB II Dreamcut x,,#ff0000,3,100,400,5,3,0,no,
 MrB II Dreamcut x,,#ffffff,Engrave,0-100,2000-1500,1,3,0,no,
 MrB II Dreamcut x,,#ffffff,3,100,200,4,3,0,no,
+Dreamcut x (not validated),,#fc791e,Engrave,0-100,,,3,0,no,noch offen (12.7.)
+MrB II Dreamcut x,,#fc791e,3,100,600,7,3,0,no,tested by Jessie
 MrB II Dreamcut x,,#cfffe5,engrave,0-50,2000-1700,1,3,0,no,tested by marie (perspex spearmint green)
 MrB II Dreamcut x,,#cfffe5,3,100,150,6,3,0,no,tested by marie
-MrB II Dreamcut x,,#8370fe,engrave,0-50,2000-1700,1,3,0,no,tested by marie (perspex parma violet)
-MrB II Dreamcut x,,#8370fe,3,100,100,7,3,0,no,tested by marie (perspex parma violet)
+MrB II Dreamcut x,,#8370fe,engrave,100,500,1,3,0,no,tested by marie (perspex parma violet) / update 14.08.
+MrB II Dreamcut x,,#8370fe,3,100,100,8,3,0,no,tested by marie (perspex parma violet) /update 14.08.
 MrB II Dreamcut x,,#926495,engrave,0-50,2000-1700,1,3,0,no,tested by marie (perspex sour grape)
 MrB II Dreamcut x,,#926495,3,100,150,5,3,0,no,tested by marie (perspex sour grape)
 MrB II Dreamcut x,,#bf6378,engrave,0-50,2000-1700,1,3,0,no,tested by marie (perspex raspberry sherbet)
@@ -485,7 +491,8 @@ MrB II Dreamcut x,Kraftplex,#795f39,Engrave,0-45,2000-2000,1,3,0,no,tested
 MrB II Dreamcut x,,#795f39,"0,5",100,950,2,3,0,no,
 MrB II Dreamcut x,,#795f39,1,100,450,2,3,0,no,
 MrB II Dreamcut x,,#795f39,"1,5",100,700,3,3,0,no,tested
-MrB II Dreamcut x,Kraftplex,#795f39,2,100,380,3,3,0,no,
+MrB II Dreamcut x,,#795f39,2,100,380,3,3,0,no,
+MrB II Dreamcut x,,#795f39,3,100,400,4,3,0,no,tested by jessie
 Do Not Use,Kraftplex (wave),#e7d27f,Engrave,0-50,1500-800,1,3,0,no,
 Do Not Use,,#e7d27f,6,100,270,3,3,0,no,
 Do Not Use,,#e7d27f,10,100,200,3,3,0,no,
@@ -561,7 +568,7 @@ MrB II Dreamcut x,Swiss stone pine,#bc955a,Engrave,0-20,2000-2000,1,3,0,no,teste
 MrB II Dreamcut x,,#bc955a,3,100,600,3,3,0,no,tested by ellen (4.7.23)
 MrB II Dreamcut x,Wood Sticker,#783f04,Engrave,0-30,2000-2000,1,3,1,no,
 MrB II Dreamcut x,Wood Sticker,#783f04,1,100,1100,2,3,1,no,
-MrB II Dreamcut x,Wood Sticker,#bc955a,Engrave,0-30,2000-2000,1,3,1,no,
+MrB II Dreamcut x,Wood Sticker,#bc955a,Engrave,0-10,2000-2000,1,3,1,no,tested and changed by ellen (3.8.23)
 MrB II Dreamcut x,Wood Sticker,#bc955a,1,100,1050,2,3,1,no,
 MrB II Dreamcut x,Solid Wood,#783f04,Engrave,0-25,2000-2000,1,3,0,no,
 MrB II Dreamcut x,Solid Wood,#783f04,3,100,200,1,3,0,no,tested

From 353101016f52776f0822fb1416a3971e41bd1752 Mon Sep 17 00:00:00 2001
From: khaledsherkawi <khaled@mr-beam.org>
Date: Wed, 16 Aug 2023 15:33:59 +0200
Subject: [PATCH 2/2] SW-3685 Fix link translations

---
 .../translations/de/LC_MESSAGES/messages.mo   | Bin 155911 -> 155914 bytes
 .../translations/de/LC_MESSAGES/messages.po   |   8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/octoprint_mrbeam/translations/de/LC_MESSAGES/messages.mo b/octoprint_mrbeam/translations/de/LC_MESSAGES/messages.mo
index b58cf59e7878226aa2f0ae1a874925bc9e5360c8..4bbce080e5b21d3bcc1a27b71db64686b8160f63 100644
GIT binary patch
delta 3156
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

delta 3131
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
B!Px)+

diff --git a/octoprint_mrbeam/translations/de/LC_MESSAGES/messages.po b/octoprint_mrbeam/translations/de/LC_MESSAGES/messages.po
index 22512319e..25fb96b2c 100644
--- a/octoprint_mrbeam/translations/de/LC_MESSAGES/messages.po
+++ b/octoprint_mrbeam/translations/de/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Mr_Beam 0.1.61\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2023-08-16 11:15+0200\n"
-"PO-Revision-Date: 2023-08-16 11:41+0200\n"
+"PO-Revision-Date: 2023-08-16 15:14+0200\n"
 "Last-Translator: Andy Werner <andy@mr-beam.org>\n"
 "Language-Team: \n"
 "Language: de\n"
@@ -914,7 +914,7 @@ msgstr "Schließen"
 #: octoprint_mrbeam/templates/laserhead_changed.jinja2:62
 #: octoprint_mrbeam/templates/tab_workingarea.jinja2:156
 msgid "https://support.mr-beam.org/en"
-msgstr "https://support.mr-beam.org"
+msgstr "https://support.mr-beam.org/de"
 
 # Settings > About Screen
 #: octoprint_mrbeam/static/js/app/view-models/user-notification.js:46
@@ -4474,12 +4474,12 @@ msgid ""
 msgstr ""
 "Stelle hier die Höhe ein, auf der gelasert werden soll, damit die "
 "Kameravorschau genau ist. Genauere Informationen, auch bezüglich "
-"Schneidhilfen und der Mr Beam Height Extension, findest du "
+"Schneidhilfen und der Mr Beam Height Extension, findest du in "
 
 #: octoprint_mrbeam/templates/calibration/user/view_corner_calibration.jinja2:17
 #: octoprint_mrbeam/templates/tab_workingarea.jinja2:157
 msgid "this Knowledge Base article"
-msgstr "In diesem Wissensdatenbank-Artikel"
+msgstr "diesem Wissensdatenbank-Artikel"
 
 #: octoprint_mrbeam/templates/tab_workingarea.jinja2:158
 msgid " regarding the working height."