From 2ddaa4ab969c650e756838356926ee9091f10f78 Mon Sep 17 00:00:00 2001 From: Denvi Date: Thu, 19 May 2016 20:52:52 +0500 Subject: [PATCH] "Check door" state fix. "Return XYZ" button only restores G92 offsets. --- src/frmmain.cpp | 41 +++++--- src/grbl_control.pro | 2 +- src/translations/grblControl_es.qm | Bin 15943 -> 16060 bytes src/translations/grblControl_es.ts | 152 +++++++++++++++-------------- src/translations/grblControl_fr.qm | Bin 15741 -> 15848 bytes src/translations/grblControl_fr.ts | 152 +++++++++++++++-------------- src/translations/grblControl_ru.qm | Bin 15782 -> 15895 bytes src/translations/grblControl_ru.ts | 152 +++++++++++++++-------------- 8 files changed, 270 insertions(+), 229 deletions(-) diff --git a/src/frmmain.cpp b/src/frmmain.cpp index 5cdf7cf3..e87101fe 100644 --- a/src/frmmain.cpp +++ b/src/frmmain.cpp @@ -4,13 +4,15 @@ //#define INITTIME //QTime time; time.start(); //#define PRINTTIME(x) //qDebug() << "time elapse" << QString("%1:").arg(x) << time.elapsed(); time.start(); -#define IDLE 0 -#define ALARM 1 -#define RUN 2 -#define HOME 3 -#define HOLD 4 -#define QUEUE 5 -#define CHECK 6 +#define UNKNOWN 0 +#define IDLE 1 +#define ALARM 2 +#define RUN 3 +#define HOME 4 +#define HOLD 5 +#define QUEUE 6 +#define CHECK 7 +#define DOOR 8 #include #include @@ -32,10 +34,10 @@ frmMain::frmMain(QWidget *parent) : QMainWindow(parent), ui(new Ui::frmMain) { - m_status << "Idle" << "Alarm" << "Run" << "Home" << "Hold" << "Queue" << "Check"; - m_statusCaptions << tr("Idle") << tr("Alarm") << tr("Run") << tr("Home") << tr("Hold") << tr("Queue") << tr("Check"); - m_statusBackColors << "palette(button)" << "red" << "lime" << "lime" << "yellow" << "yellow" << "palette(button)"; - m_statusForeColors << "palette(text)" << "white" << "black" << "black" << "black" << "black" << "palette(text)"; + m_status << "Unknown" << "Idle" << "Alarm" << "Run" << "Home" << "Hold" << "Queue" << "Check" << "Door"; + m_statusCaptions << tr("Unknown") << tr("Idle") << tr("Alarm") << tr("Run") << tr("Home") << tr("Hold") << tr("Queue") << tr("Check") << tr("Door"); + m_statusBackColors << "red" << "palette(button)" << "red" << "lime" << "lime" << "yellow" << "yellow" << "palette(button)" << "red"; + m_statusForeColors << "white" << "palette(text)" << "white" << "black" << "black" << "black" << "black" << "palette(text)" << "white"; ui->setupUi(this); @@ -598,7 +600,7 @@ void frmMain::grblReset() qDebug() << "grbl reset"; m_serialPort.write(QByteArray(1, (char)24)); - m_serialPort.flush(); +// m_serialPort.flush(); m_processingFile = false; m_transferCompleted = true; @@ -672,6 +674,9 @@ void frmMain::onSerialPortReadyRead() if (stx.indexIn(data) != -1) { status = m_status.indexOf(stx.cap(1)); + // Undetermined status + if (status == -1) status = 0; + // Update status if (status != m_lastGrblStatus) { ui->txtStatus->setText(m_statusCaptions[status]); @@ -1946,9 +1951,14 @@ void frmMain::on_cmdZeroZ_clicked() void frmMain::on_cmdReturnXY_clicked() { sendCommand(QString("G21"), -1, m_settings.showUICommands()); - sendCommand(QString("G53G90G0X%1Y%2Z%3").arg(m_storedX).arg(m_storedY).arg(toMetric(ui->txtMPosZ->text().toDouble())), - -1, m_settings.showUICommands()); - sendCommand(QString("G92X0Y0Z%1").arg(toMetric(ui->txtMPosZ->text().toDouble()) - m_storedZ), -1, m_settings.showUICommands()); +// sendCommand(QString("G53G90G0X%1Y%2Z%3").arg(m_storedX).arg(m_storedY).arg(toMetric(ui->txtMPosZ->text().toDouble())), +// -1, m_settings.showUICommands()); + sendCommand(QString("G53G90G0X%1Y%2Z%3").arg(toMetric(ui->txtMPosX->text().toDouble())) + .arg(toMetric(ui->txtMPosY->text().toDouble())) + .arg(toMetric(ui->txtMPosZ->text().toDouble())), -1, m_settings.showUICommands()); + sendCommand(QString("G92X%1Y%2Z%3").arg(toMetric(ui->txtMPosX->text().toDouble()) - m_storedX) + .arg(toMetric(ui->txtMPosY->text().toDouble()) - m_storedY) + .arg(toMetric(ui->txtMPosZ->text().toDouble()) - m_storedZ), -1, m_settings.showUICommands()); } void frmMain::on_cmdReset_clicked() @@ -2304,6 +2314,7 @@ bool frmMain::dataIsFloating(QString data) { ends << "Reset to continue"; ends << "'$H'|'$X' to unlock"; ends << "ALARM: Hard limit. MPos?"; + ends << "Check Door"; foreach (QString str, ends) { if (data.contains(str)) return true; diff --git a/src/grbl_control.pro b/src/grbl_control.pro index fb096590..432ebedb 100644 --- a/src/grbl_control.pro +++ b/src/grbl_control.pro @@ -32,7 +32,7 @@ DEFINES += sNan=\"65536\" greaterThan(QT_MAJOR_VERSION, 4): QT += widgets -VERSION = 0.8.3 +VERSION = 0.8.4 DEFINES += APP_VERSION=\\\"$$VERSION\\\" diff --git a/src/translations/grblControl_es.qm b/src/translations/grblControl_es.qm index 34bf3677efcebd732c5fc904d8ba41bc6354d83f..d19a35c8d4eb0b431f4e1ab6c7385e8732bf5039 100644 GIT binary patch delta 1631 zcmX|>c}!Gi6vfXB@4eY)fWeVXly#7GltolDwZ(wARH%wlO;td_BB($q6q%-Kqeuw^ z6$GosC{SwMumXxp3`o(U#%iri0j*12X|zEjwzX$6N&k5Hz4vYR+;i{ux=T9NSGve5 zt44%b%~JtP1k4`+4(|Y(L_7Uk$!UQ9E%IF;z?)o39w95a-V+c`0xmlNaWbIbxQ*dq zWHaEikNg(!^&r0^8AIfH-xTr`SwxmOUL|FZ}@1 z0y2vH0>T@A@(@IG5)if%qGdYIuY?#g32<8raRn8*{RVMY9N_G=gfBeEs~6&)mB8rv z)qS#X>k346F~NYXh;Fs<8e+b&@fG5C&;-qXvXds2Abvogyv0Ze{EG5LBy44ZfsZib zNj;!%L}L11K+qg4DBljaPeDo+=flqte15%p~ z05aG)<`_~BQopw&Qm^oU$V>PzV;G2JC;`jG&+`$lL193Le6z?F?Z0 z1wA9$>3jj6cP0Y5i85E;A6cnl**#?)eY`IZJ-45})XT%JyR$VciSmpWCSXjqyy{sg zFlw~C(U!5&C~pq_f}A1meEgUOyU7R287Q*KA#M{L@_*xy(8pf&Npe{9!&$&Mpd-JC)7bE7t7@ zVTX(scm3p`;O!w4N}k}Nn6Ezehrf6Lvo~AGG8p@ z{1ho|wJS@uMOt-2!HaZ4+Hq81$8}1(-FLBflBIzfuJ;(0{fRapIH3N2M-9^|;TPgQ)BcW~4dRY^e^V0o)j?9SuD@d4F3(QG}S zdi9bQQUdQr!ZPEQv%6Zjk-QbsW&+tU= z)OCxE9iyL~R74ey`utKx4Ik1MK7C60f9w1ESFuWg#|*}VIyUNlL$HPRhh`c+=%Sr& zM#IMC++b-o4E)0z;?ino$lfd#Cm{j4fA9 h$xdU^kc%8XX~;r4a{phZn4j};PHtgNiz;xc=|6xXjbZ=* delta 1528 zcmXApdr(wm7{;I7J!fy6-DTyzA}O#eat8qw@j}YTB}&KQfqWZu)rtI0-zkcU@=l$OAeV_OFPUm}9N-8~N z+pD~y>>;-SOa?+m0L2WzEyG1~4w(X&i^*5XPBM>inPer|1_&L1=W0Nl0;o>87}Y~I z0)bP>ljLdg3-Tt(_`ql6Ss=)hJO?|1;`nft3vdo$UV4=?`@dh`86=Q5c7Mw$a+}a%P3_4tS62EGPpQ)H>^!8cI*JG*SSA_1r{zJ zAqTNY$$0y?Y}Z3V3078kQJuvo+GpaN(y{pr5Abe6kJlOM>yAIVG63CVnQzedoX6|3 z0d*Z!-7b&(<|tKIE04O#ebM*j%b$7kz!~zY$J;ok=kkVX7O3`+H-_&Z)8$={9&wJX z^8RuY4HF-sn6-;~n5z|Ocj?G+!-@spT>w0K6a~|E0$z6%^*y72gvUZevVjF&7Gg5# zK##3LVOa?ir3h<^=+eY);oX2Y=-^(#<{X3DEur*Rc4#RTDgs5o;49Ro)AgY(!tq20 z`A|5~e$37f7lif-Rvy+RoY&HYVJ6|FiU;cSV!UiN;4@WBZs#bX^2DXy4RqvDG5@s* ze19tDe{_i*2Z;p}8~J`fEE?58A0>%3SFG&(h*(!00gQPr9{MksBT5jDpWQ-R+!jx@ z6|>P+u{*)eS&u7GDwIz+>r$mu#f`x!O8*C>cc0R7brZiEl}lIqQh{LQs?#dYI9plW zEHF{6^04U;y_2KtuVMV?Uggu09Iof8A}oxbs8+>3zDci4Q%yFFkPlSrQ%r2|Z&msE zt5j}K^<>_%4oa7&PX3)8gzZ(^21rZ0x-9E0D)6bgrZbL;t_L6Q28AjF?iuUB_D*m5J^x Nl24AYr6$zu{XgK$bl(5~ diff --git a/src/translations/grblControl_es.ts b/src/translations/grblControl_es.ts index d42b18c1..f8ae64e0 100644 --- a/src/translations/grblControl_es.ts +++ b/src/translations/grblControl_es.ts @@ -74,7 +74,7 @@ - + G-code program Programa de G-Code @@ -189,22 +189,22 @@ - + Check mode Modo de prueba - + Autoscroll Desplazamiento automático - - - + + + Open Abrir @@ -216,7 +216,7 @@ - + Send Enviar @@ -267,7 +267,7 @@ - + Home Origen @@ -316,7 +316,7 @@ - + Heightmap Mapa de alturas @@ -347,11 +347,11 @@ - - - - + + + + Spindle Husillo @@ -367,8 +367,8 @@ - - + + Feed Avance @@ -384,11 +384,11 @@ - - - - + + + + Jog Manual - JOG - @@ -548,79 +548,89 @@ Salve &transformado como... - + Idle Listo - + Alarm Alarma - + Run Iniciar - + Hold Parada - + Queue En cola - - - - + + + + Check Chequeo - + + Door + Puerta + + + + Unknown + Desconocido + + + &Insert line &Insertar linea - + &Delete lines &Borrar lineas - - + + Restore XYZ: %1, %2, %3 Restaurar XYZ: %1, %2, %3 - + G-code program file was changed. Save? El programa de G-code ha cambiado. Desea guardar? - + Heightmap file was changed. Save? El programa mapa de alturas ha cambiado. Desea guardar? - + Not connected Sin Conexión - + Probe Medición - - + + G-Code files (*.nc *.ncc *.ngc *.tap *.txt) Archivos de G-Code (*.nc *.ncc *.ngc *.tap *.txt) @@ -629,35 +639,35 @@ Conectado - + Job done. Time elapsed: %1 Trabajo terminado. Tiempo transcurrido: %1 - + Processed Procesado - + Serial port error Error en puerto serie - + Buffer: %1 / %2 - - + + Scroll Desplazamiento - + File sending in progress. Terminate and exit? Envio de archivo en progreso. Detener y salir? @@ -666,7 +676,7 @@ Tiempo transcurrido: %1 Archivos de G-Code (*.nc *.ncc *.tap *.txt);;Todos los archivos (*.*) - + Sent Enviado @@ -675,36 +685,36 @@ Tiempo transcurrido: %1 Archivos de G-Code (*.nc *.ncc *.tap *.txt) - - - + + + Heightmap files (*.map) Mapa de alturas (*.map) - + Port opened Puerto se abrió - + G-Code files (*.nc *.ncc *.ngc *.tap *.txt);;All files (*.*) Archivos de G-Code (*.nc *.ncc *.ngc *.tap *.txt);;Todos los archivos (*.*) - - + + Can't open file: No se puede abrir el archivo: - - - - - + + + + + In queue En cola @@ -713,30 +723,30 @@ Tiempo transcurrido: %1 Enviado - + Delete lines? Borrar lineas? - - - - - - - + + + + + + + (%1) - + Untitled Sin-título - - - + + + Save file as Guardar archivo como @@ -745,7 +755,7 @@ Tiempo transcurrido: %1 Archivos de G-Code (*.nc;*.ncc;*.tap) - + Changing grid settings will reset probe data. Continue? El cambio de configuraciones de grilla reiniciará los datos de medición. Desea continuar? diff --git a/src/translations/grblControl_fr.qm b/src/translations/grblControl_fr.qm index 78e1a8b71ec3943371b608798f809521e5b376a2..68ff48034e1870752d7b968be963ceb10c5a600f 100644 GIT binary patch delta 1623 zcmX|>c~I147{|ZMzQ5ld{1y;d1Vj`BSGkd!sL9d+F()ss%^46u#bZ&yXwh;1NQ^-u zXgv@Vn+`mZ3PA-Va||-j%sir;Q7n%b^GZ!eiR{blOtZ7|+4tS|_dMU{`#kS&xNLBJ zjfbkH))--X3?LCO83FaHfODvWL957VK+p%|Yh*u}3rt!<){y4`(Fu5D1JX-?W|M>A zjpP9!fM=!8$zRE4@+ryl6PZUkM#ht01Gb6j{L#maV)8V(jr@UZWzZ5JUI#?E0QxEi zgVKQLQCvR&Vj?M+>zFwd_zajWfKfJJZYD5h*uk(QAp1DryAsGX1A#oVsEn+DQ`;%n zpi6){DvANmLEX!MrZ|X->);QFsxJY>4dO^1;3goxV~~(r5U1O?{=&hK42birK4de* z&kM*y5KjUD&lob6TnI4~L{>sF%>}|WkRoR=ehs9ABp&pRfV6}Py+4AqYdYW;O)`+* zen@+k0^?2gE2?nYBwxhzP~W6!h&wvM3MA|wVKY*;Z>15N$!?l94=DqJ`ofVq`F-wR zN9q<9JUJUP|7-wURv<0^5isQhGOB2{_X}he^8bi5WNs@5d^(WTbr=|%hpb-48@mH$ zw@MlnEy29+GYbF5!3kwBA4~!!oP+sC28c<-TLsU_BUmU`0{-z1#ztUiwUL5yP`t$l zh`Wq;I+(!o5PFRr?8FrO)y*y%)GDuuX8^Bc)eUVu5Srr@cH&bC%yA08=;J|!eNF`r zJ()1hsrK$hw)CcboO+CHz0*Jy!$uFQr`FP8MdU0_=4h)}S-AlSa}t)~Udqc7Z~MK;$vz>hBW-X#EH?ela!l`u z>HvxU4T`#%UG%d;G{xCD!IQhhzIOWJY8UO*6cW5g9M^MVr#uobG)$=cBE_guIFT<) z$?Y^gJX%`pxtEjLCM|m-n(J<9+0K(J&s{2vKfraNRP5f#K{84^PMKL|gH*pg6c{%o z?fN&64T+MPj+JpPE=gYQu_8x zUcAbS4f;b~endmZ66EbIoRslf+=&R8=3lorULpN;b1V?;mdWde)X(%ELY=Tbdi4RNS1(&`h8tV-2cQ` zSQCM%P0rTeF4KmOohz>Kg2yg!?k_C|w2u{i)*3(+rp(KzW`q6nl$9-fz}>Et{9VgN zmMe7!(>R!Cl)9T{%575i=5oMsQt7;3%r{B8a!f@=WhgIHOdQ*82v|Lb7y6PR`C22( zj4`BayTn)APllzt*%z-mgU!Nnr+OONlnabEWVkx`I)%(PTw5CmHT)LY!{jj;w_Rq; zwQ_DAxRh*U+6b#l>76@l=W>^;SC`YxK-bZ!^>p3r8WKtOL%Ut)_s~tRe%DQTBQkwm z2Znh;JW3r5buZ-WHNLf8*1CD?F$YChixL!QSqWr*#q^@0wXL0*{{sbFgSG$w delta 1552 zcmXApdr(wm7{;I7{m$9j*y5b$7Y$A}Zsg>4=h}VgjN~cp=4RL2x!awjDL}A z0-`1IFu9pLLe`PAkLFM6Aa9VL1D@ysK3oK1!pKYH1oCS#mrhH7)K7pUGhnFnGqxW{ z8OHbD09PUf&m`wi;67lM0EW#6=H>vyulnie1r~Gx;Y=bwkA4pUi_3smC)CF;zyp06 zG)YNx_zg5(Ivn*A#FpCtY!H>70!jeH`Bi{@E5xPaKtQ>lW1m8N$E@vki0@w}b0D6? z0-*-dO(sJ;jU)3R+2#VyW=M(C=ywOCG$#3+1nIS|a6YVuR5ulf(35l&;eqtga&oZx zt}5OdcN(s9)D?FRsjWVJPNW_3F{|3C9_|sy82vuWa2pw0nU?JtX8gJrFu#tO%l-t$ z6d=2DCxcu=P9gt~??=wg_WydYb=TmyHuwZ~CUx-CA?LAQ@|AVU=%eRHFJZ=Y&^*Tp~s~&N9!aLLrH5915uWqux z1L&gEXCFLZIV07*l~(pI<$z}Dd%pT)Ycg(fLZj+63%>jU2->YFob)abazL}!%V~DI zg(KZUfk#DRCMPmzwpdlcsdhAoqGB)q9~A2&W^IY@CKrpwwu2tPQZ3rHQTf=ZqRYTZ9aAfYv<#?Rmt3mpoWvk0y^XDKUYC}J zHgG~Kq!llvuoZ>Uirr_(R;h4Y6KR%;1Ka7RUD|aakD0HP_SA44M}8~SJ&R?Fv{HRX z8SwmJ>1b;S6D^X?xjpQ4RGO@jA2YBlD^)xgGbD%ik)fw#+ePkaNX)o3i-bu65XGpE^mK^r)M&0_}L~0NJTsJK0Ks z8?}{P7n#rk?c?la?JV7XUHUy{FjlWCy+hivbQQB+Wv|!hyq9^vI$Jl;*1|v~`uM$< zS-M^N70vvv9MYE^CvUw)z|9QeXjks;dOkTu|%`z-Y zqip0D3hE13_XI!3bQ=mzhVwn&uqJaI<=^x(CD`zRFG_Tbp|NuU%TQ_*rM&8rGmWJ` z|Hx6EZrpNf3Cr@Y@rMmu3Ef|cA$KjHaw@Bi(asZCsFeI&#Re`^YMW9}&0=k}X=`gm{Z=9zB2$wo(vGu_|Zg6b)9VD@(Nw7I36ne*n7%?zCo zVcziYAvIgfJv}Q~X|E+HV-GKbA&Whcm3I_c=AC0D!;V - + G-code program Programme G-Code @@ -189,22 +189,22 @@ - + Check mode Simulation d'usinage - + Autoscroll Défilement auto - - - + + + Open Ouvrir @@ -216,7 +216,7 @@ - + Send Envoyer @@ -267,7 +267,7 @@ - + Home Origine @@ -316,7 +316,7 @@ - + Heightmap Palpage surfacique @@ -347,11 +347,11 @@ - - - - + + + + Spindle Broche @@ -367,8 +367,8 @@ - - + + Feed Avance @@ -384,11 +384,11 @@ - - - - + + + + Jog Contrôle Manuel @@ -548,73 +548,83 @@ Sauvez &transformé comme... - + Idle Idle - + Alarm Alarme - + Run Demarrer - + Hold Stop - + Queue En attente - - - - + + + + Check Vérifié - + + Door + Porte + + + + Unknown + Inconnu + + + &Insert line &Inserer ligne - + &Delete lines &Effacer ligne - - + + Restore XYZ: %1, %2, %3 Retour XYZ: %1, %2, %3 - + G-code program file was changed. Save? Le programme G-code à changé. Sauvegarder? - + Heightmap file was changed. Save? Le fichier surface de palpage a changé. Sauvegarder? - + Not connected Non connecté - + Probe Palper @@ -623,74 +633,74 @@ Connecté - + Job done. Time elapsed: %1 Travail terminé. Temps écoulé: %1 - + Processed Traité - + Serial port error Erreur port serie - + Buffer: %1 / %2 - - + + Scroll Déplacement - + File sending in progress. Terminate and exit? Envoi de fichier en cours. Terminer et Sortir? - + Sent Envoyé - - - + + + Heightmap files (*.map) Fichier de palpage (*.map) - + Port opened Le port s'est ouvert - + G-Code files (*.nc *.ncc *.ngc *.tap *.txt);;All files (*.*) G-Code fichiers (*.nc *.ncc *.ngc *.tap *.txt);;Tous les fichiers (*.*) - - + + Can't open file: Impossible d'ouvrir du fichier: - - - - - + + + + + In queue En attente @@ -699,41 +709,41 @@ Temps écoulé: %1 Envoyé - + Delete lines? Effacer ligne? - - - - - - - + + + + + + + (%1) - + Untitled Sans titre - - - + + + Save file as Enregistrer le fichier sous - - + + G-Code files (*.nc *.ncc *.ngc *.tap *.txt) G-Code fichiers (*.nc *.ncc *.ngc *.tap *.txt) - + Changing grid settings will reset probe data. Continue? Changer les paramètres de la grille, réinitialise les données de palpage. Continuer? diff --git a/src/translations/grblControl_ru.qm b/src/translations/grblControl_ru.qm index ef9c14d833f0848e78b631c576ffc5ad6a6a42bf..6fcffed5411438fc363940d2ff2eedb05def9460 100644 GIT binary patch delta 1633 zcmX|>drVVj7{;H{@3f_~6p#Xzi*hX@lv@j^Y+i-|K{Ihvu$l}}rYM36iZDW#d5J;B zKm;8y+@=Fm+(tk|L|u%i=+tfM%$5jvC-atR#xjj_4{5SLPJZW{@AkaU`@UbxM|;Yu z-DTA^dXvrQ1z-wb1>8>p(lkK%)K1eK z@(>X4C3zSK)RRZZSd#Mt)5#NL0eKQO1b)hwi~PaK(j{_$yi7jirbR%!1&DSA)Q{~9 z&Ie*$DKrHzN0DEX^C`#|m?r=?8IYavvQCAbFOibt8F5P;VPjLTRoh z87Vs%aA*hSJZc1-?;>@@3n0u3iz@2?Lj*E%IUbpZjJj?79zbT_QNVjMG6%Sy_kLJi zDwrv{Zf*MpkO?~{ehX_m_4~WQdX*cP7h*}yOY#DiDp)4|g?3sjSXrf~pc^RMX<$YL zHXr8!9>W;WA7>^q@aNf7KwB&G3jC3o%a+|!HPFbz4iP^bpfAM^rt1cGD!k{A^V|cN znC(#Wq?{?eU+XLPv|V)=s^qq2Z+X%-`Vo9Xo^mUT6__kveBm@J)L)+a_7)zemNyQ# z0hR+IJW*M}ToRMP5Z25V2I`7qa-`%ETtWcLBXYl#Hc8qZ3>2FdXA)Q57Ho zxlXzQUbE=ti;MIm9Y#VIu_HY{DdQSw0TT*)j;20YhDi9Iyl zv{qW~(aK6SNvr0vEh1IYs?X1mQ>EPaLmWRS6}t7Zpw>%!&RZGgVX2`$9PoW6HT@gJ zgiM!OPL#4PUP<2{D`H{-T%~>sGwXj%Ay=>uCmmI2YPc|{TH!N7dU_~~7mGPQO|g6} z``!GHVs*EYZIq;_?_i}&=v6cuniy%bVrUQNdtXsJD_g+-h05@;`yuXsT)BRxfdZ!~D^FcqO2rP!rz?6nF+!F2fDwe9Rh8T$jn7mS^FE*hqpE=`TwthE zz3l1aL4%H_#w!$>>bR<%|Fz>COFP(dzWW`^Hqz>-R>$T-&WrA<)k;QNtK;9J^vOrB zPK)7bL66ic5-1zX)Hy9VOvpYv!#-2z9QWb(PwI7P8(AiicE)Z|?;blP;EcMhZz})a zb`mAL?qYhKN^bv78+x5~470&4*-kf$xA8*A(x@}nv(Be$7A&gbI{zk3UI!P9Q)-I- zs-d5)n!W9*EX+SNd+%E*cck{RmVR=z6(saunT<@YB85PdB|@=(c8$ z$u#SRUb8{mhwKc`%jK#ioehdlTz2^ieT=Y(8Dg%A&O*UQBo!2F=ydXwTtnQ2F9#Du iycnA_Q_K=?iMRiss9c!8CcmIKzxFG=zSBK)m;OKR4T1Oo delta 1544 zcmXApdr*{B7{;I7J>M>SU(n^Uhzf!W0t?7RG$u7Qxkzd{Ae&QoA;8R0K@CGT71WRz zkwikmsZ43Mw#qd}l;}kF~4al^!?qy)XS|BhB@*`&* zfVu&Ss3;Z+hN6=NN56pBavOjZqU>8hw;JMyr9kL?hzp#?)bCZ&K6}lPXm$_sc z#6Te68Bg+1&xH^#gUB*S*4aRKAEd}>tXl&qegfd*59xhBcILAkQted0?*++1!&gDt zoehjISKgJ`EI~bp>2UTX5ZB^l3gY)Wxx6x5?&T;#V(@3|ayk;Xa;)H4NP4&nFx*D+ z;=h5A7NnKYD~kf@xqKg?Mf#2s{@;yxCyoNXZ(&~N8L|L&QzW4@B>9sWtKA2D6XE;m!21IXKIp>N;dqc$Gkc?_NAHtIfr zKhMx(eWlEM)J6IeFT3Mb1B4~Z!%y#_3aN5i7xzVMlxO|r$pho%6_1MO+i`h)6&rM$ zDQ^tjKz=Ge^WXvHTqf@+voJu>?TV=-)FUWgk$8&<^}nacIQJbe!V-)Oh_{GLVIqed5=%=9*}zM&EU%Ld`-;`WXEM=GMS;@>olzA3&IzsWit+#n zFs6y>B!(<_v)C8M)CaeThSt3dkVz$4%h~yuT5(Flq=q~duT(rxKSPRBKgjbx&f=h4m}nWUX(?VNnQR8z&<;nyM6{ufA# z%+kK&YnhA7(&3hT4tiMXh;`6w|CLIGlJ_rUu2NUQje!x$VSS`$ztVbs4d1&f7k%hW z&#IM6j;ZMJZDm!HV4-cwI!i4ltyA{wTcV13)WxjWRO2m! z~j9KJXaEG*(yOpNCM+FAlIxlg9Rlx-O6FqUKbZC9C^7_45JhYFyc{-7R@*Sz@v~-m$|~kWaxpqU^SQHTzyeLfi3xn(q7?=Fu#L^o7W{UT z!OhTa>0QWPW!md&cmdRzI?cQl4EjXf(k8C+xTVYgr-E*+(^Vf#W*$%Ls_)v_(`H?L zCUcETy7nh|K;=V8?eNjPlJTtA5`Dn(S-i3P^$ERooI~iR@3_XS@6l&}N#VV>>mAFS z^IX#((OqS&EBfxfDa`OmeeX&-Iy_W=zliTOlK$}~>SY>daPPRmNt+DQW*4xhNrwC) z_7E|_u%@5iznCCHclQ!tT(F;UNMa3z_A`b?Qt+^o#yK4n(7V%EywJJfs3F^X diff --git a/src/translations/grblControl_ru.ts b/src/translations/grblControl_ru.ts index 602a11b4..9db6a918 100644 --- a/src/translations/grblControl_ru.ts +++ b/src/translations/grblControl_ru.ts @@ -98,7 +98,7 @@ - + G-code program G-code программа @@ -213,13 +213,13 @@ - + Check mode Режим проверки - + Autoscroll Автопрокрутка @@ -254,7 +254,7 @@ - + Send Отправить @@ -303,7 +303,7 @@ Статус: - + Not connected Нет соединения @@ -355,7 +355,7 @@ - + Heightmap Карта высот @@ -386,11 +386,11 @@ - - - - + + + + Spindle Шпиндель @@ -406,8 +406,8 @@ - - + + Feed Подача @@ -423,11 +423,11 @@ - - - - + + + + Jog Перемещение @@ -582,70 +582,80 @@ Сохранить &преобразованный как... - + Idle Готов - + Alarm Тревога - + Run Работа - + Home Домой - + Hold Пауза - + Queue Пауза - - - - + + + + Check Проверка - + + Door + Дверь + + + + Unknown + Неизвестно + + + &Insert line &Вставить строку - + &Delete lines &Удалить строки - - + + Restore XYZ: %1, %2, %3 Восстановить XYZ: %1, %2, %3 - + G-Code files (*.nc *.ncc *.ngc *.tap *.txt);;All files (*.*) Файлы G-Code (*.nc *.ncc *.ngc *.tap *.txt);;Все файлы (*.*) - - + + G-Code files (*.nc *.ncc *.ngc *.tap *.txt) Файлы G-Code (*.nc *.ncc *.ngc *.tap *.txt) @@ -654,14 +664,14 @@ Файл был изменен. Сохранить? - + Job done. Time elapsed: %1 Задание выполнено. Времени затрачено: %1 - + Buffer: %1 / %2 Буфер: %1 / %2 @@ -670,18 +680,18 @@ Time elapsed: %1 Файлы G-Code (*.nc *.ncc *.tap *.txt);;Все файлы (*.*) - + Delete lines? Удалить строки? - - + + Scroll Прокрутка - + File sending in progress. Terminate and exit? Идет процесс отправки файла. Прервать и выйти из программы? @@ -690,38 +700,38 @@ Time elapsed: %1 Файлы G-Code (*.nc *.ncc *.tap);;Все файлы (*.*) - - - + + + Heightmap files (*.map) Файлы карт высот (*.map) - - + + Can't open file: Ошибка при открытии файла: - + Sent Отправлена - - - - - - - + + + + + + + (%1) - + Untitled Без имени @@ -730,7 +740,7 @@ Time elapsed: %1 Файлы G-Code (*.nc *.ncc *.tap *.txt) - + Changing grid settings will reset probe data. Continue? Изменение сетки зондирования приведет к очистке табличных данных. Продолжить? @@ -739,32 +749,32 @@ Time elapsed: %1 Подключен - + G-code program file was changed. Save? Файл G-code программы был изменен. Сохранить? - + Heightmap file was changed. Save? Файл карты высот был изменен. Сохранить? - + Probe Зонд - + Port opened Порт открыт - + Processed Обработана - + Serial port error Ошибка последовательного порта @@ -773,18 +783,18 @@ Time elapsed: %1 Буфер/очередь: %1 / %2 - - - + + + Save file as Сохранить файл как - - - + + + Open Открыть @@ -793,11 +803,11 @@ Time elapsed: %1 Файлы G-Code (*.nc;*.ncc;*.tap) - - - - - + + + + + In queue В очереди