From b264719cd9480fc31f05567e606f01e34ee05325 Mon Sep 17 00:00:00 2001 From: Elektrickser <37211274+Elektrickser@users.noreply.github.com> Date: Wed, 3 Mar 2021 00:22:19 +0100 Subject: [PATCH] Z-Tilt integration and Update German Language (#100) * Z-Tilt integration and Update German Language - Update German language - Integration Z-Tilt in Move-Menue * Update KlipperScreen.po --- ks_includes/KlipperScreen.conf | 10 +- ks_includes/locales/KlipperScreen.pot | 2 +- .../de_DE/LC_MESSAGES/KlipperScreen.mo | Bin 6924 -> 7428 bytes .../de_DE/LC_MESSAGES/KlipperScreen.po | 77 ++++++------- ks_includes/printer.py | 2 +- styles/z-bolt/images/z-tilt.svg | 102 ++++++++++++++++++ 6 files changed, 141 insertions(+), 52 deletions(-) create mode 100644 styles/z-bolt/images/z-tilt.svg diff --git a/ks_includes/KlipperScreen.conf b/ks_includes/KlipperScreen.conf index 0f180087..4ea60352 100644 --- a/ks_includes/KlipperScreen.conf +++ b/ks_includes/KlipperScreen.conf @@ -72,12 +72,12 @@ method: printer.gcode.script params: {"script":"QUAD_GANTRY_LEVEL"} enable: {{ printer.quad_gantry_level is defined }} -[menu __main homing z_tilt_adjust] -name: {{ gettext('Z Tilt Adjust') }} -icon: home-z +[menu __main homing Z-Tilt] +name: {{ gettext('Z Tilt') }} +icon: z-tilt method: printer.gcode.script -params: {"script":"QUAD_GANTRY_LEVEL"} -enable: {{ printer.z_tilt_adjust is defined }} +params: {"script":"Z_TILT_ADJUST"} +enable: {{ printer.z_tilt is defined }} [menu __main actions move] diff --git a/ks_includes/locales/KlipperScreen.pot b/ks_includes/locales/KlipperScreen.pot index b9490c58..175d4b12 100644 --- a/ks_includes/locales/KlipperScreen.pot +++ b/ks_includes/locales/KlipperScreen.pot @@ -427,7 +427,7 @@ msgstr "" msgid "Z Offset" msgstr "" -msgid "Z Tilt Adjust" +msgid "Z Tilt" msgstr "" msgid "Z+" diff --git a/ks_includes/locales/de_DE/LC_MESSAGES/KlipperScreen.mo b/ks_includes/locales/de_DE/LC_MESSAGES/KlipperScreen.mo index dc4eb3cd59fa2304640625b56b3d3fe2557a2280..ed80eb81987152a389657483a04940da19db9d3a 100644 GIT binary patch literal 7428 zcma)=e{fyLRmV3WZHdy-rj!=aLN;xa+L$NHO6&$XZX(-~EnBixNlqk{)ZF*pzV~i) z-@UK*hZKp@HYFuA9sX&dQ+^CBOlFuebfyD?!w-`TC__t9lF5|c!w{gP{2HcHk}y-k zFnqrE?$r<5f!^_XpWVHCch8aa36frYb)Lb8`L9sE&O??p&#+}FF=j=D104!4D!!> zg&+0*E2w$C2JeOc2BpUooi)x`sP7i}QU4Bn0~|oTe*o(HhkgB%kR_U5@b%9@&Hs7$ zUGR%=2tMxlB-D6+2Ki^c?)f6r_*e6hzPpYe>2(AA9%!NFJp?g{d5`BQ_#M>m_V1UW z=5Ipj6++Du!|#J1g!=x|PiO56e-G9FpP}aYrsse9 z_Lm{1HP^h}n76>|q3pRA>bqM#@9>;}{4-}f-w(f+dJOM@55b$@bH08R%F9odp!_6; z-wl5n%3i+=Wxq$E^!t4%eg4q%8K`ys4U}GA^Ywp+>i;5?p5OBItFJfajnrQQ_5KDZ zyWI%2zwd(Dhf%0`4?&H8hp!)l3}vREzFYR~O{o3pL5;HtHSYty{b9&I^BI1m|F1!P z|0vY>kNf%`LFx50)c$@I${x=_+2aMc2VTn}G~X!Hy6=LT?-bPc^HAe1`ucgOer>3E zW6xEnejkEtwfPuiYs}9;&Ho70cwdAX|F_`P@G;Ln@O;AaOHkiE3Dy74efx8s{{Us* z=b`lY7vKI(cryXzMX0!P15P1*-v%|`El}g_h2IZHJ!fHqdhGd&aD@7kQ2X>U`=IRm3{<~=gc|q1q4a;l4b^t0{)LG5P(W#kW=p!9wRl-&CWac5y&%rV3zXN5r7a>!cYq|V2?mMB@ zISOT$F<&2t(qjsie&pGO>bDNHZy$kL->0DT`c)`>ego?Ji%{qM%brhpKJED|)cAi2 zwZ5cYz6<#c#4im&uxh{$H|K$ejlnL<{P{m3kG3YkVS1eYiu zoe%l+0=}~-m7*Rad zGlMjdA3=T;`6*-qc@J_EqGuBM7;>X3{#o}t>A6H>wNjF=Z8E6`LCWkDwu;X@nxNnYkj!~l@qm)IpiaVo>wF9 zE=$}S@Lr_h>jk_M`5q_ zR_y+~KiGdd3I_w1&bLzM;^8Ri+D?+%e!^nHm|{PW^@fLLBNt>WplJ5P+y=1?v#fA7 ziS3CnKUp-(&w4Hz44Y$7lA%JQCAOPQ(^#$6fo=1dKF7#HOi zd77YRl0-6wIj)5scj$-?6v}arhgr~!oSjMXB+X1+U0hPJRSmA-A%bty+bu$qKgUq$Z%tYU%T^G03?R=gL%tV?dshP;~5Nj~hLfB_om-mvk znYcesi?*wnu|m6VN4a4pgIHqEb~+VR&2lptMnT`n}b%G+w_wpuo zcAJ$m!ctvWHr}tcRITfGyHr-% zdfy8&+uqtQOi_2#3$`FBG#f_8hEDrn*TS45$YJV->}Z3Xma|0YRy%3xS~#Cf8pLhe ziGr**{Qr*oZS)wLDt$h%lT&ju_l(a?oS&PRUl^ZTkOK!fCwq|FPI!Om(kNISk=^6g z=X*;X;)nmT{3@~4&em2~3!}(Z0i^zvuKZYz&5l!YM&5G9zsw?=6D1 zJwaGb*L@V63qnGXUs`<@V8I}BE>DA2Zsr5lq94sf{He+~%XTapHr|w_+B%`-$*x;V z(`UV8jX-E4mt{B|PMB~WGaM{#mmSwKJKnyp;6%^6+|CaicBDig>t<#?+(3yaY+;1? zC|NV}+)K8(K4wkXlUPx)Vdl%5!DFaiRMk2(?{5XOfQzxcIk%NrAUc|JgNU7H&c%IZ zv0;|>nWctVw%gakveuQk+$`@i%MH^$+BZajB6peT_hsq(h{lbncEkJAm}T+-YBpxF zZrE-dExK7_A)$HpY-7%?hC00s1>`Y1Ix>2oF*4d1eYYJM89R7j-^hWHk)dhATVo*& z;w%b?%zQb`omAkHjRhCL2ZB;z7C$={ou?O}Z9x4-xCPAg=VsrMi8DG&&Mp-v;qr8}H z<+8RH#v4Uv^CFjrnc2M1>ahwtA3B0ox`H3{Y&$JlE0?})hc2VzalPB_8Z`Z+ckUjm zO=PSbW4mwc$YFFRxcJ-X-E(OfRy#p2)d%IoO}rLAC(Yo(l_q7w_8QH}%?nt-g)uoy z6crrQaWpJiJ+t{>+}4m?yQOnA#E$xSv+J5^QX27e5C=N?n-@Fo71NN-i^O^tD*D^0 z?No#;W$0)~u;n_~ywK@z98n4DO}ZYJ0I>-(lc5wH+spGoHnx9%H_V5_WdEt@Gx2Sf z-AV1qFzPs+|6UZj&CjwQlU!tBx68%K+Hy0oy-HqkHkt)XtV*FucB4?vg8$^W;|8zh zb61o`z$`197g456T!^xKPUP#lG&a+l7qZd>W!AzlZ5QB9t0Ak5NmY9Uw#B90t!K&w z5!Ss9@;~C5kLeR}j^oENewotD$r_a_ZD2i3p5?L$TW6PP88c_jE;QyB&d#!EnXKBX zvh!9}(%HO_vZe8kTxNG(GtJ(yH7uy49WS!&GRA22NHn9ZG)LN}fqX@wgZsX>`AEJY zADTqp{F3|zZ}!e?mJ7Uu6o>4F6i4=nhc>DAyg$_yGUU^+^SzFz9NxG$*Sx1GGOKCiRK;V-&I}wTdPA!`kIm1B{ zM=j%gu%bUZP6ovwC*R+^Xl4|=BBfrcl)2Z2yn{dP)|@Vmk{peUyqGL(qdM1h61G8# zRc2xQjS@GbL}!Dux1EQTV-df$91#P00}#KGwCBi5{M)LJ-40!4;4ec#S)yNcv&FBF ziuu*XrP0X|t8=?EEcye?5_Nr&?kE%~uA(z v;2kMo^?D^4bO=tZUe`rrg7L0Qu)MPE>GD4d$}>uCcv(I;Q|5!Q^1=TFxSRzY delta 3210 zcmZ|RX>6259LMolM6@j}v`8(7@}N{vTnAvb-@ml}h-I|{*s~We=!w@4oz5v8eleRg1NT62$lJ*sAsqWwIfl~ zPHjXD_y}sn&!HxI33cDAsPW#g?e|dEeVC)72|u?ULtXd{vg_t2Bx%!!ns@-&YQQ4Y z1jBFuj<$}mUS%yu-8UX}eU0s(Y0cGBQ36f2VNcP*Z$s%O7H;kF^Bomq5TFmP9JI>b?W??p;SoTIH((|Q4`c5n_yZ{885d+ zP&>B9wl|;>+iv?GM&0)Wj>J9o_d}?Jj-u}W8As^-KShO)8B}TvA2XUSwX3c3QJJqo zC73`R)^(_@zYn#8&s$%&equd=TJfK#zY`(8R^SNCT|*^HC4$eQG7Rz8fvPD*4LlK* zP$Oz*mRs9VD~+QL>lW1E-HFJjZmt^8%wc>BxPf1Tz}>CnoKqE_~m^%vCE z_n`(jhq`Vce^2%Ipb(W{F)Fcg)OC|kE1qoon^6ACiMPf_%&md}+tdpq}+mzI5LN)P&PfJJMj=^H6WYVpIZd&Q{W>3-3oA z#vQ1Y?LsBgi%R4GYDbQsUdLnByF=n{peW1NMJqdjAiN<|ccEPQS{` ze$1VCJ;Av&i-?7Uir#`H#Bwz#D|qfnBo98BKoh8|HI_COLU3bI_$111!;fPmHePS{d{rBQpC*rM|)12QL zY#f#hRR_NhYc86T%64?Odzp;W>ZQAay32kkSm?%M?WvfT^8BD`csN))d}m>E%ui>$ zcs%Pz>8&aCf<2`Rg1<{QInMZ{8P|`vsmOJv#f$lwtj}^yODvUG@20%`;K9p#f~vBb zU`<(5D8IM2Y;!2D(TlTW#tLdiHU#&M43G0N_pJ9)Y*c5`EXpPlUdnHeCp)@L11sz3 za^o4MeQ)II;L+j{!Q@fviX47uk9&T^^PQL, 2021. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-02-26 15:56+0000\n" -"PO-Revision-Date: 2021-02-12 02:02+0100\n" -"Last-Translator: Jakob Kais \n" -"Language-Team: Russian \n" +"PO-Revision-Date: 2021-02-27 00:51+0100\n" +"Last-Translator: \n" +"Language-Team: \n" "Language: de_DE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.3\n" +"X-Generator: Poedit 2.4.2\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "?" @@ -30,7 +31,7 @@ msgid "Actions" msgstr "Aktionen" msgid "Add bed mesh profile" -msgstr "Druckbett Mesh Profil hinzufügen" +msgstr "Mesh-Level Profil hinzufügen" msgid "Are you sure you want to print" msgstr "Möchten Sie wirklich drucken" @@ -51,7 +52,7 @@ msgid "Bed Mesh" msgstr "Druckbett Mesh-Level" msgid "Calibrate" -msgstr "Kalibrieren" +msgstr "Höheneinstellung" msgid "Cancel" msgstr "Abbruch" @@ -62,12 +63,11 @@ msgstr "Änderung abbrechen" msgid "Cancel Print" msgstr "Druck abbrechen" -#, fuzzy msgid "Cancelled" -msgstr "Abbruch" +msgstr "Abgebrochen" msgid "Channel" -msgstr "" +msgstr "Kanal" msgid "" "Check /tmp/KlipperScreen.log for more information.\n" @@ -80,17 +80,17 @@ msgid "Close" msgstr "Schließen" msgid "Complete" -msgstr "" +msgstr "Fertiggestellt" msgid "Configuration" msgstr "Einstellungen" msgid "Connected" -msgstr "" +msgstr "Verbunden" #, python-format msgid "Connecting to %s" -msgstr "" +msgstr "Verbinden zu %s" msgid "Continue" msgstr "Fortsetzen" @@ -117,7 +117,7 @@ msgid "Disable XY" msgstr "Achse XY deaktivieren" msgid "Disconnect" -msgstr "" +msgstr "Nicht verbunden" msgid "Displayed Macros" msgstr "Aktive Macros" @@ -135,7 +135,7 @@ msgid "Emergency Stop" msgstr "NOT-STOP" msgid "Error" -msgstr "" +msgstr "Fehler" msgid "Estimated Time Method" msgstr "Druckzeit" @@ -165,15 +165,13 @@ msgid "Filament Used" msgstr "Filamentverbrauch" msgid "File Estimation (default)" -msgstr "Dateischätzung (Standard)" +msgstr "Dateischätzung" msgid "Fine Tuning" msgstr "Feintuning" msgid "Firmware Restart" -msgstr "" -"Firmware\n" -" neustarten" +msgstr "Firmware neustarten" msgid "Go Back" msgstr "Zurück" @@ -207,13 +205,13 @@ msgid "Homing" msgstr "Grundposition" msgid "Hostname" -msgstr "" +msgstr "Hostname" msgid "IPv4" -msgstr "" +msgstr "IPv4" msgid "IPv6" -msgstr "" +msgstr "IPv6" msgid "Increase" msgstr "Erhöhen" @@ -225,7 +223,7 @@ msgid "Initializing printer..." msgstr "Drucker wird initialisiert..." msgid "Interface" -msgstr "" +msgstr "Interface" msgid "Invert X" msgstr "Achse X invertieren" @@ -237,9 +235,7 @@ msgid "Invert Z" msgstr "Achse Z invertieren" msgid "Klipper Restart" -msgstr "" -"Klipper\n" -" neustarten" +msgstr "Klipper neustarten" msgid "Klipper Version" msgstr "Klipper Version" @@ -280,7 +276,7 @@ msgid "Left:" msgstr "Restzeit:" msgid "Load" -msgstr "Belastung" +msgstr "Last" msgid "Load Average" msgstr "Durchschnittslast" @@ -301,7 +297,7 @@ msgid "Menu" msgstr "Menü" msgid "Modified" -msgstr "" +msgstr "Modifiziert" msgid "Move" msgstr "Bewegen" @@ -319,7 +315,7 @@ msgid "Number Pad" msgstr "Nummernblock" msgid "Off" -msgstr "Ausschalten" +msgstr "Aus" msgid "Pause" msgstr "Pause" @@ -349,7 +345,7 @@ msgid "Printing" msgstr "Drucken" msgid "Profile Name:" -msgstr "Profil Name:" +msgstr "Profilname:" msgid "Quad Gantry Level" msgstr "Quad Gantry Level" @@ -376,10 +372,10 @@ msgid "Save configuration." msgstr "Speichere Einstellungen." msgid "Screen Power Off Time" -msgstr "" +msgstr "Bildschirm abschalten in" msgid "Screen will show in less than one second" -msgstr "" +msgstr "Der Bildschirm wird in weniger als einer Sekunde angezeigt" msgid "Screws Adjust" msgstr "Schrauben Einstellen" @@ -400,7 +396,7 @@ msgid "Slow" msgstr "Langsam" msgid "Sort by: " -msgstr "Sortieren nach: " +msgstr "Sortierung:" msgid "Speed +" msgstr "Geschwindigkeit +" @@ -452,8 +448,8 @@ msgstr "Höhe Kalibrieren" msgid "Z Offset" msgstr "Z Offset" -msgid "Z Tilt Adjust" -msgstr "" +msgid "Z Tilt" +msgstr "Z-Achse ausrichten" msgid "Z+" msgstr "Z+" @@ -462,19 +458,10 @@ msgid "Z-" msgstr "Z-" msgid "dBm" -msgstr "" +msgstr "dBm" msgid "minutes" msgstr "Minuten" msgid "mm" msgstr "mm" - -#~ msgid "Network Info" -#~ msgstr "Netzwerkinfo" - -#~ msgid "Screen Blanking Time" -#~ msgstr "Bildschirm Ausblenden in" - -#~ msgid "Klipper" -#~ msgstr "Klipper" diff --git a/ks_includes/printer.py b/ks_includes/printer.py index 4b0ab993..e5c4ee3d 100644 --- a/ks_includes/printer.py +++ b/ks_includes/printer.py @@ -185,7 +185,7 @@ class Printer: } } - sections = ["bed_mesh","bltouch","probe","quad_gantry_level","z_tilt_adjust"] + sections = ["bed_mesh","bltouch","probe","quad_gantry_level","z_tilt"] for section in sections: if self.config_section_exists(section): data["printer"][section] = self.get_config_section(section).copy() diff --git a/styles/z-bolt/images/z-tilt.svg b/styles/z-bolt/images/z-tilt.svg new file mode 100644 index 00000000..e84cb9bc --- /dev/null +++ b/styles/z-bolt/images/z-tilt.svg @@ -0,0 +1,102 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + +