Skip to content

Commit

Permalink
SW-3685 Fix material settings CSV sheet and add latest settings and f…
Browse files Browse the repository at this point in the history
…ix knowledge base link translation (#1795)

* SW-3685 Update material settings

* SW-3685 Fix link translations
  • Loading branch information
khaledsherkawi authored Aug 16, 2023
1 parent bc8e14e commit a319fd8
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 11 deletions.
21 changes: 14 additions & 7 deletions octoprint_mrbeam/files/material_settings/materials.csv
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -393,21 +395,25 @@ 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,
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)
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down
Binary file modified octoprint_mrbeam/translations/de/LC_MESSAGES/messages.mo
Binary file not shown.
8 changes: 4 additions & 4 deletions octoprint_mrbeam/translations/de/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>\n"
"Language-Team: \n"
"Language: de\n"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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."
Expand Down

0 comments on commit a319fd8

Please sign in to comment.