From 0d34b6c351872ef25b115241114aa9e936302c4d Mon Sep 17 00:00:00 2001
From: byloveletter <byloveletter@falinux.com>
Date: Tue, 24 Oct 2017 10:12:27 +0900
Subject: [PATCH] =?UTF-8?q?=EC=8B=9C=EC=8A=A4=ED=85=9C=20=EC=A0=95?=
=?UTF-8?q?=EB=B3=B4=20=ED=91=9C=EC=8B=9C=20=EA=B4=80=EB=A0=A8=20=EB=B3=80?=
=?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- HACCP 제공 시스템 정보 데이터 인터페이스 추가
- 영문 오타 수정
---
app/gui/oven_control/config.cpp | 64 ++-
app/gui/oven_control/config.h | 36 +-
app/gui/oven_control/configinfodlg.cpp | 66 +--
app/gui/oven_control/configinfodlg.h | 2 -
app/gui/oven_control/fileprocessdlg.cpp | 2 +
app/gui/oven_control/fileprocessor.cpp | 26 +-
app/gui/oven_control/fileprocessor.h | 1 +
app/gui/oven_control/lang_en.qm | Bin 89898 -> 71082 bytes
app/gui/oven_control/lang_en.ts | 847 ++++++++++++++++++++----------
app/gui/oven_control/lang_zh.ts | 901 ++++++++++++++++++++++----------
10 files changed, 1320 insertions(+), 625 deletions(-)
diff --git a/app/gui/oven_control/config.cpp b/app/gui/oven_control/config.cpp
index 32ebd25..b3df37a 100644
--- a/app/gui/oven_control/config.cpp
+++ b/app/gui/oven_control/config.cpp
@@ -5,6 +5,7 @@
#include <QApplication>
#include <QProcess>
#include "config.h"
+#include "define.h"
#include "configdatetimedlg.h"
#include "configlanguagedlg.h"
#include "configtemptypedlg.h"
@@ -32,7 +33,6 @@
using namespace Define;
using namespace System;
-
Config* Config::instance = NULL;
Config::Config(QObject *parent) : QObject(parent)
@@ -43,7 +43,7 @@ Config::Config(QObject *parent) : QObject(parent)
qApp->installEventFilter(&watcher);
applyCurrentConfigLanguage();
applyConfig();
-
+ loadProductInfo();
// m_setFavorite.insert(2);
// m_setFavorite.insert(3);
@@ -70,6 +70,13 @@ Config* Config::getInstance(QObject *parent){
return instance;
}
+QString Config::getProductSWVersion()
+{
+ if(MAJOR_VER == 0)
+ return QString("V%1.%2.%3 BETA").arg(MAJOR_VER).arg(MINOR_VER).arg(HOTFIX_VER);
+ else return QString("V%1.%2.%3").arg(MAJOR_VER).arg(MINOR_VER).arg(HOTFIX_VER);
+}
+
void Config::initConfig(){
memset(configlist.data,0x00,MAX_CONFIG_COUNT * 4);
configlist.items.language.d32=0;
@@ -436,13 +443,6 @@ void Config::removeFavorite(Define::ConfigType idx){
m_setFavorite.remove((uint32_t)idx);
}
-QString Config::getProductSerial()
-{
- QString strProductSerial;
- strProductSerial = DEFAULT_PRODUCT_SERIAL;
- return strProductSerial;
-}
-
void Config::applyCurrentConfigLanguage()
{
if(configlist.items.language.d32 == 0){
@@ -481,6 +481,52 @@ void Config::allProgramInit()
}
}
+bool Config::loadProductInfo()
+{
+ QString strTemp;
+ QMap<QString , QString> mapInfos;
+
+ FileProcessor::readFromInfoFile(mapInfos, QString(MODEL_INFO_FILE_NAME));
+
+ //m_strProductModelName = mapInfos[tr("모 델 명")];
+
+ if(mapInfos.find(tr("모 델 명")) !=mapInfos.end())
+ m_strProductModelName = mapInfos[tr("모 델 명")];
+ else if(mapInfos.find(("모 델 명")) !=mapInfos.end())
+ m_strProductModelName = mapInfos["모 델 명"];
+ else m_strProductModelName = "PRIME ST-01";
+
+ //m_strProductDateTime = mapInfos[tr("제조일자")];
+ if(mapInfos.find(tr("제조일자")) != mapInfos.end())
+ m_strProductDateTime = mapInfos[tr("제조일자")];
+ else if(mapInfos.find("제조일자") != mapInfos.end())
+ m_strProductDateTime = mapInfos["제조일자"];
+ else m_strProductDateTime = "2017-10";
+
+
+ //m_strProductCountry = mapInfos[tr("제조국")];
+ if(mapInfos.find(tr("제조국")) != mapInfos.end())
+ m_strProductCountry = mapInfos[tr("제조국")];
+ else if(mapInfos.find("제조국") != mapInfos.end())
+ m_strProductCountry = mapInfos["제조국"];
+ else m_strProductCountry= "Korea";
+
+ //m_strProductCompany = mapInfos[tr("제조사")];
+ if(mapInfos.find(tr("제조사"))!= mapInfos.end())
+ m_strProductCompany = mapInfos[tr("제조사")];
+ else if(mapInfos.find("제조사")!=mapInfos.end())
+ m_strProductCompany = mapInfos["제조사"];
+ else m_strProductCompany="PRIME";
+
+ //m_strProductSerial = mapInfos[tr("제품번호")];
+ if(mapInfos.find(tr("제품번호"))!=mapInfos.end())
+ m_strProductSerial = mapInfos[tr("제품번호")];
+ else if(mapInfos.find("제품번호")!=mapInfos.end())
+ m_strProductSerial = mapInfos["제품번호"];
+ else m_strProductSerial = "01";
+ m_strProductType = tr(g_strModelTypeName[getConfigValue(Define::config_model).d32]);
+}
+
void Config::execConfigWindow(QWidget *parent, Define::ConfigType idx){
QDialog *dlg;
QString usbPath = "";
diff --git a/app/gui/oven_control/config.h b/app/gui/oven_control/config.h
index 1a5ea63..9d3dc77 100644
--- a/app/gui/oven_control/config.h
+++ b/app/gui/oven_control/config.h
@@ -112,6 +112,23 @@ const char hotline_service_item_name[3][32] ={
};
+static const char* g_strModelTypeName[] ={
+ QT_TRANSLATE_NOOP("Config", "전기식 10단"),
+ QT_TRANSLATE_NOOP("Config", "전기식 20단"),
+ QT_TRANSLATE_NOOP("Config", "전기식 24단"),
+ QT_TRANSLATE_NOOP("Config", "전기식 40단"),
+ QT_TRANSLATE_NOOP("Config", "가스식 10단 LPG"),
+ QT_TRANSLATE_NOOP("Config", "가스식 20단 LPG"),
+ QT_TRANSLATE_NOOP("Config", "가스식 24단 LPG"),
+ QT_TRANSLATE_NOOP("Config", "가스식 40단 LPG"),
+ QT_TRANSLATE_NOOP("Config", "가스식 10단 LNG"),
+ QT_TRANSLATE_NOOP("Config", "가스식 20단 LNG"),
+ QT_TRANSLATE_NOOP("Config", "가스식 24단 LNG"),
+ QT_TRANSLATE_NOOP("Config", "가스식 40단 LNG")
+};
+
+
+
namespace Define
{
@@ -299,8 +316,15 @@ class Config : public QObject
~Config(void);
static Config *instance;
- InputOverwatcher watcher;
+ QString m_strProductModelName;
+ QString m_strProductDateTime;
+ QString m_strProductCountry;
+ QString m_strProductCompany;
QString m_strProductSerial;
+ QString m_strProductType;
+ InputOverwatcher watcher;
+
+
@@ -426,6 +450,13 @@ class Config : public QObject
public:
static Config *getInstance(QObject *parent=0);
+ QString getProductModelName(void){return m_strProductModelName;}
+ QString getProductDateTime(void){return m_strProductDateTime;}
+ QString getProductCountry(void){return m_strProductCountry;}
+ QString getProductCompany(void){return m_strProductCompany;}
+ QString getProductSerial(void){return m_strProductSerial;}
+ QString getProductSWVersion(void);
+ QString getProductType(void){return m_strProductType;}
//static void init();
void initConfig(void);
void soundConfigReset(void);
@@ -444,9 +475,10 @@ public:
void copyConfigArea(const char* buff);
void insertFavorite(Define::ConfigType idx);
void removeFavorite(Define::ConfigType idx);
- QString getProductSerial();
void applyCurrentConfigLanguage();
void allProgramInit(void);
+ bool loadProductInfo(void);
+
diff --git a/app/gui/oven_control/configinfodlg.cpp b/app/gui/oven_control/configinfodlg.cpp
index 5a97262..a4bc6bf 100644
--- a/app/gui/oven_control/configinfodlg.cpp
+++ b/app/gui/oven_control/configinfodlg.cpp
@@ -6,24 +6,10 @@
#include "soundplayer.h"
#include "config.h"
#include "define.h"
+#include "fileprocessor.h"
-static const char* g_strModelTypeName[] ={
- QT_TRANSLATE_NOOP("ConfigInfoDlg", "전기식 10단"),
- QT_TRANSLATE_NOOP("ConfigInfoDlg", "전기식 20단"),
- QT_TRANSLATE_NOOP("ConfigInfoDlg", "전기식 24단"),
- QT_TRANSLATE_NOOP("ConfigInfoDlg", "전기식 40단"),
- QT_TRANSLATE_NOOP("ConfigInfoDlg", "가스식 10단 LPG"),
- QT_TRANSLATE_NOOP("ConfigInfoDlg", "가스식 20단 LPG"),
- QT_TRANSLATE_NOOP("ConfigInfoDlg", "가스식 24단 LPG"),
- QT_TRANSLATE_NOOP("ConfigInfoDlg", "가스식 40단 LPG"),
- QT_TRANSLATE_NOOP("ConfigInfoDlg", "가스식 10단 LNG"),
- QT_TRANSLATE_NOOP("ConfigInfoDlg", "가스식 20단 LNG"),
- QT_TRANSLATE_NOOP("ConfigInfoDlg", "가스식 24단 LNG"),
- QT_TRANSLATE_NOOP("ConfigInfoDlg", "가스식 40단 LNG")
-};
-
ConfigInfoDlg::ConfigInfoDlg(QWidget *parent, ConfigType type) :
@@ -69,37 +55,6 @@ void ConfigInfoDlg::on_ctrBtnOk_clicked()
deleteLater();
}
-bool ConfigInfoDlg::readFromInfoFile(QMap<QString, QString> &info_map, const QString &filename){
- QFile file(filename);
- QString label,value;
- qDebug() << "orgin size " << info_map.size();
- if(file.open(QIODevice::ReadOnly | QIODevice::Text)){
- while(!file.atEnd()){
- QString line = (QString::fromUtf8(file.readLine())).remove(QChar('\n'));
- info_map[line.section(',',0,0)] = line.section(',',1,1);
- }
- qDebug() << file.fileName() << "read OK!";
- qDebug() << "final size " << info_map.size();
- QList<QString> list = info_map.keys();
- for(int i=0; i< info_map.size() ;i++){
- qDebug() << list[i] << info_map[list[i]];
- }
- return true;
- }
- else {
- qDebug() << file.fileName() + " file not found";
- }
- return false;
-}
-
-QString ConfigInfoDlg::getSoftwareVerString()
-{
- if(MAJOR_VER == 0)
- return QString("V%1.%2.%3 BETA").arg(MAJOR_VER).arg(MINOR_VER).arg(HOTFIX_VER);
- else return QString("V%1.%2.%3").arg(MAJOR_VER).arg(MINOR_VER).arg(HOTFIX_VER);
-}
-
-
void ConfigInfoDlg::loadSoftwareInfo(){
Config* cfg = Config::getInstance();
QString strTemp;
@@ -109,15 +64,14 @@ void ConfigInfoDlg::loadSoftwareInfo(){
//Default Value;
- mapInfos[tr("모 델 명")] = "PRIME ST-01";
- mapInfos[tr("제조일자")] = "2017-06";
- mapInfos[tr("제조국")] = "Korea";
- mapInfos[tr("제조사")] = "프라임";
- mapInfos[tr("제품번호")] = "01";
- mapInfos[tr("소프트웨어 버전")] = getSoftwareVerString();
- mapInfos[tr("현재모델")] = tr(g_strModelTypeName[cfg->getConfigValue(Define::config_model).d32]);
+ mapInfos[tr("모 델 명")] = cfg->getProductModelName();
+ mapInfos[tr("제조일자")] = cfg->getProductDateTime();
+ mapInfos[tr("제조국")] = cfg->getProductCountry();
+ mapInfos[tr("제조사")] = cfg->getProductCompany();
+ mapInfos[tr("제품번호")] = cfg->getProductSerial();
+ mapInfos[tr("소프트웨어 버전")] = cfg->getProductSWVersion();
+ mapInfos[tr("현재모델")] = cfg->getProductType();
- readFromInfoFile(mapInfos, QString(MODEL_INFO_FILE_NAME));
for(int i =0;i<MAX_SOFTWARE_INFO_CNT;i++){
strTemp = mapInfos[tr(software_item_name[i])];
@@ -142,7 +96,7 @@ void ConfigInfoDlg::loadHotlineChefInfo(){
mapInfos[tr("이 름")] = "김성우";
mapInfos[tr("위치정보")] ="인천광역시 남동구 남동동로 34번길 56";
- readFromInfoFile(mapInfos, QString(CHEF_INFO_FILE_NAME));
+ FileProcessor::readFromInfoFile(mapInfos, QString(CHEF_INFO_FILE_NAME));
for(int i =0;i<MAX_HOTLINE_CHEF_CNT;i++){
strTemp = mapInfos[tr(hotline_chef_item_name[i])];
@@ -165,7 +119,7 @@ void ConfigInfoDlg::loadHotlineServiceInfo(){
mapInfos[tr("연 락 처")] = "1644-9533";
mapInfos[tr("위치정보")] ="인천광역시 남동구 남동동로 34번길 56";
- readFromInfoFile(mapInfos, SERVICE_INFO_FILE_NAME);
+ FileProcessor::readFromInfoFile(mapInfos, SERVICE_INFO_FILE_NAME);
for(int i =0;i<MAX_HOTLINE_SERVICE_CNT;i++){
strTemp = mapInfos[tr(hotline_service_item_name[i])];
diff --git a/app/gui/oven_control/configinfodlg.h b/app/gui/oven_control/configinfodlg.h
index ebb9aaf..ee3eda6 100644
--- a/app/gui/oven_control/configinfodlg.h
+++ b/app/gui/oven_control/configinfodlg.h
@@ -31,8 +31,6 @@ protected:
void keyReleaseEvent(QKeyEvent* event);
void keyPressEvent(QKeyEvent* event);
- bool readFromInfoFile(QMap<QString , QString> &info_map, const QString &filename);
- QString getSoftwareVerString(void);
private:
Ui::ConfigInfoDlg *ui;
diff --git a/app/gui/oven_control/fileprocessdlg.cpp b/app/gui/oven_control/fileprocessdlg.cpp
index 5222dd6..b729aa1 100644
--- a/app/gui/oven_control/fileprocessdlg.cpp
+++ b/app/gui/oven_control/fileprocessdlg.cpp
@@ -845,6 +845,8 @@ void FileProcessDlg::standardInfoUpload()
file.setFileName(CHEF_INFO_FILE_NAME);
file.remove();
sync();
+ QThread::msleep(1000);
+ Config::getInstance()->loadProductInfo();
strSrcPath = QString("%1%2").arg(strUsbPath).arg(CHEF_INFO_FILE_NAME);
qDebug() << strSrcPath;
if(QFile::copy( strSrcPath ,CHEF_INFO_FILE_NAME)){
diff --git a/app/gui/oven_control/fileprocessor.cpp b/app/gui/oven_control/fileprocessor.cpp
index da00c79..369d36d 100644
--- a/app/gui/oven_control/fileprocessor.cpp
+++ b/app/gui/oven_control/fileprocessor.cpp
@@ -68,5 +68,29 @@ quint64 FileProcessor::getDirSize(const QString &str){
}
}
}
- return sizex;
+ return sizex;
+}
+
+bool FileProcessor::readFromInfoFile(QMap<QString, QString> &info_map, const QString &filename)
+{
+ QFile file(filename);
+ QString label,value;
+ qDebug() << "orgin size " << info_map.size();
+ if(file.open(QIODevice::ReadOnly | QIODevice::Text)){
+ while(!file.atEnd()){
+ QString line = (QString::fromUtf8(file.readLine())).remove(QChar('\n'));
+ info_map[line.section(',',0,0)] = line.section(',',1,1);
+ }
+ qDebug() << file.fileName() << "read OK!";
+ qDebug() << "final size " << info_map.size();
+ QList<QString> list = info_map.keys();
+ for(int i=0; i< info_map.size() ;i++){
+ qDebug() << list[i] << info_map[list[i]];
+ }
+ return true;
+ }
+ else {
+ qDebug() << file.fileName() + " file not found";
+ }
+ return false;
}
diff --git a/app/gui/oven_control/fileprocessor.h b/app/gui/oven_control/fileprocessor.h
index eef902a..c1f0d3b 100644
--- a/app/gui/oven_control/fileprocessor.h
+++ b/app/gui/oven_control/fileprocessor.h
@@ -12,6 +12,7 @@ static bool fileExist(const QString &path_file);
static bool detectUSB(QString &usbpath);
static void getAllDirList(QDir d, QStringList &list);
static quint64 getDirSize(const QString &str);
+static bool readFromInfoFile(QMap<QString , QString> &info_map, const QString &filename);
};
#endif // FILEPROCESSOR_H
diff --git a/app/gui/oven_control/lang_en.qm b/app/gui/oven_control/lang_en.qm
index cbaa9ba182929fcab75466d47925e997f3765490..8bb2691e799e4c1d982a36639f629fdad254a8fc 100644
GIT binary patch
delta 6898
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
delta 23114
zcmeHu30Ra>8}@T%VVH$^K`>ba$1T7V6%lt-#9eV;Qv(5478l&g8dNk(b74fp&`{CT
zNKsr9O*6}KN!x5stv-zzGQYH}T>ksKhZ#o1jmqom|NqMi?|0t!owGd8{cPu)+5DPn
z^8vNF^`3a|_b=sSo~T*<&6qX&zm6pGK1)P(iH4|w4TxUI1cner{tRqH<ng({A&q5Z
z!J)v(c(n<UViwWU{zOWAf92CMGUf$rM|5Kdkvf8y|5>6woq<tA=6)M+v6X00PolZY
z(auexhPa+mooJGUsQ54jk|84_H=<uYCTgrBy4nL6BO?oH2+SmA^dtJ!6>TNR$f8aF
z-H1Kb8HmmrF90qC?gD-fY)WQ+!Q623x1+!kQg*<|t1y9C2S|wlu#gR;%4I}PselS#
zGoTVUPT<pBfGT`mB_j*|0SM_mbxKC&*B|IY6r&WlDIcgI8g|PpE@Hw3&M^vH?@g)`
zdmtHiQhoXok;^cFH;<C~2}mIRM^Z<vCKh^*TsAz3=N5ALV+15MT;Q#fr0KYxDC2P%
znff!*<mVB!=uDbj!-#U`kmewylws~8UoaO>lInj$bZIwv9ff{pwji&Pu0+r5C;#rL
zM5C9=$W(_Z*kvQpV@)Yo!zDJD>UVd?^Y1C-0{F3`0fo*;f+`s`X#=h-*(mTvFokUg
zN1DV^*k=;az)=)-Wia&r<OOQVFNQUs@Gy>(shRwFFLj!71z*UbPSfh3Llt%Lnt~Z`
zrGc+vCa;DI-1-X*o`(TeNf78cR$xMbz`6TmWZ)Ekk2P_p!9PMZ4J8@P)bg6R(d9A?
zzJU%C%(Q4Ua9Ip39)uYczCz1&&k>#LLofGzikSXq+MSz7<nt-LZGgy+G@}zIKst{}
zbajb|XmLwmAEK86fPH~Of&GBXf&GCW0tXN+G6DyhanTJIgMjmZkieq1fH0LsH<{0`
zMMO0^vd8OuMP#WbBh%Dpk6-(lnAdgIvS~h1qJjxYeZo3_xu2-^PS$PcPek1dWn|62
zVbRMM605O_^&JB<o_dN67;=l~l|5`|A2VjU@jEsw61ocN$Ho=FrcV~IlxPD{$~u<v
z>NV)FwT!I(2sY&c2DosZjO>X&+0<$<({YE`oS{ad3)9)6GkE{S5E)rLZ?^Q^n?&1M
zvDMElCEE8Sdvz4vA9ICmeBvCj22<G{Gr{zdGuct;BGI#J*wrtO!`wbpsD3$3%==x1
zu{Ij$(Njj&VuGT|NW8zLy`su_8<GD<0z<PE)d&1RG%;ThVEU1${tJp)wNJu_6e;S*
zf#nJ3fMX!RDKaw6^NR3x)rocRQ<x(zh7o&whNAsBh&tnfjLhY8MTa^CaDt-+wm+qi
zMI7d-=#c>SFRvma({@qx3_OB{x5&serxZ^vzfAN&BgF_WsBD6ZB7Ql@y7&vl=!uC$
z!JjI|UPvS6?x7g3NCmfAo8=2uv%6vr_efRGC{|RdL8Ln=F!wFR%0}Qus~3S;L~V?U
zm5rO>vlWQ@t$Qd|hVswBz~Ausb;Zgi_}nH1i05riDPGI*CT2=f?91IobiJiw-?4K<
zC(;#f_s=1E!aPZF^k;Wsp8rvt?BhZ7#!<zWn+Tj>3Y)=;Sa_J?Co@Eyd`)pFwt$#n
zvEuSU*e|tJx_^G0sOEKLt*LJlX)Xv{wOILhU9?j>RM{vd3Y@yAY*HJqU;jnfswNR@
zT1OeR2Ja7QCL=RPtyXs7KE6t*vRlV^n3b<`=*V`&T0X5DQ4CQ|KB0`O{WZ}BFXgz?
zBZ-<`5IDMra=a}K-^*4e)((R2&sC<x?Iq@0RXI8CG?Cxe0vlMBQ@#Z0rnFWr2t;6-
z8>QS({SeXPGn8At_!0j9`MSz2w`SnMdF6qwB}9iWC{OK#UGG&ZPygJTm`8!~%gLh=
z*`ft1W0b#T;(6L*Dke9Wq%sA7{hwS^HD3%#`8HQ|&oK}SFsgdIg_%B9r0RLzhiJT)
zs`pypYZp`l;viWcwQ5k~@6E*OexVwgzME*)ORAxBfoZ=0&j2^5hR(z1*@uAmJgc2*
z==0Tpc>nonxF4t*Iv@9Er>bHGg5?dys^WLgB6>GN_4FmoIOQo--kC6{XoA4DQ&g`$
z-GC_Wlq&xKBCd8D(2R@K*{UrFB;>VJwRO%QqOPy0-fCSRBY#SD;w)G^K2~*dEp+->
zy6WPpT%!47R9EH)z`<0Nku@KxroucT&s??Qxh+IHm#X#O<ib<dQM=bM5eteH82qH#
zeH8BN4yip8w!!xosy)r?5M=Vx)V>psBGLG-+ON$wL|GmJSFV?lu}*5ge3)rqCv}ab
zSBTYmL;b`w=(w4?I`kbhSS?2#HgOoD<rH<>1=op^jOtFi`oQk10pWrZx~seBdlQ)!
zsJkSi{pmV&&nYobQLNhBPl_Tk=+$wr;)^>QsN;9yi`NdRC#s@}wOgZ}x~>hPVgvPz
zPrASrdkBm;uAURwn&|a2>I@COZ)_uQ%^CIPaR-RHO_Y%}JD@IN7+9m~>W?NR6aC&^
zea81PtRh=oJaGgvrJu~|;u4T&MUKFii)CbrZ1rWHa{aJeef?S@qF#F!g$Gz}c-KYQ
z=>V~|tz0}ca6~biU8?t84VSypB_LuZT=nNJ!C7md+jxOD_PK<OLV^?cu}j$KuVLm}
zT*60r!|odjj5JSjX|oQxtM!aa+wMj1Si@bqoJVlz-NhyGcW~k@KbM)AAW<D}m*);a
z^lol0&qu@Vlj2;KZh4M~op&i(9*g(Zxg6OD_D?wM^6u};h<f#uk+r_*a;&C_Sl9`d
z^EEKQ#C0y$hUO5f^Rq^G77{QQ|DmZ?j1KBv($u;fkEk|HQ!f-VUoc1$%GnyP)3ho;
zCKUd*rqfSXh_=RRI#-_$vfk7Th{ep@qcp>6wu70vYvO9*c@PQQG+E$|3{8^$0MQpE
znxr=1%qgWNX-f>zs2Q4+h;y+2-G6FQr(ons$2H4J+Jd!nG&|l|L#*`?&6{<0AU1rg
zxjY-Xu9>U(g$JXqpUKFYHE?wuf%j^+0j>ou1Fi#Ffq9r=q-*Gm;g~>_>(Cb05%peo
zUHuGH*|^a4l{qJofR1uK^TIjA|Kev{f9%>H><n|YKK&EXbNyVe$}YF1*6Y7B;nC8x
zRcjlNkod{ST&HQPz8yr=KS^6X-V3^YNn2Zu22Yu_A>-nSh7Q&?+pv&mz*=paZC*qp
zCkcG5v$of^Xr$hQWMm!kwSDHAq2t{zYsXYE;YEKLS@j9pG~VIZ4cY~toPujTrhV!B
zBBDcy+9l%xh>lj#E<X&NN_(|Cm*s*~W3_v_q2tXK?SYjb-{D@`1E;}>J<n>71kS}k
zzS4ed0Jpr9+D{uTMSjsn`~6~gR=@q)i{?0tXySjgHq}m$L8HCuHx_Yug7&u=7}$?L
zXs;dXNlZ0OdworN3^Y)C%aBi`{I5W*Qbty_NXO2B6Lt3pj11E0errk;5TMgvsgGp#
zcb!|n$1vX;0^8QmRSg)1LT9|rT($jKWTU}48E<yfRqcn7cF5EDrGZRa_UY;k2qEe@
zT1M7#vo7Q;Ty4xBy2f4zCb3;*Wc8lWg+_EFQe_HsPm+=OY|*tdK($X+)pg@$p7pE1
zm%Gcz*e_;XpY|X}V6MR4+jV_W>`=Yh0$Zl&2FWCPMi+Mx4f(zyu+ba3l#Cn<{DyA2
zDT3&`VBPFj5Of-*=~jPnmRQx9x~-Y1m|;EL-oe$0ZqCxZIdvwYVw&!g9r<ub89M7;
zaA>kQT6eiP9UaE$u6_$MnK4<fxw;s2TAD!jF9i--Dlkvd`*a+F9MD5X_QV{0qmk$!
zc!oZl+xOTZ`l!5E=+<A~{UF-aqzhbCPv7GkxZr{ueJ}ToP{~dinb~iazE>45<ZMIq
zeVR=m3U8wCXWT*LHcLO?+*R0hD}BPcG(^LAePXRHu>ZBdMCjU6VEbqEiM3&7b>0-%
zK1e_5Tpp}rpNy>jA^r0glZk8}=@%?M0!Md1zxexQL}Byw87@0u|5BlRLF@YIw}vyK
zPC6iJyiPrVO5hTp3iuIFP1N}@AZoeJLx8B^I_Cggf!_kPL|tkDF_A6_`W+{12r@hL
zdzBb)hu-?4ZLpRqz4Zq!M8OXv>yI`Jg8grwpg%Es7|P>6^p~2U)DAeTztk%Vna~LR
zl_GTPKU-i#s)3gOjB0j*L2(Q34+t_SU+;k+WH1<3FCv;Y+u+8{?@Elp{iKRmWDkR>
z2zf%kRff7sIIbRNWn?Y>G&J4}75Lr)nsL#wwV}z&7-{<}hGzd+f)N@G-8Q4arI%!6
z>ZOM0n$3~rUXYQwHZjO5GQ4Z(e|kPqyY~zOWz-u6dGOEU41@URw)uup(-BLae#S8F
zvH^9%(}rnlVlV+O!}N8>QHn(xW}9VpZ#OJ$f!wX>6$94^8GjeJHq(&pjhRk*(vbb`
zNutmJ0-M(s*y57Fs3?J5HVW+9OJKi2GP0;^hHZbYMo`)(BWn|HC|n&v^m%QA`Rxym
zqJuXLp9c4UN0SU+*9gWyo;Un37cVSrWw`2!1f}|Pfw3>UDfZ_hHZV8EsZWSTWD6X5
zNMJgi^ZOe{xM?P?K#&P`lYSeF=r_jgv4hC{LXNlvjHr(&INYsX(Pu=}hML`)d<A=d
z@+BD=6}Uz2tBwZ;-8xO*LKN*MBWpF#t!p!oXq=y0uaVHXe^s}>eZcZp$Gi2L6M&57
zpj&cH8%nJmZc|n#qsHs)Hg7q|I{bZsb509fzrbxn_2I<oop3ucV>3LjIm+$&-Zn%B
zBHgYZ03K}VcKuC`AGuvW7LA&%*zIP24CKuhjjn62qloNhbUh254sR)NPL#1~>@q~j
z*2ZeF!N_j2j6UhpVUDwnz9X+AwF@))EsH_I@u|Q@^^5`M7ZR(v)z~0rCtQBOOmPu4
z-`L<RQl;u|8k>Jn1d)3RY%$Xqc?C1uaa=}LOJj`s9>GI;*4R1fBGTw_#_k?K?+|0p
zU3Cz4vyHvhwMG=omyuCNW9%zG!oSooj_eKd^zUMfU!IPVY^rf|t+!$SHFn7t)YoE6
z;raiSYsMMB!G6snjdQ{w@(Di~=l%H=%q_wA;`75$`|X#J>4qDZ6$BFN7-?J)jt&cg
zjaxqqB1(-g7DRG9XxyC)6%9FPd@BGr)Z2KhS~rM%hVj%6%)I$%<Js2(VgG?Wj2FMW
z3f~+hFru-sBn~s)>Sw%By$F@cHK|G-$g;eLj7+;r@_%~_s^#8N!1)nGmy4wuhcVFL
zx>79@xD*#FwG3|r`?g4}Q;|6}Q%G&zgJjzLD7BA%59EGRip-4ww@v~(Vm+>PwA8hB
zT?C7BQV%uk($qle6`lzd{3NjHW`X^Gk$O+tiv;C;sc-saq-q_dev1~tf%#irs#3%J
zvNRyP9Z}{kf!PNIu8tRYtBZ_GxnH2`ae-c^qyamjkWFm`Zh2l{;WZhV+Z)n=^CyVb
zcb5isibrVcCJmnCip1|*X$U8VVx>S!D^GXx;5hLiyS2ca9RhDDWMs+~((v#)DD<}r
z%zjQ_&LtU{@)?0H%LE!b0S_Vtnl6p_6(S)L7&BISY82S|*l8(dAjdzYm|fq4O<{ec
zn5#L6j~Aubsp#lNnvAU4I4O3{DWonN1iBW<$UG)UvAIxY#!MNROSBaGJ*21_C{TY|
zM&`Xt8rjqbrOp)~NHMLe6gL&gpVUW+`z{9SbSWIcrcK{S3AG9!o@b?m)Z<9Xo{$pe
zzK+`JfWTKz2+aRX;5M_2tj2EwYr9CJMj{Bf7f7Sk7opA{WMo>sG<qs#>ODpp(=-e<
z*jQ=IJL{1a8>O+|VPIH495<yWE~+e)#_jF`d`BAJu?Pm*S{lCrUyS@oN;I`cI(uG9
z{&gb;_LP*;6o%{BSV|e0jhQu+QvSezy*CN$;Av@EwTAhGG~q}ZQTBC#c^d`ZnlB?$
z{w_^;2OheaO`6<kK0NGm0vqlU*vKp})K6fOK!GjX1hy;^82N_4D0hJ!6#~s2kBf`0
zi30n23GC-Duzy2=aVrImnJjSWUV$5K$jH?F1qS^tut7_KAxQ!|{wPhJXMm$5X~wQb
z5L2`?JJkk8g|v__sNu7vcv)cM?*xWk64?9`fi0T~?C_1isP_eSTq3Y*LxFt)1or(w
zV85#Z$FveSeE~<TPpEz58!YH8fx)i}Y(N4#z9!AXh$$#Un%~R|erl1xl@S8-zLSxu
zS_#wz2=v`0$z{cXFQtrHGl>R2E-<c+zzv6h-DVPtij}tSZh?FuTRME`B+)lP(uu>*
z5q)@E`r@@Cglbs&HW#1Yo-3Vw7I<~L^!-mCBd6Ud{ij9<(J?)0icZ0WE30L@unvV`
z0VfqTO*DX#DV`E&5}9ZM{!gGW_=}}f8jB~R3q5LPN`+IKjL};n+O?4yQ3pz)DR`2K
zcV}2k?VqsBA8fSjZ)YfdmV{Pf@mzjZc%$7{RV^DDMO!`@;tA}c=-t_JdPp@~dRdYi
zw=BKQufv=l%?u4wM3=oeGqmi@Mon&e)ToL4sPOZF&oE1P+W^b;h!DBe@U}fl(PY`u
zw!VD*A90TbS)?JpmXyI7%PZ{y3YQO_(*k;<`jACGii8}-VjIVVIiz5gCRrwNxE_r=
zW9ex~C!Rtq{uygyA}ESW0q@vlX2LfUC{C7M3f?!-NJ_+ar{OM_a1dlS0sr`?U{`cX
zNTI1(@wOedtR2=}X|{Q5N-|z5-ct}{n=>oe!j@OBR3~L!-n)~M%oTDcg>PoO%)&8}
zP)HyFqc7DyMm!30PQ*PSm1GK(Ws*SCWhtdX5+jy<73PiarQ)qvO1gc{jyYDby_i?B
zFwM4dlYNdE%l$1aGh-~TEK^JEWvL{hO<B5yt1|=D?wX#l(;M{d-4oRXxpj`6Y>8gx
zgPUWM%ilC8%e`eeveMt@pgfmJG!?DJ$upQNk8y&<V@hCFnhP^|v@ccFRGILYq@`76
zjaCtuf?cs)<VkTFL_UBbV=Y^+JZ?EyugVZxR)KBa!s3E7OxwCR+qQbCDZ(VwY@ff-
zv3+v=6DFq)8k-!SGL50yqJMbs6%phi2hX{4m%-;(Qu2XZ^3FuMP38_NJ!O}2V1-h?
zgJ=bX$5x)#u{SI?5`3!Jt(xN`ur(HHO@y~v?DLqJbkrC6o(Llyi-(+wCQv2?|HtB<
zxQdg_fx9?v9J~<|%sUo_KSq9g67EfbvlxTcI--LK_#Sr=sj`#cX2hK*cK~Dgw;i*3
z)@DxMW80o>TeZVv%gu!S+j3{wa*C{La!j_hbFJ$ZT9>S_y_#mSWxi<3OxIZpR#+`L
zwgq@9f3IZTPTQ(<lWp}9@XdZNbB8Un$W)TK$+}>^bwOT;&N`dB8SDBYlXY*p?d65G
zbw&K^E0;l)medWNg<IEaJuLlG>J{$ax50?@x8Csh+$W~Mj`*O<Je`OZ{4Sr694+u3
zk0oUm7hBH2;vtm&5YHr8e0GscK<jo7nF67XLOWc*@nN_a3mGP%(Rf_(u#~{nh5Otk
z^NvLqW%5n3cntA0^PvXHZk#)0XD7g2fn5V34(UJNyF;X@xUdLr*aQjBx8<hWR<F11
zT>%q@OqW8YAiQk_?0KhMmbToSl8pJbRV$z`$Z`o6f3HrRN-}dy&8!)D^-Z=7F9`kQ
zaACigXG<?CNiVQvEir+()>Zp?i&^<5u7d@y<4xNN%hF@M!&*{%gbincRwRBdaFatl
zTrS|6V?Na|AKQwJ*2U@eS%FvJlqKYpcb7&LbRe4JL>A=akxaxYh}+SuTk)P3Z1XW;
zM`PonDroFZvWVvS|DyS1bd-qkmmjyEAgJkXW3StdI^nBR@MU3E<r|ib%JNi*Un8#g
zWX!_Z$jUVjh1k+zK=#>GGc$KMpja@FM?p@r`|+7Gbu|9?ICy-iNLADDlyhB-H6C;n
z@AK(%o{x7}#SpI3`<eybc{EnB#9C0m)m<`YTgj|^2a_sm9_<|V@fXa)9Q_c4E2WpL
z74B6kkiCQ3wQiqmMGWNe&Judc%iOJkF$nFJ_2|UEztI0}6y^OJdreKSgrAb?un~wa
zlkiW(pcHt-IN7z@BNqn54Z(c-K<-b*5C<I}l#PP1;%&Qg=alEhkj%qknT_zqyUHHE
zjOKg_JWu8>jQbrPO?Xu16$y9Vlku6~os1m)K8}CD!#e&m6=~fr^c8v5^*jPt+)h?A
z>+a$2OI}VlA--~N-z&N#6A`@3rz7g}n2uNA`ME>3=I=pMJh0%+;_U@aaUBt)c>8|a
z$^rzB^xL9_)sN=^cMBWskGCs);r&8og~Ys@H!h<p54vT3hX(<O-(eVj*6sVPn=q#e
z;)$J+$^BAeQ^!uWv^k}%om`=dE^QV4pf?L^=;_HLxF{ESA|^-WdpPdf#$Z>F-En)@
z=v`r_N$7&7ZIdkiA5`mBmavsoVf-F^uw$}y5hRfznL4$PHd!}sM7%cH_H8VAagTLP
zp7j+3Ye$!btxxu1VQe5=0gu%pmE<9#LQBN`+XiF4$6&DK{ZMI=Lw9$vKs>+00Q)<>
zB<lXZ%>rW{)&kGlB_5l64~d)bR!R0Ii2r}y7?Hz`iL5X{h$RH>-o)a7usdfmjx0@%
zAw&ly{YnL7-JWhupKr1iY%0lKRz^f5EhqnS(!!0vIjJf?QW4xL9;tcKL(?@*t|Q`*
z`S4W6+4=BXim$%#k~~qaIm8MKH!nU2{*0Geyd0BV35~+ypd+Yo^4TL|`QTxKj}hgH
z@OAb&t<3W|cPbWvQsfYnEC-&u<y=00YbnB9@1gEWlqTl#wF!?^VqwB$E!bn-!&fO#
z;^Y=@-)LJs-}>S*USyVJXWCZn;Q^{#D7*8USh&i~Lj(M))|U!+gyVq@zS3HdW1G`r
zl?h?7lEsiu7)yO%|7tH)<1BkW@bj?O<_^wUicZuuKLXDRTHZCaX^uyg&TT5~S?!L)
zIgasqmoFJC$TeAa&9}bt!oS3`)~GnUxWDe}ggP85UtHxez9PAl%A_pJKiRrMSI$GN
zbG6K~SMFSR*6NgSJNooO9c9abX_PBDy&o`C2nWow;IdU#k!s%_D&$pG$IQxw3hx^8
zD@>Dalb%|(99T=>01=;@I~|Sglkvw(SUItBOfX2SyE(dcCfglCjgP26sCUa#o%=7%
zSslIlmG)XuZi=-I#KzwDuaa(8nXFjng5A0QJLZ3%Tn(|YG)e*GH7(#h%O&|e`-(zY
zV7seJxwl90z4toVV6MrBStt8K$XoX8tFTXDvai>a()wRhF)cmjV`dj0QQqW~)s@nL
zI|*}{E#FD2hb;gqkx`lNo>D!MjH<~aTE=1?caXM%O!~o7EAw5KeIHF~73s*W{$gsi
zsB)=QS%5G<K!CW9gZxYWahMZNE9oHb?H|WJtberLjcU%}@ZXwyH5puC_HfVm$X9e)
zRFn|aDKDwg5MDk(LJ0Tz%WnG4)Z+GKQ0FO(gj?iAB+uoz7ane3(JW)wUAC*>+wWE*
z{;ee<S%mD6R@vik>DE={cCI=&Z(UV>Y2L@IF#cst-M$dvL>vg$Ueety@2<cdIV+PV
zQyrWZ9x7_iY10cGiXC6O-t9ZX6YQ&%j#Y=!0a<R2@)>lO4Q8~)moWHt5?{ow6i<df
zpf|#}2FOJSPdUYMNf~2DW9dY!6Y_m+E?{xEW0d8}sM=<}gWy<LA;<nG)0Hu<w2&z-
zSR!_#A7-x<Tc1`-o^AOKEF)mK088OT*j3uecNMYpU6O6)s}6iyv~)j|?^rv%g2jk(
zJLC4&uq?)R!XJ9Wm3OdUqr9b=lWWbdy@QX+HYX2T<NUM+-%y{Ok3%a?W5OOSn2rPG
z5bj^uCoIo&u}~p4w?$la=K1YZ#QwH8rQpoPf0WyBh@35@gR~e%>;Erhx{KK6F^QdS
zu@3OyxuKjI-jC&+<Yp&EJ!+P7lGk_umdCJKf0^a?jJ$js2rj2=8z|MuwLZi-k;*t!
zSZ^}uJj&uTME}soMJ%>81=bDuwgq|rQvtXRn{fZt4xW+u+#Xn+lA(L3<dLnNM#~|I
zpD+5`cBLw@&{1B)B0sgKr~jsfju=+|AFyK)qvYi19;6Ygq<lC3VOKOBGDT8Q<xYM%
zo3hwr{-4ODW7yRDn{sIaS9;0`pZFHDIGyc$c+sA~@_a&^tAOtA&{^pg{6AT*moL|Q
zV90-~nfHCb4B4@M{IQcGFFj%K?_0_AMPdHnM+SMkMRj}kqZYQjrM3k)=}^IO4}N^m
zKeEDA0H<afIz<<Uq<uxRcdPP8vO52Oj}p5kPD4v^8d@co{*XSYk}fI3SyaV^Wk)zG
zcknLK>0s(#sP3a!d?h@RQ<Q+Qr&`)ouVxlnv3sQ?6vOfO$9K>kNs7@I6)r!<{5Sia
zJ`d}AJ}R%~e_?LnTdhZh-e96-&3m4fks;o}P6p@j1%4%IX|}zu+g*&9w<Y;RKoD#9
zKpc~sm-kQj0Wz_SVUL23ghQM{|3I1={jeN5b(<vrg#`K=PIx$e%<`{4;qjmgd=5kU
z7OMyq?zsP3w-_Ge9H(E|O0Yxq@B#8UPRp$is`}pN+~&d$lKz%+n|E~nD8kqO(78=;
zPd+L8|K7Pxk-#|X-)V>6VVr)Y0<s@7Dt8#?5uV$uc%=XT+$JiazwIYv%=I4Xe#ix6
z{*$tQ^|?*ohdQR`peF*j^D(`00(IU(zvD!i<&RV0maA(5EIm%ATIQY(u=v)LEEi6n
zwfy1l=j+pZQp)H_u}Mh@@f}i9#`lg*PDqTLlA4;5Y*|yiUZL&7$l96!@mso#KWnOW
zJbGGA{9dOp<kxSRwiXQ%3nv+W_(~4zHpst<uuS~DZlT+?`g+d@8YsWT4*`}2C`--Q
zsv-7TgZm7A;HUiWKD`_#sQ9lxv$`pmX?F`HJF4+-jUUR`zhnQsoMWRpi|JUf<wmU5
z5)tQO**vmF)-5;Yp7o_GbKm`{o}E!z)-LniohRWnb~J0NJ8Ndi@bUD;DqLTAg^2%_
z9l!6#P)mQ>$_JY@)Pq&2Yu^`j^o5t4_fh2oZJ9Tjx6UDq@mUrR_Jo)7Ph{kSh)`43
zM;@$x)*vnO+P%e{jbiNm%8lkOa>UqBVq!EtddF@hjpM^<P`Z<o^_~Y?=Q#{pzkDN~
o@9T4+^56Vo#{T!6q`za5fu%b`j;&DC)ma_1ENFLP6&9iVKl-9kX#fBK
diff --git a/app/gui/oven_control/lang_en.ts b/app/gui/oven_control/lang_en.ts
index 4ed6e92..ebf9025 100644
--- a/app/gui/oven_control/lang_en.ts
+++ b/app/gui/oven_control/lang_en.ts
@@ -14,14 +14,14 @@
<translation>correction</translation>
</message>
<message>
- <location filename="adjustmentwindow.cpp" line="32"/>
+ <location filename="adjustmentwindow.cpp" line="33"/>
<source>모든 설정 값을 공장(출고)초기화
값으로 변경 하시겠습니까?</source>
<translation>Do you confirm the change of all settings
to factory default values?</translation>
</message>
<message>
- <location filename="adjustmentwindow.cpp" line="98"/>
+ <location filename="adjustmentwindow.cpp" line="99"/>
<source>테스트를 완료하였습니다.</source>
<translation>Test is completed.</translation>
</message>
@@ -119,7 +119,7 @@ to factory default values?</translation>
<translation>Steam</translation>
</message>
<message>
- <location filename="autocookconfigwindow.cpp" line="387"/>
+ <location filename="autocookconfigwindow.cpp" line="388"/>
<source>즐겨찾기 항목에 추가하시겠습니까?</source>
<translation>Do you want to add it to bookmark?</translation>
</message>
@@ -185,82 +185,82 @@ to factory default values?</translation>
<translation>Follow-up process option</translation>
</message>
<message>
- <location filename="autocookwindow.cpp" line="510"/>
+ <location filename="autocookwindow.cpp" line="513"/>
<source>중심 온도계 삽입</source>
<translation>Inserting core thermometer</translation>
</message>
<message>
- <location filename="autocookwindow.cpp" line="517"/>
+ <location filename="autocookwindow.cpp" line="520"/>
<source>식재료 적재</source>
<translation>Stacking Food Materials</translation>
</message>
<message>
- <location filename="autocookwindow.cpp" line="529"/>
+ <location filename="autocookwindow.cpp" line="532"/>
<source>자르기</source>
<translation>Cutting</translation>
</message>
<message>
- <location filename="autocookwindow.cpp" line="537"/>
+ <location filename="autocookwindow.cpp" line="540"/>
<source>물 붓기</source>
<translation>Pouring Water</translation>
</message>
<message>
- <location filename="autocookwindow.cpp" line="880"/>
- <location filename="autocookwindow.cpp" line="892"/>
- <location filename="autocookwindow.cpp" line="931"/>
- <location filename="autocookwindow.cpp" line="943"/>
- <location filename="autocookwindow.cpp" line="955"/>
+ <location filename="autocookwindow.cpp" line="890"/>
+ <location filename="autocookwindow.cpp" line="902"/>
+ <location filename="autocookwindow.cpp" line="941"/>
+ <location filename="autocookwindow.cpp" line="953"/>
+ <location filename="autocookwindow.cpp" line="965"/>
<source>문을 닫아주세요</source>
<translation>Please close the door</translation>
</message>
<message>
- <location filename="autocookwindow.cpp" line="880"/>
+ <location filename="autocookwindow.cpp" line="890"/>
<source>조리 중 문 열림 시간 모니터링 1단계</source>
<translation>Monitoring stage 1 of door open time during cooking </translation>
</message>
<message>
- <location filename="autocookwindow.cpp" line="892"/>
+ <location filename="autocookwindow.cpp" line="902"/>
<source>조리 중 문 열림 시간 모니터링 2단계</source>
<translation>Monitoring stage 2 of door open time during cooking</translation>
</message>
<message>
- <location filename="autocookwindow.cpp" line="904"/>
+ <location filename="autocookwindow.cpp" line="914"/>
<source>문이 오래 열려있어 조리가 취소되었습니다</source>
<translation>The door is opened for a long time, so cooking is cancelled </translation>
</message>
<message>
- <location filename="autocookwindow.cpp" line="904"/>
+ <location filename="autocookwindow.cpp" line="914"/>
<source>조리 중 문 열림 시간 모니터링 3단계</source>
<translation>Monitoring stage 3 of door open time during cooking</translation>
</message>
<message>
- <location filename="autocookwindow.cpp" line="931"/>
+ <location filename="autocookwindow.cpp" line="941"/>
<source>적재 중 문 열림 시간 모니터링 1단계</source>
<translation>Monitoring of door open time during stacking Stage 1</translation>
</message>
<message>
- <location filename="autocookwindow.cpp" line="943"/>
+ <location filename="autocookwindow.cpp" line="953"/>
<source>적재 중 문 열림 시간 모니터링 2단계</source>
<translation>Monitoring of door open time during stackingStage 2</translation>
</message>
<message>
- <location filename="autocookwindow.cpp" line="955"/>
+ <location filename="autocookwindow.cpp" line="965"/>
<source>적재 중 문 열림 시간 모니터링 3단계</source>
<translation>Monitoring of door open time during stacking Stage 3</translation>
</message>
<message>
- <location filename="autocookwindow.cpp" line="1074"/>
+ <location filename="autocookwindow.cpp" line="1084"/>
<source>요리가 중단되고 환경 설정 모드로 들어갑니다. 진행할까요?</source>
<translation>Cooking stops and the system goes to config mode
Do you want to proceed?</translation>
</message>
<message>
- <location filename="autocookwindow.cpp" line="1086"/>
+ <location filename="autocookwindow.cpp" line="1096"/>
<source>즐겨찾기 항목에 추가하시겠습니까?</source>
<translation>Do you want to add it to bookmark?</translation>
</message>
<message>
- <location filename="autocookwindow.cpp" line="1105"/>
+ <location filename="autocookwindow.cpp" line="1115"/>
<source>요리가 중단되고 자동 세척 모드로 들어갑니다. 진행할까요?</source>
<translation>Cooking stops and the system goes to
automatic cleaning mode Do you want to proceed?</translation>
@@ -450,26 +450,36 @@ to factory setting values?</translation>
<translation type="unfinished">On</translation>
</message>
<message>
+ <location filename="config.cpp" line="492"/>
+ <location filename="config.cpp" line="493"/>
<location filename="config.h" line="94"/>
<source>모 델 명</source>
<translation>Model Name</translation>
</message>
<message>
+ <location filename="config.cpp" line="499"/>
+ <location filename="config.cpp" line="500"/>
<location filename="config.h" line="95"/>
<source>제조일자</source>
<translation>Date of Manufacturing</translation>
</message>
<message>
+ <location filename="config.cpp" line="506"/>
+ <location filename="config.cpp" line="507"/>
<location filename="config.h" line="96"/>
<source>제조국</source>
- <translation>Country of Manufacturing</translation>
+ <translation>Manufacturing Country</translation>
</message>
<message>
+ <location filename="config.cpp" line="513"/>
+ <location filename="config.cpp" line="514"/>
<location filename="config.h" line="97"/>
<source>제조사</source>
- <translation>Company of Manufacturing</translation>
+ <translation>Manufacturing Company</translation>
</message>
<message>
+ <location filename="config.cpp" line="520"/>
+ <location filename="config.cpp" line="521"/>
<location filename="config.h" line="98"/>
<source>제품번호</source>
<translation>Model No</translation>
@@ -502,269 +512,329 @@ to factory setting values?</translation>
<translation>Location</translation>
</message>
<message>
- <location filename="config.h" line="333"/>
+ <location filename="config.h" line="116"/>
+ <source>전기식 10단</source>
+ <translation>Electric Type 10 Stages</translation>
+ </message>
+ <message>
+ <location filename="config.h" line="117"/>
+ <source>전기식 20단</source>
+ <translation>Electric Type 20 Stages</translation>
+ </message>
+ <message>
+ <location filename="config.h" line="118"/>
+ <source>전기식 24단</source>
+ <translation>Electric Type 24 Stages</translation>
+ </message>
+ <message>
+ <location filename="config.h" line="119"/>
+ <source>전기식 40단</source>
+ <translation>Electric Type 40 Stages</translation>
+ </message>
+ <message>
+ <location filename="config.h" line="120"/>
+ <source>가스식 10단 LPG</source>
+ <translation>Gas Type 10 Stages lpg</translation>
+ </message>
+ <message>
+ <location filename="config.h" line="121"/>
+ <source>가스식 20단 LPG</source>
+ <translation>Gas Type 20 Stages lpg</translation>
+ </message>
+ <message>
+ <location filename="config.h" line="122"/>
+ <source>가스식 24단 LPG</source>
+ <translation>Gas Type 24 Stages lpg</translation>
+ </message>
+ <message>
+ <location filename="config.h" line="123"/>
+ <source>가스식 40단 LPG</source>
+ <translation>Gas Type 40 Stages lpg</translation>
+ </message>
+ <message>
+ <location filename="config.h" line="124"/>
+ <source>가스식 10단 LNG</source>
+ <translation>Gas Type 10 Stages lpg</translation>
+ </message>
+ <message>
+ <location filename="config.h" line="125"/>
+ <source>가스식 20단 LNG</source>
+ <translation>Gas Type 20 Stages lpg</translation>
+ </message>
+ <message>
+ <location filename="config.h" line="126"/>
+ <source>가스식 24단 LNG</source>
+ <translation>Gas Type 24 Stages lpg</translation>
+ </message>
+ <message>
+ <location filename="config.h" line="127"/>
+ <source>가스식 40단 LNG</source>
+ <translation>Gas Type 40 Stages lpg</translation>
+ </message>
+ <message>
+ <location filename="config.h" line="357"/>
<source>%1 분</source>
<translation>%1 Min</translation>
</message>
<message>
- <location filename="config.h" line="343"/>
+ <location filename="config.h" line="367"/>
<source>%1번</source>
<translation>No.%1</translation>
</message>
<message>
- <location filename="config.h" line="349"/>
+ <location filename="config.h" line="373"/>
<source>공장초기화</source>
<translation>Factory Reset</translation>
</message>
<message>
- <location filename="config.h" line="350"/>
+ <location filename="config.h" line="374"/>
<source>USB 삽입</source>
<translation>Insert USB</translation>
</message>
<message>
- <location filename="config.h" line="355"/>
+ <location filename="config.h" line="379"/>
<source>초기화</source>
<translation>Reset</translation>
</message>
<message>
- <location filename="config.h" line="366"/>
- <location filename="config.h" line="367"/>
+ <location filename="config.h" line="390"/>
+ <location filename="config.h" line="391"/>
<source>%1단계</source>
<translation>Stage%1</translation>
</message>
<message>
- <location filename="config.h" line="368"/>
+ <location filename="config.h" line="392"/>
<source>정보확인</source>
<translation>Information</translation>
</message>
<message>
- <location filename="config.h" line="371"/>
+ <location filename="config.h" line="395"/>
<source>헹굼</source>
<translation>Rinsing</translation>
</message>
<message>
- <location filename="config.h" line="373"/>
+ <location filename="config.h" line="397"/>
<source>엔지니어모드 진입</source>
<translation>Engineer Mode</translation>
</message>
<message>
- <location filename="config.h" line="377"/>
+ <location filename="config.h" line="401"/>
<source>언어설정</source>
<translation>Language Setting</translation>
</message>
<message>
- <location filename="config.h" line="378"/>
+ <location filename="config.h" line="402"/>
<source>날짜와 시간</source>
<translation>Date and Time</translation>
</message>
<message>
- <location filename="config.h" line="379"/>
+ <location filename="config.h" line="403"/>
<source>온도단위</source>
<translation>Temperature Unit</translation>
</message>
<message>
- <location filename="config.h" line="380"/>
+ <location filename="config.h" line="404"/>
<source>화면밝기</source>
<translation>Screen Brightness</translation>
</message>
<message>
- <location filename="config.h" line="381"/>
+ <location filename="config.h" line="405"/>
<source>응축식 후드의 정지지연</source>
<translation>Stop Delay of Condensation Type Hood</translation>
</message>
<message>
- <location filename="config.h" line="382"/>
+ <location filename="config.h" line="406"/>
<source>일품요리용 접시무게</source>
<translation>Weight of the dish for one-dish meal</translation>
</message>
<message>
- <location filename="config.h" line="383"/>
+ <location filename="config.h" line="407"/>
<source>연회용 접시무게</source>
<translation>Weight of the dish for a banquet</translation>
</message>
<message>
- <location filename="config.h" line="384"/>
+ <location filename="config.h" line="408"/>
<source>ILC 조리선반 개수</source>
<translation>Number of ILC cooking rack</translation>
</message>
<message>
- <location filename="config.h" line="385"/>
+ <location filename="config.h" line="409"/>
<source>ILC 조리선반 순서</source>
<translation>Sequence of ILC cooking rack</translation>
</message>
<message>
- <location filename="config.h" line="386"/>
- <location filename="config.h" line="411"/>
+ <location filename="config.h" line="410"/>
+ <location filename="config.h" line="435"/>
<source>ILC 조리 온습도 대기시간</source>
<translation>ILC cooking temperature and humidity standby time</translation>
</message>
<message>
- <location filename="config.h" line="387"/>
+ <location filename="config.h" line="411"/>
<source>조리시간 포맷</source>
<translation>Cooking time format</translation>
</message>
<message>
- <location filename="config.h" line="388"/>
+ <location filename="config.h" line="412"/>
<source>실시간 단위 설정</source>
<translation>Real time unit setting</translation>
</message>
<message>
- <location filename="config.h" line="389"/>
+ <location filename="config.h" line="413"/>
<source>잔여시간 시점변경설정</source>
<translation>Remaining time change setting</translation>
</message>
<message>
- <location filename="config.h" line="390"/>
+ <location filename="config.h" line="414"/>
<source>마스터 볼륨</source>
<translation>Master Volume</translation>
</message>
<message>
- <location filename="config.h" line="391"/>
+ <location filename="config.h" line="415"/>
<source>키패드 소리 - 1</source>
<translation>Keypad Sound - 1</translation>
</message>
<message>
- <location filename="config.h" line="392"/>
+ <location filename="config.h" line="416"/>
<source>키패드 볼륨 </source>
<translation>Keypad Volume</translation>
</message>
<message>
- <location filename="config.h" line="393"/>
+ <location filename="config.h" line="417"/>
<source>적재/실행 요청</source>
<translation>Stacking/Execution Request</translation>
</message>
<message>
- <location filename="config.h" line="394"/>
+ <location filename="config.h" line="418"/>
<source>프로그램 단계 종료</source>
<translation>Program Stage Finish</translation>
</message>
<message>
- <location filename="config.h" line="395"/>
+ <location filename="config.h" line="419"/>
<source>조리시간 종료</source>
<translation>Cooking Time Finish</translation>
</message>
<message>
- <location filename="config.h" line="396"/>
+ <location filename="config.h" line="420"/>
<source>과정 중단/오류 식별</source>
<translation>Process Stop/Error Identification</translation>
</message>
<message>
- <location filename="config.h" line="397"/>
+ <location filename="config.h" line="421"/>
<source>음향설정 초기화</source>
<translation>Sound Setting Reset</translation>
</message>
<message>
- <location filename="config.h" line="398"/>
+ <location filename="config.h" line="422"/>
<source>HACCP 데이터 다운로드</source>
<translation>HACCP Data Download</translation>
</message>
<message>
- <location filename="config.h" line="399"/>
+ <location filename="config.h" line="423"/>
<source>인포 데이터 다운로드</source>
<translation>Info Data Download</translation>
</message>
<message>
- <location filename="config.h" line="400"/>
+ <location filename="config.h" line="424"/>
<source>서비스 데이터 다운로드</source>
<translation>Service Data Download</translation>
</message>
<message>
- <location filename="config.h" line="401"/>
+ <location filename="config.h" line="425"/>
<source>프로그램 다운로드</source>
<translation>Program Download</translation>
</message>
<message>
- <location filename="config.h" line="402"/>
+ <location filename="config.h" line="426"/>
<source>프로그램 업로드</source>
<translation>Program Upload</translation>
</message>
<message>
- <location filename="config.h" line="403"/>
+ <location filename="config.h" line="427"/>
<source>모든 프로그램 삭제</source>
<translation>Delete All Programs </translation>
</message>
<message>
- <location filename="config.h" line="404"/>
+ <location filename="config.h" line="428"/>
<source>IP 주소</source>
<translation>IP Address</translation>
</message>
<message>
- <location filename="config.h" line="405"/>
+ <location filename="config.h" line="429"/>
<source>IP 게이트웨이</source>
<translation>IP Gateway</translation>
</message>
<message>
- <location filename="config.h" line="406"/>
+ <location filename="config.h" line="430"/>
<source>IP 넷마스크</source>
<translation>IP Netmask</translation>
</message>
<message>
- <location filename="config.h" line="407"/>
+ <location filename="config.h" line="431"/>
<source>기본설정 다운로드</source>
<translation>Basic Settings Download</translation>
</message>
<message>
- <location filename="config.h" line="408"/>
+ <location filename="config.h" line="432"/>
<source>기본설정 업로드</source>
<translation>Basic Settings Upload</translation>
</message>
<message>
- <location filename="config.h" line="409"/>
+ <location filename="config.h" line="433"/>
<source>하프에너지</source>
<translation>Half Energy</translation>
</message>
<message>
- <location filename="config.h" line="410"/>
+ <location filename="config.h" line="434"/>
<source>화면 밝기 자동 감소</source>
<translation>Auto Decrease Backlight</translation>
</message>
<message>
- <location filename="config.h" line="412"/>
+ <location filename="config.h" line="436"/>
<source>적재중 대기 시간</source>
<translation>Standby Time during Stacking</translation>
</message>
<message>
- <location filename="config.h" line="413"/>
+ <location filename="config.h" line="437"/>
<source>의무 세척과정</source>
<translation>Mandatory Cleaning Process</translation>
</message>
<message>
- <location filename="config.h" line="414"/>
+ <location filename="config.h" line="438"/>
<source>적재 중 문열림 시간 모니터링</source>
<translation>Door monitoring during stacking </translation>
</message>
<message>
- <location filename="config.h" line="415"/>
+ <location filename="config.h" line="439"/>
<source>조리 중 문열림 시간 모니터링</source>
<translation>Door monitoring during cooking</translation>
</message>
<message>
- <location filename="config.h" line="416"/>
+ <location filename="config.h" line="440"/>
<source>제품유형/소프트웨어에 관한 정보</source>
<translation>Product type/Software information</translation>
</message>
<message>
- <location filename="config.h" line="417"/>
+ <location filename="config.h" line="441"/>
<source>핫라인-쉐프</source>
<translation>Hot Line - Chef </translation>
</message>
<message>
- <location filename="config.h" line="418"/>
+ <location filename="config.h" line="442"/>
<source>핫라인-서비스</source>
<translation>Hot Line - Service</translation>
</message>
<message>
- <location filename="config.h" line="419"/>
+ <location filename="config.h" line="443"/>
<source>증기 발생기 헹굼</source>
<translation>Steam Generator Rinsing</translation>
</message>
<message>
- <location filename="config.h" line="420"/>
+ <location filename="config.h" line="444"/>
<source>시연모드</source>
<translation>Demonstration Mode</translation>
</message>
<message>
- <location filename="config.h" line="421"/>
+ <location filename="config.h" line="445"/>
<source>서비스단계(엔지니어모드)</source>
<translation>Service Mode (Engineer Mode)</translation>
</message>
@@ -1066,114 +1136,102 @@ Value</translation>
<translation>Confirm</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="13"/>
<source>전기식 10단</source>
- <translation>Electric Type 10 Stages</translation>
+ <translation type="vanished">Electric Type 10 Stages</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="14"/>
<source>전기식 20단</source>
- <translation>Electric Type 20 Stages</translation>
+ <translation type="vanished">Electric Type 20 Stages</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="15"/>
<source>전기식 24단</source>
- <translation>Electric Type 24 Stages</translation>
+ <translation type="vanished">Electric Type 24 Stages</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="16"/>
<source>전기식 40단</source>
- <translation>Electric Type 40 Stages</translation>
+ <translation type="vanished">Electric Type 40 Stages</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="17"/>
<source>가스식 10단 LPG</source>
- <translation>Gas Type 10 Stages lpg</translation>
+ <translation type="vanished">Gas Type 10 Stages lpg</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="18"/>
<source>가스식 20단 LPG</source>
- <translation>Gas Type 20 Stages lpg</translation>
+ <translation type="vanished">Gas Type 20 Stages lpg</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="19"/>
<source>가스식 24단 LPG</source>
- <translation>Gas Type 24 Stages lpg</translation>
+ <translation type="vanished">Gas Type 24 Stages lpg</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="20"/>
<source>가스식 40단 LPG</source>
- <translation>Gas Type 40 Stages lpg</translation>
+ <translation type="vanished">Gas Type 40 Stages lpg</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="21"/>
<source>가스식 10단 LNG</source>
- <translation>Gas Type 10 Stages lpg</translation>
+ <translation type="vanished">Gas Type 10 Stages lpg</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="22"/>
<source>가스식 20단 LNG</source>
- <translation>Gas Type 20 Stages lpg</translation>
+ <translation type="vanished">Gas Type 20 Stages lpg</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="23"/>
<source>가스식 24단 LNG</source>
- <translation>Gas Type 24 Stages lpg</translation>
+ <translation type="vanished">Gas Type 24 Stages lpg</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="24"/>
<source>가스식 40단 LNG</source>
- <translation>Gas Type 40 Stages lpg</translation>
+ <translation type="vanished">Gas Type 40 Stages lpg</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="112"/>
+ <location filename="configinfodlg.cpp" line="89"/>
<source>모 델 명</source>
<translation>Model Name</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="113"/>
+ <location filename="configinfodlg.cpp" line="90"/>
<source>제조일자</source>
<translation>Date of Manufacturing</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="114"/>
+ <location filename="configinfodlg.cpp" line="91"/>
<source>제조국</source>
- <translation>Manufacturing Contry</translation>
+ <translation>Manufacturing Country</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="115"/>
+ <location filename="configinfodlg.cpp" line="92"/>
<source>제조사</source>
<translation>Manufacturing Company</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="116"/>
+ <location filename="configinfodlg.cpp" line="93"/>
<source>제품번호</source>
<translation>Product Serial</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="117"/>
+ <location filename="configinfodlg.cpp" line="94"/>
<source>소프트웨어 버전</source>
<translation>Software Version</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="118"/>
+ <location filename="configinfodlg.cpp" line="95"/>
<source>현재모델</source>
<translation>Current Model</translation>
</message>
<message>
+ <location filename="configinfodlg.cpp" line="117"/>
<location filename="configinfodlg.cpp" line="141"/>
- <location filename="configinfodlg.cpp" line="165"/>
<source>연 락 처</source>
<translation>Contact Information</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="142"/>
+ <location filename="configinfodlg.cpp" line="118"/>
<source>이 름</source>
<translation>Name</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="143"/>
- <location filename="configinfodlg.cpp" line="166"/>
+ <location filename="configinfodlg.cpp" line="119"/>
+ <location filename="configinfodlg.cpp" line="142"/>
<source>위치정보</source>
<translation>Location Information</translation>
</message>
@@ -1539,8 +1597,8 @@ Value</translation>
<translation>Service</translation>
</message>
<message>
- <location filename="configwindow.cpp" line="175"/>
- <location filename="configwindow.cpp" line="423"/>
+ <location filename="configwindow.cpp" line="176"/>
+ <location filename="configwindow.cpp" line="424"/>
<source>현재 설정을 적용하시겠습니까?</source>
<translation>Do you want to apply current settings?</translation>
</message>
@@ -1890,10 +1948,10 @@ Control</translation>
<name>FileProcessDlg</name>
<message>
<location filename="fileprocessdlg.ui" line="100"/>
- <location filename="fileprocessdlg.cpp" line="335"/>
- <location filename="fileprocessdlg.cpp" line="351"/>
- <location filename="fileprocessdlg.cpp" line="367"/>
- <location filename="fileprocessdlg.cpp" line="633"/>
+ <location filename="fileprocessdlg.cpp" line="362"/>
+ <location filename="fileprocessdlg.cpp" line="378"/>
+ <location filename="fileprocessdlg.cpp" line="394"/>
+ <location filename="fileprocessdlg.cpp" line="735"/>
<source>남은 예상 시간 : 1초</source>
<translation>Expected Remaining Time : 1 Second</translation>
</message>
@@ -1903,246 +1961,256 @@ Control</translation>
<translation>Cancel</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="292"/>
+ <location filename="fileprocessdlg.cpp" line="319"/>
<source>erro%1,</source>
<translation>erro%1,</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="326"/>
- <location filename="fileprocessdlg.cpp" line="342"/>
- <location filename="fileprocessdlg.cpp" line="358"/>
+ <location filename="fileprocessdlg.cpp" line="353"/>
+ <location filename="fileprocessdlg.cpp" line="369"/>
+ <location filename="fileprocessdlg.cpp" line="385"/>
<source>Gas Error History
</source>
<translation></translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="327"/>
- <location filename="fileprocessdlg.cpp" line="343"/>
- <location filename="fileprocessdlg.cpp" line="359"/>
- <location filename="fileprocessdlg.cpp" line="375"/>
+ <location filename="fileprocessdlg.cpp" line="354"/>
+ <location filename="fileprocessdlg.cpp" line="370"/>
+ <location filename="fileprocessdlg.cpp" line="386"/>
+ <location filename="fileprocessdlg.cpp" line="402"/>
<source>no,</source>
<translation>no,</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="327"/>
- <location filename="fileprocessdlg.cpp" line="343"/>
- <location filename="fileprocessdlg.cpp" line="359"/>
- <location filename="fileprocessdlg.cpp" line="375"/>
+ <location filename="fileprocessdlg.cpp" line="354"/>
+ <location filename="fileprocessdlg.cpp" line="370"/>
+ <location filename="fileprocessdlg.cpp" line="386"/>
+ <location filename="fileprocessdlg.cpp" line="402"/>
<source>First Appearance,</source>
<translation>First Appearance,</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="327"/>
- <location filename="fileprocessdlg.cpp" line="343"/>
- <location filename="fileprocessdlg.cpp" line="359"/>
- <location filename="fileprocessdlg.cpp" line="375"/>
+ <location filename="fileprocessdlg.cpp" line="354"/>
+ <location filename="fileprocessdlg.cpp" line="370"/>
+ <location filename="fileprocessdlg.cpp" line="386"/>
+ <location filename="fileprocessdlg.cpp" line="402"/>
<source>Counter,</source>
<translation></translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="327"/>
- <location filename="fileprocessdlg.cpp" line="343"/>
- <location filename="fileprocessdlg.cpp" line="359"/>
- <location filename="fileprocessdlg.cpp" line="375"/>
+ <location filename="fileprocessdlg.cpp" line="354"/>
+ <location filename="fileprocessdlg.cpp" line="370"/>
+ <location filename="fileprocessdlg.cpp" line="386"/>
+ <location filename="fileprocessdlg.cpp" line="402"/>
<source>Last Appearance
</source>
<translation></translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="374"/>
+ <location filename="fileprocessdlg.cpp" line="401"/>
<source>Service Error History
</source>
<translation></translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="451"/>
- <location filename="fileprocessdlg.cpp" line="529"/>
- <location filename="fileprocessdlg.cpp" line="646"/>
- <location filename="fileprocessdlg.cpp" line="702"/>
- <location filename="fileprocessdlg.cpp" line="718"/>
- <location filename="fileprocessdlg.cpp" line="767"/>
+ <location filename="fileprocessdlg.cpp" line="478"/>
+ <location filename="fileprocessdlg.cpp" line="556"/>
+ <location filename="fileprocessdlg.cpp" line="748"/>
+ <location filename="fileprocessdlg.cpp" line="804"/>
+ <location filename="fileprocessdlg.cpp" line="820"/>
+ <location filename="fileprocessdlg.cpp" line="869"/>
<source>남은 예상 시간 : 완료</source>
<translation>Expected Remaining Time : Finish</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="472"/>
+ <location filename="fileprocessdlg.cpp" line="499"/>
<source>,Steam Heating Time,</source>
<translation>,Steam Heating Time,</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="474"/>
+ <location filename="fileprocessdlg.cpp" line="501"/>
<source>,Hot Air Heating Time,</source>
<translation>,Hot Air Heating Time,</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="479"/>
+ <location filename="fileprocessdlg.cpp" line="506"/>
<source>,Hot Air Mode,</source>
<translation>,Hot Air Mode,</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="482"/>
+ <location filename="fileprocessdlg.cpp" line="509"/>
<source>,Steam Mode,</source>
<translation>,Steam Mode,</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="485"/>
+ <location filename="fileprocessdlg.cpp" line="512"/>
<source>,Combi Mode,</source>
<translation>,Combi Mode,</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="488"/>
+ <location filename="fileprocessdlg.cpp" line="515"/>
<source>,세제없이 헹굼,</source>
<translation>,Rinsing without Detergent,</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="491"/>
+ <location filename="fileprocessdlg.cpp" line="518"/>
<source>,간이세척,</source>
<translation>,Simple Cleaning,</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="494"/>
+ <location filename="fileprocessdlg.cpp" line="521"/>
<source>,표준세척,</source>
<translation>,Standard Cleaning,</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="497"/>
+ <location filename="fileprocessdlg.cpp" line="524"/>
<source>,강세척</source>
<translation>,Strong Cleaning</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="500"/>
+ <location filename="fileprocessdlg.cpp" line="527"/>
<source>,고속세척,</source>
<translation>,High Speed Cleaning,</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="503"/>
+ <location filename="fileprocessdlg.cpp" line="530"/>
<source>,쿨다운,</source>
<translation>,Cool Down,</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="505"/>
+ <location filename="fileprocessdlg.cpp" line="532"/>
<source>,전체작동시간,</source>
<translation>,Total Operation Tine,</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="509"/>
+ <location filename="fileprocessdlg.cpp" line="536"/>
<source>,도어 Open,</source>
<translation>,Door Open,</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="511"/>
+ <location filename="fileprocessdlg.cpp" line="538"/>
<source>,볼밸브 Open,</source>
<translation>,Ball Valve Open,</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="513"/>
+ <location filename="fileprocessdlg.cpp" line="540"/>
<source>,S/G 급수 솔레노이드,</source>
<translation>,S/G Water Supply Solenoid,</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="515"/>
+ <location filename="fileprocessdlg.cpp" line="542"/>
<source>,퀀칭 솔레노이드,</source>
<translation>,Quenching Solenoid,</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="517"/>
+ <location filename="fileprocessdlg.cpp" line="544"/>
<source>,고내살수 노즐 솔레노이드 ,</source>
<translation>,Inside-storage Water Spray Nozzle Solenoid,</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="519"/>
+ <location filename="fileprocessdlg.cpp" line="546"/>
<source>,호스릴 솔레노이드,</source>
<translation>,Hose Reel Solenoid,</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="521"/>
+ <location filename="fileprocessdlg.cpp" line="548"/>
<source>,세제공급장치,</source>
<translation>,Detergent Supply Device,</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="523"/>
+ <location filename="fileprocessdlg.cpp" line="550"/>
<source>,배습댐퍼,</source>
<translation>,Moisture-discharging Damper,</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="525"/>
+ <location filename="fileprocessdlg.cpp" line="552"/>
<source>,소형펌프모터,</source>
<translation>,Small Pump Motor,</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="527"/>
+ <location filename="fileprocessdlg.cpp" line="554"/>
<source>,중형펌프모터,</source>
<translation>,Medium size Pump Motor,</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="557"/>
- <location filename="fileprocessdlg.cpp" line="614"/>
- <location filename="fileprocessdlg.cpp" line="655"/>
- <location filename="fileprocessdlg.cpp" line="711"/>
- <location filename="fileprocessdlg.cpp" line="777"/>
+ <location filename="fileprocessdlg.cpp" line="586"/>
+ <location filename="fileprocessdlg.cpp" line="716"/>
+ <location filename="fileprocessdlg.cpp" line="757"/>
+ <location filename="fileprocessdlg.cpp" line="813"/>
+ <location filename="fileprocessdlg.cpp" line="879"/>
<source>USB 인식을 실패하였습니다.</source>
<translation>USB recognition failed.</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="563"/>
+ <location filename="fileprocessdlg.cpp" line="649"/>
+ <source>CookBook Upload Success!.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="fileprocessdlg.cpp" line="653"/>
<source>완료</source>
<translation>Finished</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="574"/>
+ <location filename="fileprocessdlg.cpp" line="661"/>
+ <source>에러 발생으로 종료합니다.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="fileprocessdlg.cpp" line="672"/>
<source>남은 예상 시간 : %1분 %2초</source>
<translation>Expected Remaining Time : %1min %2sec</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="578"/>
+ <location filename="fileprocessdlg.cpp" line="676"/>
<source>남은 예상 시간 : %1초</source>
<translation>Expected Remaining Time : %1 sec</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="636"/>
+ <location filename="fileprocessdlg.cpp" line="738"/>
<source>설정 다운로드에 실패하였습니다.</source>
<translation>Setting download failed.</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="650"/>
+ <location filename="fileprocessdlg.cpp" line="752"/>
<source>즐겨찾기 다운로드에 실패하였습니다.</source>
<translation>Bookmark download failed.</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="675"/>
- <location filename="fileprocessdlg.cpp" line="681"/>
- <location filename="fileprocessdlg.cpp" line="691"/>
+ <location filename="fileprocessdlg.cpp" line="777"/>
+ <location filename="fileprocessdlg.cpp" line="783"/>
+ <location filename="fileprocessdlg.cpp" line="793"/>
<source>설정 업로드에 실패하였습니다.</source>
<translation>Setting upload failed.</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="706"/>
+ <location filename="fileprocessdlg.cpp" line="808"/>
<source>즐겨찾기 업로드에 실패하였습니다.</source>
<translation>Bookmark upload failed.</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="735"/>
+ <location filename="fileprocessdlg.cpp" line="837"/>
<source>남은 예상 시간 : 2초</source>
<translation>Expected Remaining Time : 2 sec</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="738"/>
+ <location filename="fileprocessdlg.cpp" line="840"/>
<source>모델 정보 업로드에 실패하였습니다.</source>
<translation>model Information upload failed.</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="751"/>
+ <location filename="fileprocessdlg.cpp" line="853"/>
<source>남은 예상 시간 : 1</source>
<translation>Expected Remaining Time : 1</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="755"/>
+ <location filename="fileprocessdlg.cpp" line="857"/>
<source>핫라인 쉐프 정보 업로드에 실패하였습니다.</source>
<translation>Hot Line - Chef Setting upload failed.</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="772"/>
+ <location filename="fileprocessdlg.cpp" line="874"/>
<source>핫라인 서비스 정보 업로드에 실패하였습니다.</source>
<translation>Hot Line - Service Setting upload failed.</translation>
</message>
@@ -2536,92 +2604,92 @@ Control</translation>
</message>
<message>
<location filename="mainwindow.ui" line="179"/>
- <location filename="mainwindow.ui" line="208"/>
- <location filename="mainwindow.ui" line="234"/>
+ <location filename="mainwindow.ui" line="205"/>
+ <location filename="mainwindow.ui" line="231"/>
<source>function</source>
<translation>function</translation>
</message>
<message>
- <location filename="mainwindow.ui" line="205"/>
+ <location filename="mainwindow.ui" line="202"/>
<source>프로그래밍모드</source>
<translation>Programming Mode</translation>
</message>
<message>
- <location filename="mainwindow.ui" line="231"/>
+ <location filename="mainwindow.ui" line="228"/>
<source>세척모드</source>
<translation>Cleaning Mode</translation>
</message>
<message>
- <location filename="mainwindow.ui" line="329"/>
+ <location filename="mainwindow.ui" line="326"/>
<source>건열</source>
<translation>Dry Heat</translation>
</message>
<message>
- <location filename="mainwindow.ui" line="332"/>
- <location filename="mainwindow.ui" line="352"/>
- <location filename="mainwindow.ui" line="372"/>
+ <location filename="mainwindow.ui" line="329"/>
+ <location filename="mainwindow.ui" line="349"/>
+ <location filename="mainwindow.ui" line="369"/>
<source>mode</source>
<translation>mode</translation>
</message>
<message>
- <location filename="mainwindow.ui" line="349"/>
+ <location filename="mainwindow.ui" line="346"/>
<source>콤비</source>
<translation>Combi</translation>
</message>
<message>
- <location filename="mainwindow.ui" line="369"/>
+ <location filename="mainwindow.ui" line="366"/>
<source>스팀</source>
<translation>Steam</translation>
</message>
<message>
- <location filename="mainwindow.ui" line="395"/>
+ <location filename="mainwindow.ui" line="392"/>
<source>육류</source>
<translation>Meat</translation>
</message>
<message>
- <location filename="mainwindow.ui" line="398"/>
- <location filename="mainwindow.ui" line="424"/>
- <location filename="mainwindow.ui" line="450"/>
- <location filename="mainwindow.ui" line="476"/>
- <location filename="mainwindow.ui" line="502"/>
- <location filename="mainwindow.ui" line="528"/>
- <location filename="mainwindow.ui" line="554"/>
- <location filename="mainwindow.ui" line="580"/>
+ <location filename="mainwindow.ui" line="395"/>
+ <location filename="mainwindow.ui" line="421"/>
+ <location filename="mainwindow.ui" line="447"/>
+ <location filename="mainwindow.ui" line="473"/>
+ <location filename="mainwindow.ui" line="499"/>
+ <location filename="mainwindow.ui" line="525"/>
+ <location filename="mainwindow.ui" line="551"/>
+ <location filename="mainwindow.ui" line="577"/>
<source>type</source>
<translation>type</translation>
</message>
<message>
- <location filename="mainwindow.ui" line="421"/>
+ <location filename="mainwindow.ui" line="418"/>
<source>디저트류</source>
<translation>Dessert</translation>
</message>
<message>
- <location filename="mainwindow.ui" line="447"/>
+ <location filename="mainwindow.ui" line="444"/>
<source>기타요리</source>
<translation>Other dishes</translation>
</message>
<message>
- <location filename="mainwindow.ui" line="473"/>
+ <location filename="mainwindow.ui" line="470"/>
<source>채소및곡류</source>
<translation>Vegetables</translation>
</message>
<message>
- <location filename="mainwindow.ui" line="499"/>
+ <location filename="mainwindow.ui" line="496"/>
<source>가금류</source>
<translation>Poultry</translation>
</message>
<message>
- <location filename="mainwindow.ui" line="525"/>
+ <location filename="mainwindow.ui" line="522"/>
<source>생선류</source>
<translation>Fishes</translation>
</message>
<message>
- <location filename="mainwindow.ui" line="551"/>
+ <location filename="mainwindow.ui" line="548"/>
<source>제과제빵류</source>
<translation>Baking</translation>
</message>
<message>
- <location filename="mainwindow.ui" line="577"/>
+ <location filename="mainwindow.ui" line="574"/>
<source>부가기능</source>
<translation>Add-ons</translation>
</message>
@@ -2634,7 +2702,7 @@ Control</translation>
<translation type="vanished">V0.3.4</translation>
</message>
<message>
- <location filename="mainwindow.cpp" line="128"/>
+ <location filename="mainwindow.cpp" line="137"/>
<source>세척이 정상적으로 종료되지 않아
반드시 세척통을 자동 세척해야 합니다.
내부를 비워주세요</source>
@@ -2756,48 +2824,48 @@ Control</translation>
<translation>tool</translation>
</message>
<message>
- <location filename="manualcookwindow.cpp" line="696"/>
- <location filename="manualcookwindow.cpp" line="706"/>
+ <location filename="manualcookwindow.cpp" line="702"/>
+ <location filename="manualcookwindow.cpp" line="712"/>
<source>문을 닫아주세요</source>
<translation>Please close the door</translation>
</message>
<message>
- <location filename="manualcookwindow.cpp" line="696"/>
+ <location filename="manualcookwindow.cpp" line="702"/>
<source>조리 중 문 열림 시간 모니터링 1단계</source>
<translation>Monitoring stage 1 of door open time during cooking </translation>
</message>
<message>
- <location filename="manualcookwindow.cpp" line="706"/>
+ <location filename="manualcookwindow.cpp" line="712"/>
<source>조리 중 문 열림 시간 모니터링 2단계</source>
<translation>Monitoring stage 2 of door open time during cooking </translation>
</message>
<message>
- <location filename="manualcookwindow.cpp" line="716"/>
+ <location filename="manualcookwindow.cpp" line="722"/>
<source>문이 오래 열려있어 조리가 취소되었습니다</source>
<translation>The door is opened for a long time, so cooking is cancelled</translation>
</message>
<message>
- <location filename="manualcookwindow.cpp" line="716"/>
+ <location filename="manualcookwindow.cpp" line="722"/>
<source>조리 중 문 열림 시간 모니터링 3단계</source>
<translation>Monitoring stage 3 of door open time during cooking</translation>
</message>
<message>
- <location filename="manualcookwindow.cpp" line="1053"/>
+ <location filename="manualcookwindow.cpp" line="1059"/>
<source>즐겨찾기 항목에 추가하시겠습니까?</source>
<translation>Do you want to add it to bookmark?</translation>
</message>
<message>
- <location filename="manualcookwindow.cpp" line="1084"/>
+ <location filename="manualcookwindow.cpp" line="1090"/>
<source>요리가 중단되고 환경 설정 모드로 들어갑니다. 진행할까요?</source>
<translation>Cooking stops and the system goes to configuration mode. Do you want to proceed?</translation>
</message>
<message>
- <location filename="manualcookwindow.cpp" line="1107"/>
+ <location filename="manualcookwindow.cpp" line="1113"/>
<source>요리가 중단되고 즐겨찾기 모드로 들어갑니다. 진행할까요?</source>
<translation>Cooking stops and the system goes to bookmark mode. Do you want to proceed?</translation>
</message>
<message>
- <location filename="manualcookwindow.cpp" line="1131"/>
+ <location filename="manualcookwindow.cpp" line="1137"/>
<source>요리가 중단되고 자동 세척 모드로 들어갑니다. 진행할까요?</source>
<translation>Cooking stops and the system goes to automatic cleaning mode. Do you want to proceed?</translation>
</message>
@@ -2831,6 +2899,225 @@ Control</translation>
</message>
</context>
<context>
+ <name>MultiCookAutoWindow</name>
+ <message>
+ <location filename="multicookautowindow.cpp" line="140"/>
+ <source>다중 요리 목록에 추가하시겠습니까?</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>MultiCookManualWindow</name>
+ <message>
+ <location filename="multicookmanualwindow.ui" line="81"/>
+ <source>건열</source>
+ <translation type="unfinished">Dry Heat</translation>
+ </message>
+ <message>
+ <location filename="multicookmanualwindow.ui" line="170"/>
+ <source>0%</source>
+ <translation type="unfinished">0%</translation>
+ </message>
+ <message>
+ <location filename="multicookmanualwindow.ui" line="232"/>
+ <location filename="multicookmanualwindow.ui" line="378"/>
+ <source>감소</source>
+ <translation type="unfinished">Decrease</translation>
+ </message>
+ <message>
+ <location filename="multicookmanualwindow.ui" line="294"/>
+ <location filename="multicookmanualwindow.ui" line="709"/>
+ <source>증가</source>
+ <translation type="unfinished">Increase</translation>
+ </message>
+ <message>
+ <location filename="multicookmanualwindow.ui" line="503"/>
+ <source>0<span style="font-size:11pt;">초</span></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="multicookmanualwindow.ui" line="527"/>
+ <source>콤비</source>
+ <translation type="unfinished">Combi</translation>
+ </message>
+ <message>
+ <location filename="multicookmanualwindow.ui" line="580"/>
+ <source>스팀</source>
+ <translation type="unfinished">Steam</translation>
+ </message>
+ <message>
+ <location filename="multicookmanualwindow.ui" line="647"/>
+ <source>30<span style="font-size:11pt;">℃</span></source>
+ <translation type="unfinished">30<span style="font-size:11pt;">℃</span></translation>
+ </message>
+</context>
+<context>
+ <name>MultiCookSelectionWindow</name>
+ <message>
+ <location filename="multicookselectionwindow.ui" line="78"/>
+ <source>건열</source>
+ <translation type="unfinished">Dry Heat</translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.ui" line="121"/>
+ <source>채소및곡류</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.ui" line="164"/>
+ <source>제과제빵류</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.ui" line="207"/>
+ <source>육류</source>
+ <translation type="unfinished">Meat</translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.ui" line="250"/>
+ <source>디저트류</source>
+ <translation type="unfinished">Dessert</translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.ui" line="280"/>
+ <source>가금류</source>
+ <translation type="unfinished">Poultry</translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.ui" line="304"/>
+ <source>콤비</source>
+ <translation type="unfinished">Combi</translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.ui" line="337"/>
+ <source>다중요리</source>
+ <translation type="unfinished">Multiple Cooking</translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.ui" line="370"/>
+ <source>프로그래밍모드</source>
+ <translation type="unfinished">Programming Mode</translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.ui" line="413"/>
+ <source>기타요리</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.ui" line="459"/>
+ <source>세척모드</source>
+ <translation type="unfinished">Cleaning Mode</translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.ui" line="489"/>
+ <source>부가기능</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.ui" line="617"/>
+ <source>스팀</source>
+ <translation type="unfinished">Steam</translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.ui" line="647"/>
+ <source>생선류</source>
+ <translation type="unfinished">Fishes</translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.ui" line="702"/>
+ <location filename="multicookselectionwindow.cpp" line="83"/>
+ <source>1. 다중 요리에서 사용할 요리 카테고리를 선택해주세요
+2. 스팀, 콤비, 건열 중에서 선택하시면 자동으로 다음 단계로 진행됩니다</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.cpp" line="103"/>
+ <source>스팀을</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.cpp" line="106"/>
+ <source>콤비를</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.cpp" line="109"/>
+ <source>건열을</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.cpp" line="113"/>
+ <source>1. %1 선택하였습니다
+2. 수동 메뉴 혹은 원하시는 자동 메뉴 상세 목록을 선택하세요</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>MultiCookWindow</name>
+ <message>
+ <location filename="multicookwindow.ui" line="14"/>
+ <source>MainWindow</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="multicookwindow.ui" line="113"/>
+ <source>문이 열려있습니다
+문을 닫으시면 다시 시작됩니다</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="multicookwindow.ui" line="170"/>
+ <source>문을 열어주세요</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="multicookwindow.ui" line="538"/>
+ <source>다중 요리 최근 요리 목록입니다</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="multicookwindow.ui" line="754"/>
+ <location filename="multicookwindow.ui" line="778"/>
+ <location filename="multicookwindow.ui" line="802"/>
+ <location filename="multicookwindow.ui" line="826"/>
+ <location filename="multicookwindow.ui" line="850"/>
+ <location filename="multicookwindow.ui" line="874"/>
+ <location filename="multicookwindow.ui" line="898"/>
+ <location filename="multicookwindow.ui" line="922"/>
+ <location filename="multicookwindow.ui" line="946"/>
+ <location filename="multicookwindow.ui" line="970"/>
+ <location filename="multicookwindow.ui" line="1034"/>
+ <source>slotLabel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="multicookwindow.ui" line="1027"/>
+ <source>1. 해당 조리 칸 버튼을 눌러 메뉴를 선택해주세요.
+2. 메뉴가 선택되면, 해당 작업 시간이 적용됩니다.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="multicookwindow.cpp" line="178"/>
+ <source>%1번 단 요리(%2)가 종료되었습니다</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="multicookwindow.cpp" line="405"/>
+ <location filename="multicookwindow.cpp" line="420"/>
+ <location filename="multicookwindow.cpp" line="435"/>
+ <source>요리를 취소하시겠습니까?</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>MultiManualCook</name>
+ <message>
+ <location filename="multimanualcook.cpp" line="39"/>
+ <source>수동 요리</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>NotiPopupDlg</name>
<message>
<location filename="notipopupdlg.ui" line="60"/>
@@ -3602,7 +3889,7 @@ Nozzle Solenoid</translation>
<name>PreheatPopup</name>
<message>
<location filename="preheatpopup.ui" line="104"/>
- <location filename="preheatpopup.ui" line="549"/>
+ <location filename="preheatpopup.ui" line="552"/>
<source>10</source>
<translation>10</translation>
</message>
@@ -3612,17 +3899,17 @@ Nozzle Solenoid</translation>
<translation>Preheat</translation>
</message>
<message>
- <location filename="preheatpopup.ui" line="331"/>
+ <location filename="preheatpopup.ui" line="334"/>
<source>예열</source>
<translation>Preheating</translation>
</message>
<message>
- <location filename="preheatpopup.ui" line="491"/>
+ <location filename="preheatpopup.ui" line="494"/>
<source>00:00</source>
<translation>0:00</translation>
</message>
<message>
- <location filename="preheatpopup.ui" line="749"/>
+ <location filename="preheatpopup.ui" line="752"/>
<source>000/000</source>
<translation>000/000</translation>
</message>
@@ -3648,9 +3935,8 @@ Nozzle Solenoid</translation>
<context>
<name>ProgrammedCookPanelButton</name>
<message>
- <location filename="programmedcookpanelbutton.ui" line="14"/>
<source>Form</source>
- <translation>form</translation>
+ <translation type="vanished">form</translation>
</message>
</context>
<context>
@@ -3794,7 +4080,7 @@ Nozzle Solenoid</translation>
<location filename="programmingselectionwindow.ui" line="417"/>
<location filename="programmingselectionwindow.ui" line="589"/>
<location filename="programmingselectionwindow.ui" line="643"/>
- <location filename="programmingselectionwindow.ui" line="739"/>
+ <location filename="programmingselectionwindow.ui" line="673"/>
<source>type</source>
<translation>type</translation>
</message>
@@ -3873,7 +4159,7 @@ Nozzle Solenoid</translation>
<translation>Additional Functions</translation>
</message>
<message>
- <location filename="programmingselectionwindow.ui" line="736"/>
+ <location filename="programmingselectionwindow.ui" line="670"/>
<source>제과제빵류</source>
<translation>Confectionery and Baking</translation>
</message>
@@ -3891,18 +4177,18 @@ Nozzle Solenoid</translation>
<translation>Make Manual Cooking</translation>
</message>
<message>
- <location filename="programmingwindow.cpp" line="110"/>
- <location filename="programmingwindow.cpp" line="122"/>
+ <location filename="programmingwindow.cpp" line="111"/>
+ <location filename="programmingwindow.cpp" line="123"/>
<source>추가하기</source>
<translation>Add</translation>
</message>
<message>
- <location filename="programmingwindow.cpp" line="308"/>
+ <location filename="programmingwindow.cpp" line="309"/>
<source>저장하지 않고 돌아가시겠습니까?</source>
<translation>Do you want to go back without saving?</translation>
</message>
<message>
- <location filename="programmingwindow.cpp" line="318"/>
+ <location filename="programmingwindow.cpp" line="319"/>
<source>저장하시겠습니까?</source>
<translation>Do you want to save it?</translation>
</message>
@@ -4329,17 +4615,6 @@ Spray Nozzle Solenoid</translation>
<translation>Door Sensor</translation>
</message>
<message>
- <location filename="realtimepartswindow.cpp" line="81"/>
- <location filename="realtimepartswindow.cpp" line="84"/>
- <location filename="realtimepartswindow.cpp" line="87"/>
- <location filename="realtimepartswindow.cpp" line="100"/>
- <location filename="realtimepartswindow.cpp" line="103"/>
- <location filename="realtimepartswindow.cpp" line="106"/>
- <location filename="realtimepartswindow.cpp" line="109"/>
- <source>ON</source>
- <translation>ON</translation>
- </message>
- <message>
<location filename="realtimepartswindow.cpp" line="82"/>
<location filename="realtimepartswindow.cpp" line="85"/>
<location filename="realtimepartswindow.cpp" line="88"/>
@@ -4347,21 +4622,32 @@ Spray Nozzle Solenoid</translation>
<location filename="realtimepartswindow.cpp" line="104"/>
<location filename="realtimepartswindow.cpp" line="107"/>
<location filename="realtimepartswindow.cpp" line="110"/>
+ <source>ON</source>
+ <translation>ON</translation>
+ </message>
+ <message>
+ <location filename="realtimepartswindow.cpp" line="83"/>
+ <location filename="realtimepartswindow.cpp" line="86"/>
+ <location filename="realtimepartswindow.cpp" line="89"/>
+ <location filename="realtimepartswindow.cpp" line="102"/>
+ <location filename="realtimepartswindow.cpp" line="105"/>
+ <location filename="realtimepartswindow.cpp" line="108"/>
+ <location filename="realtimepartswindow.cpp" line="111"/>
<source>OFF</source>
<translation>OFF</translation>
</message>
<message>
- <location filename="realtimepartswindow.cpp" line="93"/>
+ <location filename="realtimepartswindow.cpp" line="94"/>
<source>HIGH</source>
<translation>HIGH</translation>
</message>
<message>
- <location filename="realtimepartswindow.cpp" line="96"/>
+ <location filename="realtimepartswindow.cpp" line="97"/>
<source>LOW</source>
<translation>LOW</translation>
</message>
<message>
- <location filename="realtimepartswindow.cpp" line="98"/>
+ <location filename="realtimepartswindow.cpp" line="99"/>
<source>NORMAL</source>
<translation>NORMAL</translation>
</message>
@@ -4482,6 +4768,11 @@ Temperature Time</translation>
<translation type="unfinished">Month</translation>
</message>
<message>
+ <location filename="reservetimepopup.ui" line="167"/>
+ <source>분 후</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>분</source>
<translation type="vanished">Minute</translation>
</message>
@@ -4566,6 +4857,24 @@ Temperature Time</translation>
</message>
</context>
<context>
+ <name>TouchTestWindow</name>
+ <message>
+ <location filename="touchtestwindow.ui" line="14"/>
+ <source>MainWindow</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="touchtestwindow.ui" line="31"/>
+ <source>X</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="touchtestwindow.ui" line="48"/>
+ <source>C</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>UsbCheckPopupDlg</name>
<message>
<location filename="usbcheckpopupdlg.ui" line="61"/>
@@ -4687,7 +4996,7 @@ Solenoid Valve</translation>
<name>WashWindow</name>
<message>
<location filename="washwindow.ui" line="200"/>
- <location filename="washwindow.cpp" line="354"/>
+ <location filename="washwindow.cpp" line="356"/>
<source>기기의 내부를 세척 중입니다</source>
<translation>Inside of the device is being cleaned</translation>
</message>
@@ -4763,80 +5072,80 @@ Inside-device automatic cleaning function is in progress.</translation>
<translation>Cleanliness</translation>
</message>
<message>
- <location filename="washwindow.cpp" line="80"/>
+ <location filename="washwindow.cpp" line="82"/>
<source>제품 스팀통을 세척 중입니다</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="washwindow.cpp" line="81"/>
+ <location filename="washwindow.cpp" line="83"/>
<source>완료될 때까지 문을 열지 마세요
제품의 스팀통 자동 세척 기능을 실행 중입니다</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="washwindow.cpp" line="214"/>
+ <location filename="washwindow.cpp" line="216"/>
<source>내부 헹굼 진행 중입니다.</source>
<translation>Inside rinsing is in progress. </translation>
</message>
<message>
- <location filename="washwindow.cpp" line="217"/>
+ <location filename="washwindow.cpp" line="219"/>
<source>스팀 급수 진행 중입니다.</source>
<translation>Steam water supply is in progress.</translation>
</message>
<message>
- <location filename="washwindow.cpp" line="220"/>
+ <location filename="washwindow.cpp" line="222"/>
<source>내부 팬 세척 진행 중입니다.</source>
<translation>Inside fan cleaning is in progress.</translation>
</message>
<message>
- <location filename="washwindow.cpp" line="223"/>
+ <location filename="washwindow.cpp" line="225"/>
<source>내부 스팀 불림 진행 중입니다.</source>
<translation>Inside steam macerating is in progress.</translation>
</message>
<message>
- <location filename="washwindow.cpp" line="226"/>
+ <location filename="washwindow.cpp" line="228"/>
<source>내부 강 세척 진행 중입니다.</source>
<translation>Inside strong cleaning is in progress.</translation>
</message>
<message>
- <location filename="washwindow.cpp" line="229"/>
+ <location filename="washwindow.cpp" line="231"/>
<source>내부 상부 세척 진행 중입니다.</source>
<translation>Inside upper part cleaning is in progress.</translation>
</message>
<message>
- <location filename="washwindow.cpp" line="232"/>
+ <location filename="washwindow.cpp" line="234"/>
<source>내부 스팀 세척 진행 중입니다.</source>
<translation>Inside steam cleaning is in progress.</translation>
</message>
<message>
- <location filename="washwindow.cpp" line="235"/>
+ <location filename="washwindow.cpp" line="237"/>
<source>세척 종료 진행 중입니다.</source>
<translation>Cleaning is being finished.</translation>
</message>
<message>
- <location filename="washwindow.cpp" line="238"/>
+ <location filename="washwindow.cpp" line="240"/>
<source>세제 세척수 만들기 진행 중입니다.</source>
<translation>Detergent cleaning water making is in progress.</translation>
</message>
<message>
- <location filename="washwindow.cpp" line="241"/>
+ <location filename="washwindow.cpp" line="243"/>
<source>세제 세척수 헹굼 진행 중입니다.</source>
<translation>Detergent cleaning water rinsing is in progress.</translation>
</message>
<message>
- <location filename="washwindow.cpp" line="244"/>
+ <location filename="washwindow.cpp" line="246"/>
<source>하부 탱크 세척수 만들기 진행 중입니다.</source>
<translation>Lower tank cleaning water making is in progress.</translation>
</message>
<message>
- <location filename="washwindow.cpp" line="355"/>
+ <location filename="washwindow.cpp" line="357"/>
<source>완료될 때까지 문을 열지 마세요.
제품 내부의 자동 세척 기능을 실행 중입니다.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="washwindow.cpp" line="409"/>
- <location filename="washwindow.cpp" line="455"/>
+ <location filename="washwindow.cpp" line="413"/>
+ <location filename="washwindow.cpp" line="463"/>
<source>세척이 종료되었습니다</source>
<translation>Cleaning is finished</translation>
</message>
diff --git a/app/gui/oven_control/lang_zh.ts b/app/gui/oven_control/lang_zh.ts
index 3c6da31..a1c37af 100644
--- a/app/gui/oven_control/lang_zh.ts
+++ b/app/gui/oven_control/lang_zh.ts
@@ -14,13 +14,13 @@
<translation>校正</translation>
</message>
<message>
- <location filename="adjustmentwindow.cpp" line="32"/>
+ <location filename="adjustmentwindow.cpp" line="33"/>
<source>모든 설정 값을 공장(출고)초기화
값으로 변경 하시겠습니까?</source>
<translation>是否所有设定值都更改为工厂（出库）初始化值吗？</translation>
</message>
<message>
- <location filename="adjustmentwindow.cpp" line="98"/>
+ <location filename="adjustmentwindow.cpp" line="99"/>
<source>테스트를 완료하였습니다.</source>
<translation>经测试.</translation>
</message>
@@ -118,7 +118,7 @@
<translation>蒸汽</translation>
</message>
<message>
- <location filename="autocookconfigwindow.cpp" line="387"/>
+ <location filename="autocookconfigwindow.cpp" line="388"/>
<source>즐겨찾기 항목에 추가하시겠습니까?</source>
<translation>添加到收藏夹项目吗？</translation>
</message>
@@ -184,81 +184,81 @@
<translation>后续课程选项</translation>
</message>
<message>
- <location filename="autocookwindow.cpp" line="510"/>
+ <location filename="autocookwindow.cpp" line="513"/>
<source>중심 온도계 삽입</source>
<translation>中心温度计插入</translation>
</message>
<message>
- <location filename="autocookwindow.cpp" line="517"/>
+ <location filename="autocookwindow.cpp" line="520"/>
<source>식재료 적재</source>
<translation>食材装载</translation>
</message>
<message>
- <location filename="autocookwindow.cpp" line="529"/>
+ <location filename="autocookwindow.cpp" line="532"/>
<source>자르기</source>
<translation>裁剪</translation>
</message>
<message>
- <location filename="autocookwindow.cpp" line="537"/>
+ <location filename="autocookwindow.cpp" line="540"/>
<source>물 붓기</source>
<translation>灌水</translation>
</message>
<message>
- <location filename="autocookwindow.cpp" line="880"/>
- <location filename="autocookwindow.cpp" line="892"/>
- <location filename="autocookwindow.cpp" line="931"/>
- <location filename="autocookwindow.cpp" line="943"/>
- <location filename="autocookwindow.cpp" line="955"/>
+ <location filename="autocookwindow.cpp" line="890"/>
+ <location filename="autocookwindow.cpp" line="902"/>
+ <location filename="autocookwindow.cpp" line="941"/>
+ <location filename="autocookwindow.cpp" line="953"/>
+ <location filename="autocookwindow.cpp" line="965"/>
<source>문을 닫아주세요</source>
<translation>请把门关上</translation>
</message>
<message>
- <location filename="autocookwindow.cpp" line="880"/>
+ <location filename="autocookwindow.cpp" line="890"/>
<source>조리 중 문 열림 시간 모니터링 1단계</source>
<translation>烹饪中门打开的时间监测第一阶段</translation>
</message>
<message>
- <location filename="autocookwindow.cpp" line="892"/>
+ <location filename="autocookwindow.cpp" line="902"/>
<source>조리 중 문 열림 시간 모니터링 2단계</source>
<translation>烹饪中门打开的时间监测第二阶段</translation>
</message>
<message>
- <location filename="autocookwindow.cpp" line="904"/>
+ <location filename="autocookwindow.cpp" line="914"/>
<source>문이 오래 열려있어 조리가 취소되었습니다</source>
<translation>因为长时间开着门烹饪被取消了</translation>
</message>
<message>
- <location filename="autocookwindow.cpp" line="904"/>
+ <location filename="autocookwindow.cpp" line="914"/>
<source>조리 중 문 열림 시간 모니터링 3단계</source>
<translation>烹饪中门打开的时间监测第三阶段监测</translation>
</message>
<message>
- <location filename="autocookwindow.cpp" line="931"/>
+ <location filename="autocookwindow.cpp" line="941"/>
<source>적재 중 문 열림 시간 모니터링 1단계</source>
<translation>监控装载中门打开的时间 第一阶段</translation>
</message>
<message>
- <location filename="autocookwindow.cpp" line="943"/>
+ <location filename="autocookwindow.cpp" line="953"/>
<source>적재 중 문 열림 시간 모니터링 2단계</source>
<translation>监控装载中门打开的时间第二阶段</translation>
</message>
<message>
- <location filename="autocookwindow.cpp" line="955"/>
+ <location filename="autocookwindow.cpp" line="965"/>
<source>적재 중 문 열림 시간 모니터링 3단계</source>
<translation>装载中门打开的时间监测第三阶段监测</translation>
</message>
<message>
- <location filename="autocookwindow.cpp" line="1074"/>
+ <location filename="autocookwindow.cpp" line="1084"/>
<source>요리가 중단되고 환경 설정 모드로 들어갑니다. 진행할까요?</source>
<translation>中断烹饪后进入设定环境模式。是否进行？</translation>
</message>
<message>
- <location filename="autocookwindow.cpp" line="1086"/>
+ <location filename="autocookwindow.cpp" line="1096"/>
<source>즐겨찾기 항목에 추가하시겠습니까?</source>
<translation>添加到收藏夹项目吗？</translation>
</message>
<message>
- <location filename="autocookwindow.cpp" line="1105"/>
+ <location filename="autocookwindow.cpp" line="1115"/>
<source>요리가 중단되고 자동 세척 모드로 들어갑니다. 진행할까요?</source>
<translation>中断烹饪后进入设定自动清洗模式。是否进行？</translation>
</message>
@@ -389,15 +389,15 @@
</message>
<message>
<location filename="config.h" line="29"/>
- <source>잔여시간</source>
+ <source>잔여시간<byte value="x0"/></source>
<oldsource>잔여시간</oldsource>
- <translation>剩余时间</translation>
+ <translation type="unfinished">剩余时间</translation>
</message>
<message>
<location filename="config.h" line="30"/>
- <source>타겟시간</source>
+ <source>타겟시간<byte value="x0"/></source>
<oldsource>타겟시간</oldsource>
- <translation>目标时间</translation>
+ <translation type="unfinished">目标时间</translation>
</message>
<message>
<location filename="config.h" line="34"/>
@@ -411,66 +411,86 @@
</message>
<message>
<location filename="config.h" line="39"/>
- <source>설정취소</source>
+ <source>설정취소<byte value="x0"/></source>
<oldsource>설정취소</oldsource>
- <translation>取消设定</translation>
+ <translation type="unfinished">取消设定</translation>
</message>
<message>
<location filename="config.h" line="40"/>
- <source>설정</source>
+ <source>설정<byte value="x0"/></source>
<oldsource>설정</oldsource>
- <translation>设定</translation>
+ <translation type="unfinished">设定</translation>
</message>
<message>
<location filename="config.h" line="63"/>
- <source>비활성</source>
+ <source>비활성<byte value="x0"/></source>
<oldsource>비활성</oldsource>
- <translation>非活化</translation>
+ <translation type="unfinished">非活化</translation>
</message>
<message>
<location filename="config.h" line="64"/>
- <source>활성화</source>
+ <source>활성화<byte value="x0"/></source>
<oldsource>활성화</oldsource>
- <translation>活化</translation>
+ <translation type="unfinished">活化</translation>
</message>
<message>
<location filename="config.h" line="68"/>
- <source>끄기</source>
+ <source>끄기<byte value="x0"/></source>
<oldsource>끄기</oldsource>
- <translation>关闭</translation>
+ <translation type="unfinished">关闭</translation>
</message>
<message>
<location filename="config.h" line="69"/>
- <source>켜기</source>
+ <source>켜기<byte value="x0"/></source>
<oldsource>켜기</oldsource>
- <translation>启动</translation>
+ <translation type="unfinished">启动</translation>
</message>
<message>
+ <location filename="config.cpp" line="492"/>
+ <location filename="config.cpp" line="493"/>
<location filename="config.h" line="94"/>
<source>모 델 명</source>
<translation>模型名称</translation>
</message>
<message>
+ <location filename="config.cpp" line="499"/>
+ <location filename="config.cpp" line="500"/>
<location filename="config.h" line="95"/>
<source>제조일자</source>
<translation>制造日期</translation>
</message>
<message>
+ <location filename="config.cpp" line="506"/>
+ <location filename="config.cpp" line="507"/>
<location filename="config.h" line="96"/>
<source>제조국</source>
<translation>制造国</translation>
</message>
<message>
+ <location filename="config.cpp" line="513"/>
+ <location filename="config.cpp" line="514"/>
<location filename="config.h" line="97"/>
<source>제조사</source>
<translation>制造商</translation>
</message>
<message>
+ <location filename="config.cpp" line="520"/>
+ <location filename="config.cpp" line="521"/>
<location filename="config.h" line="98"/>
<source>제품번호</source>
<translation>产品序列号</translation>
</message>
<message>
+ <location filename="config.cpp" line="561"/>
+ <source>모든 음향설정 값을 공장초기화
하시겠습니까?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="config.cpp" line="593"/>
+ <source>모든 프로그램을
삭제하시겠습니까?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="config.h" line="99"/>
<source>소프트웨어 버전</source>
<translation>软件版本</translation>
@@ -498,269 +518,329 @@
<translation>位置信息</translation>
</message>
<message>
- <location filename="config.h" line="333"/>
+ <location filename="config.h" line="116"/>
+ <source>전기식 10단</source>
+ <translation type="unfinished">电动式 10段</translation>
+ </message>
+ <message>
+ <location filename="config.h" line="117"/>
+ <source>전기식 20단</source>
+ <translation type="unfinished">电动式 20段</translation>
+ </message>
+ <message>
+ <location filename="config.h" line="118"/>
+ <source>전기식 24단</source>
+ <translation type="unfinished">电动式 24段</translation>
+ </message>
+ <message>
+ <location filename="config.h" line="119"/>
+ <source>전기식 40단</source>
+ <translation type="unfinished">电动式 40段</translation>
+ </message>
+ <message>
+ <location filename="config.h" line="120"/>
+ <source>가스식 10단 LPG</source>
+ <translation type="unfinished">燃气式 10段 LPG</translation>
+ </message>
+ <message>
+ <location filename="config.h" line="121"/>
+ <source>가스식 20단 LPG</source>
+ <translation type="unfinished">燃气式 20段 LPG</translation>
+ </message>
+ <message>
+ <location filename="config.h" line="122"/>
+ <source>가스식 24단 LPG</source>
+ <translation type="unfinished">燃气式 24段 LPG</translation>
+ </message>
+ <message>
+ <location filename="config.h" line="123"/>
+ <source>가스식 40단 LPG</source>
+ <translation type="unfinished">燃气式 40段 LPG</translation>
+ </message>
+ <message>
+ <location filename="config.h" line="124"/>
+ <source>가스식 10단 LNG</source>
+ <translation type="unfinished">燃气式 10段 LNG</translation>
+ </message>
+ <message>
+ <location filename="config.h" line="125"/>
+ <source>가스식 20단 LNG</source>
+ <translation type="unfinished">燃气式 20段 LNG</translation>
+ </message>
+ <message>
+ <location filename="config.h" line="126"/>
+ <source>가스식 24단 LNG</source>
+ <translation type="unfinished">燃气式 24段 LNG</translation>
+ </message>
+ <message>
+ <location filename="config.h" line="127"/>
+ <source>가스식 40단 LNG</source>
+ <translation type="unfinished">燃气式 40段 LNG</translation>
+ </message>
+ <message>
+ <location filename="config.h" line="357"/>
<source>%1 분</source>
<translation>%1分</translation>
</message>
<message>
- <location filename="config.h" line="343"/>
+ <location filename="config.h" line="367"/>
<source>%1번</source>
<translation>%1号</translation>
</message>
<message>
- <location filename="config.h" line="349"/>
+ <location filename="config.h" line="373"/>
<source>공장초기화</source>
<translation>工厂初始化</translation>
</message>
<message>
- <location filename="config.h" line="350"/>
+ <location filename="config.h" line="374"/>
<source>USB 삽입</source>
<translation>USB插入</translation>
</message>
<message>
- <location filename="config.h" line="355"/>
+ <location filename="config.h" line="379"/>
<source>초기화</source>
<translation>初始化</translation>
</message>
<message>
- <location filename="config.h" line="366"/>
- <location filename="config.h" line="367"/>
+ <location filename="config.h" line="390"/>
+ <location filename="config.h" line="391"/>
<source>%1단계</source>
<translation>%1阶段</translation>
</message>
<message>
- <location filename="config.h" line="368"/>
+ <location filename="config.h" line="392"/>
<source>정보확인</source>
<translation>信息确认</translation>
</message>
<message>
- <location filename="config.h" line="371"/>
+ <location filename="config.h" line="395"/>
<source>헹굼</source>
<translation>漂洗</translation>
</message>
<message>
- <location filename="config.h" line="373"/>
+ <location filename="config.h" line="397"/>
<source>엔지니어모드 진입</source>
<translation>语言设定</translation>
</message>
<message>
- <location filename="config.h" line="377"/>
+ <location filename="config.h" line="401"/>
<source>언어설정</source>
<translation>语言设定</translation>
</message>
<message>
- <location filename="config.h" line="378"/>
+ <location filename="config.h" line="402"/>
<source>날짜와 시간</source>
<translation>日期和时间 </translation>
</message>
<message>
- <location filename="config.h" line="379"/>
+ <location filename="config.h" line="403"/>
<source>온도단위</source>
<translation>温度单位</translation>
</message>
<message>
- <location filename="config.h" line="380"/>
+ <location filename="config.h" line="404"/>
<source>화면밝기</source>
<translation>屏幕亮度</translation>
</message>
<message>
- <location filename="config.h" line="381"/>
+ <location filename="config.h" line="405"/>
<source>응축식 후드의 정지지연</source>
<translation>冷凝式喉头的停止延迟</translation>
</message>
<message>
- <location filename="config.h" line="382"/>
+ <location filename="config.h" line="406"/>
<source>일품요리용 접시무게</source>
<translation>单品烹饪用的盘子重量</translation>
</message>
<message>
- <location filename="config.h" line="383"/>
+ <location filename="config.h" line="407"/>
<source>연회용 접시무게</source>
<translation>宴会用的盘子重量</translation>
</message>
<message>
- <location filename="config.h" line="384"/>
+ <location filename="config.h" line="408"/>
<source>ILC 조리선반 개수</source>
<translation>ILC烹饪架数</translation>
</message>
<message>
- <location filename="config.h" line="385"/>
+ <location filename="config.h" line="409"/>
<source>ILC 조리선반 순서</source>
<translation>ILC烹饪架顺序 </translation>
</message>
<message>
- <location filename="config.h" line="386"/>
- <location filename="config.h" line="411"/>
+ <location filename="config.h" line="410"/>
+ <location filename="config.h" line="435"/>
<source>ILC 조리 온습도 대기시간</source>
<translation>ILC烹调温度和湿度等待时间</translation>
</message>
<message>
- <location filename="config.h" line="387"/>
+ <location filename="config.h" line="411"/>
<source>조리시간 포맷</source>
<translation>烹调时间格式</translation>
</message>
<message>
- <location filename="config.h" line="388"/>
+ <location filename="config.h" line="412"/>
<source>실시간 단위 설정</source>
<translation>实时单位设定</translation>
</message>
<message>
- <location filename="config.h" line="389"/>
+ <location filename="config.h" line="413"/>
<source>잔여시간 시점변경설정</source>
<translation>更改设定剩余时间时刻</translation>
</message>
<message>
- <location filename="config.h" line="390"/>
+ <location filename="config.h" line="414"/>
<source>마스터 볼륨</source>
<translation>主控音量</translation>
</message>
<message>
- <location filename="config.h" line="391"/>
+ <location filename="config.h" line="415"/>
<source>키패드 소리 - 1</source>
<translation>键盘的声音- 1</translation>
</message>
<message>
- <location filename="config.h" line="392"/>
+ <location filename="config.h" line="416"/>
<source>키패드 볼륨 </source>
<translation>键盘音量</translation>
</message>
<message>
- <location filename="config.h" line="393"/>
+ <location filename="config.h" line="417"/>
<source>적재/실행 요청</source>
<translation>装载/执行请求</translation>
</message>
<message>
- <location filename="config.h" line="394"/>
+ <location filename="config.h" line="418"/>
<source>프로그램 단계 종료</source>
<translation>项目阶段终止</translation>
</message>
<message>
- <location filename="config.h" line="395"/>
+ <location filename="config.h" line="419"/>
<source>조리시간 종료</source>
<translation>烹调时间结束</translation>
</message>
<message>
- <location filename="config.h" line="396"/>
+ <location filename="config.h" line="420"/>
<source>과정 중단/오류 식별</source>
<translation>过程中断/错误识别</translation>
</message>
<message>
- <location filename="config.h" line="397"/>
+ <location filename="config.h" line="421"/>
<source>음향설정 초기화</source>
<translation>音响设定初始化</translation>
</message>
<message>
- <location filename="config.h" line="398"/>
+ <location filename="config.h" line="422"/>
<source>HACCP 데이터 다운로드</source>
<translation>HACCP数据下载</translation>
</message>
<message>
- <location filename="config.h" line="399"/>
+ <location filename="config.h" line="423"/>
<source>인포 데이터 다운로드</source>
<translation>信息数据下载</translation>
</message>
<message>
- <location filename="config.h" line="400"/>
+ <location filename="config.h" line="424"/>
<source>서비스 데이터 다운로드</source>
<translation>服务数据下载</translation>
</message>
<message>
- <location filename="config.h" line="401"/>
+ <location filename="config.h" line="425"/>
<source>프로그램 다운로드</source>
<translation>程序下载</translation>
</message>
<message>
- <location filename="config.h" line="402"/>
+ <location filename="config.h" line="426"/>
<source>프로그램 업로드</source>
<translation>程序上传</translation>
</message>
<message>
- <location filename="config.h" line="403"/>
+ <location filename="config.h" line="427"/>
<source>모든 프로그램 삭제</source>
<translation>删除所有的程序</translation>
</message>
<message>
- <location filename="config.h" line="404"/>
+ <location filename="config.h" line="428"/>
<source>IP 주소</source>
<translation>IP地址</translation>
</message>
<message>
- <location filename="config.h" line="405"/>
+ <location filename="config.h" line="429"/>
<source>IP 게이트웨이</source>
<translation>IP网关</translation>
</message>
<message>
- <location filename="config.h" line="406"/>
+ <location filename="config.h" line="430"/>
<source>IP 넷마스크</source>
<translation>IP子网掩码</translation>
</message>
<message>
- <location filename="config.h" line="407"/>
+ <location filename="config.h" line="431"/>
<source>기본설정 다운로드</source>
<translation>基本设定下载</translation>
</message>
<message>
- <location filename="config.h" line="408"/>
+ <location filename="config.h" line="432"/>
<source>기본설정 업로드</source>
<translation>基本设定上传</translation>
</message>
<message>
- <location filename="config.h" line="409"/>
+ <location filename="config.h" line="433"/>
<source>하프에너지</source>
<translation>半能量</translation>
</message>
<message>
- <location filename="config.h" line="410"/>
+ <location filename="config.h" line="434"/>
<source>화면 밝기 자동 감소</source>
<translation>屏幕亮度自动减少</translation>
</message>
<message>
- <location filename="config.h" line="412"/>
+ <location filename="config.h" line="436"/>
<source>적재중 대기 시간</source>
<translation>装载中等待的时间</translation>
</message>
<message>
- <location filename="config.h" line="413"/>
+ <location filename="config.h" line="437"/>
<source>의무 세척과정</source>
<translation>义务洗涤过程</translation>
</message>
<message>
- <location filename="config.h" line="414"/>
+ <location filename="config.h" line="438"/>
<source>적재 중 문열림 시간 모니터링</source>
<translation>监控装载中门打开的时间</translation>
</message>
<message>
- <location filename="config.h" line="415"/>
+ <location filename="config.h" line="439"/>
<source>조리 중 문열림 시간 모니터링</source>
<translation>监控烹饪中门打开的时间</translation>
</message>
<message>
- <location filename="config.h" line="416"/>
+ <location filename="config.h" line="440"/>
<source>제품유형/소프트웨어에 관한 정보</source>
<translation>产品类型/软件有关的信息</translation>
</message>
<message>
- <location filename="config.h" line="417"/>
+ <location filename="config.h" line="441"/>
<source>핫라인-쉐프</source>
<translation>热线-主厨</translation>
</message>
<message>
- <location filename="config.h" line="418"/>
+ <location filename="config.h" line="442"/>
<source>핫라인-서비스</source>
<translation>热线-主厨</translation>
</message>
<message>
- <location filename="config.h" line="419"/>
+ <location filename="config.h" line="443"/>
<source>증기 발생기 헹굼</source>
<translation>蒸汽发生器漂洗</translation>
</message>
<message>
- <location filename="config.h" line="420"/>
+ <location filename="config.h" line="444"/>
<source>시연모드</source>
<translation>试演模式</translation>
</message>
<message>
- <location filename="config.h" line="421"/>
+ <location filename="config.h" line="445"/>
<source>서비스단계(엔지니어모드)</source>
<translation>服务阶段（工程模式）</translation>
</message>
@@ -1058,114 +1138,102 @@
<translation>确认</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="13"/>
<source>전기식 10단</source>
- <translation type="unfinished">电动式 10段</translation>
+ <translation type="obsolete">电动式 10段</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="14"/>
<source>전기식 20단</source>
- <translation>电动式 20段</translation>
+ <translation type="vanished">电动式 20段</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="15"/>
<source>전기식 24단</source>
- <translation>电动式 24段</translation>
+ <translation type="vanished">电动式 24段</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="16"/>
<source>전기식 40단</source>
- <translation>电动式 40段</translation>
+ <translation type="vanished">电动式 40段</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="17"/>
<source>가스식 10단 LPG</source>
- <translation>燃气式 10段 LPG</translation>
+ <translation type="vanished">燃气式 10段 LPG</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="18"/>
<source>가스식 20단 LPG</source>
- <translation>燃气式 20段 LPG</translation>
+ <translation type="vanished">燃气式 20段 LPG</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="19"/>
<source>가스식 24단 LPG</source>
- <translation>燃气式 24段 LPG</translation>
+ <translation type="vanished">燃气式 24段 LPG</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="20"/>
<source>가스식 40단 LPG</source>
- <translation>燃气式 40段 LPG</translation>
+ <translation type="vanished">燃气式 40段 LPG</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="21"/>
<source>가스식 10단 LNG</source>
- <translation>燃气式 10段 LNG</translation>
+ <translation type="vanished">燃气式 10段 LNG</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="22"/>
<source>가스식 20단 LNG</source>
- <translation>燃气式 20段 LNG</translation>
+ <translation type="vanished">燃气式 20段 LNG</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="23"/>
<source>가스식 24단 LNG</source>
- <translation>燃气式 24段 LNG</translation>
+ <translation type="vanished">燃气式 24段 LNG</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="24"/>
<source>가스식 40단 LNG</source>
- <translation>燃气式 40段 LNG</translation>
+ <translation type="vanished">燃气式 40段 LNG</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="112"/>
+ <location filename="configinfodlg.cpp" line="89"/>
<source>모 델 명</source>
<translation>模型名称</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="113"/>
+ <location filename="configinfodlg.cpp" line="90"/>
<source>제조일자</source>
<translation type="unfinished">制造日期</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="114"/>
+ <location filename="configinfodlg.cpp" line="91"/>
<source>제조국</source>
<translation>制造国</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="115"/>
+ <location filename="configinfodlg.cpp" line="92"/>
<source>제조사</source>
<translation>制造商</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="116"/>
+ <location filename="configinfodlg.cpp" line="93"/>
<source>제품번호</source>
<translation>产品序列号</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="117"/>
+ <location filename="configinfodlg.cpp" line="94"/>
<source>소프트웨어 버전</source>
<translation>软件版本</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="118"/>
+ <location filename="configinfodlg.cpp" line="95"/>
<source>현재모델</source>
<translation>现在模式</translation>
</message>
<message>
+ <location filename="configinfodlg.cpp" line="117"/>
<location filename="configinfodlg.cpp" line="141"/>
- <location filename="configinfodlg.cpp" line="165"/>
<source>연 락 처</source>
<translation>联系方式</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="142"/>
+ <location filename="configinfodlg.cpp" line="118"/>
<source>이 름</source>
<translation>姓名</translation>
</message>
<message>
- <location filename="configinfodlg.cpp" line="143"/>
- <location filename="configinfodlg.cpp" line="166"/>
+ <location filename="configinfodlg.cpp" line="119"/>
+ <location filename="configinfodlg.cpp" line="142"/>
<source>위치정보</source>
<translation>位置信息</translation>
</message>
@@ -1529,8 +1597,8 @@
<translation>服务</translation>
</message>
<message>
- <location filename="configwindow.cpp" line="175"/>
- <location filename="configwindow.cpp" line="423"/>
+ <location filename="configwindow.cpp" line="176"/>
+ <location filename="configwindow.cpp" line="424"/>
<source>현재 설정을 적용하시겠습니까?</source>
<translation>是否应用当前设定？</translation>
</message>
@@ -1879,10 +1947,10 @@
<name>FileProcessDlg</name>
<message>
<location filename="fileprocessdlg.ui" line="100"/>
- <location filename="fileprocessdlg.cpp" line="335"/>
- <location filename="fileprocessdlg.cpp" line="351"/>
- <location filename="fileprocessdlg.cpp" line="367"/>
- <location filename="fileprocessdlg.cpp" line="633"/>
+ <location filename="fileprocessdlg.cpp" line="362"/>
+ <location filename="fileprocessdlg.cpp" line="378"/>
+ <location filename="fileprocessdlg.cpp" line="394"/>
+ <location filename="fileprocessdlg.cpp" line="735"/>
<source>남은 예상 시간 : 1초</source>
<translation>剩下的预计时间：1秒</translation>
</message>
@@ -1892,55 +1960,55 @@
<translation>取消</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="292"/>
+ <location filename="fileprocessdlg.cpp" line="319"/>
<source>erro%1,</source>
<translation>误差%1，</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="326"/>
- <location filename="fileprocessdlg.cpp" line="342"/>
- <location filename="fileprocessdlg.cpp" line="358"/>
+ <location filename="fileprocessdlg.cpp" line="353"/>
+ <location filename="fileprocessdlg.cpp" line="369"/>
+ <location filename="fileprocessdlg.cpp" line="385"/>
<source>Gas Error History
</source>
<translation type="unfinished">气误差记录
</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="327"/>
- <location filename="fileprocessdlg.cpp" line="343"/>
- <location filename="fileprocessdlg.cpp" line="359"/>
- <location filename="fileprocessdlg.cpp" line="375"/>
+ <location filename="fileprocessdlg.cpp" line="354"/>
+ <location filename="fileprocessdlg.cpp" line="370"/>
+ <location filename="fileprocessdlg.cpp" line="386"/>
+ <location filename="fileprocessdlg.cpp" line="402"/>
<source>no,</source>
<translation>否,</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="327"/>
- <location filename="fileprocessdlg.cpp" line="343"/>
- <location filename="fileprocessdlg.cpp" line="359"/>
- <location filename="fileprocessdlg.cpp" line="375"/>
+ <location filename="fileprocessdlg.cpp" line="354"/>
+ <location filename="fileprocessdlg.cpp" line="370"/>
+ <location filename="fileprocessdlg.cpp" line="386"/>
+ <location filename="fileprocessdlg.cpp" line="402"/>
<source>First Appearance,</source>
<translation>第一次出现，</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="327"/>
- <location filename="fileprocessdlg.cpp" line="343"/>
- <location filename="fileprocessdlg.cpp" line="359"/>
- <location filename="fileprocessdlg.cpp" line="375"/>
+ <location filename="fileprocessdlg.cpp" line="354"/>
+ <location filename="fileprocessdlg.cpp" line="370"/>
+ <location filename="fileprocessdlg.cpp" line="386"/>
+ <location filename="fileprocessdlg.cpp" line="402"/>
<source>Counter,</source>
<translation>计数器，</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="327"/>
- <location filename="fileprocessdlg.cpp" line="343"/>
- <location filename="fileprocessdlg.cpp" line="359"/>
- <location filename="fileprocessdlg.cpp" line="375"/>
+ <location filename="fileprocessdlg.cpp" line="354"/>
+ <location filename="fileprocessdlg.cpp" line="370"/>
+ <location filename="fileprocessdlg.cpp" line="386"/>
+ <location filename="fileprocessdlg.cpp" line="402"/>
<source>Last Appearance
</source>
<translation type="unfinished">最后出现
</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="374"/>
+ <location filename="fileprocessdlg.cpp" line="401"/>
<source>Service Error History
</source>
@@ -1949,193 +2017,203 @@
</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="451"/>
- <location filename="fileprocessdlg.cpp" line="529"/>
- <location filename="fileprocessdlg.cpp" line="646"/>
- <location filename="fileprocessdlg.cpp" line="702"/>
- <location filename="fileprocessdlg.cpp" line="718"/>
- <location filename="fileprocessdlg.cpp" line="767"/>
+ <location filename="fileprocessdlg.cpp" line="478"/>
+ <location filename="fileprocessdlg.cpp" line="556"/>
+ <location filename="fileprocessdlg.cpp" line="748"/>
+ <location filename="fileprocessdlg.cpp" line="804"/>
+ <location filename="fileprocessdlg.cpp" line="820"/>
+ <location filename="fileprocessdlg.cpp" line="869"/>
<source>남은 예상 시간 : 완료</source>
<translation>剩下的预计时间：完成</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="472"/>
+ <location filename="fileprocessdlg.cpp" line="499"/>
<source>,Steam Heating Time,</source>
<translation>，蒸汽加热时间，</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="474"/>
+ <location filename="fileprocessdlg.cpp" line="501"/>
<source>,Hot Air Heating Time,</source>
<translation>，热风加热时间，</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="479"/>
+ <location filename="fileprocessdlg.cpp" line="506"/>
<source>,Hot Air Mode,</source>
<translation>，热风模式，</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="482"/>
+ <location filename="fileprocessdlg.cpp" line="509"/>
<source>,Steam Mode,</source>
<translation>，蒸汽模式，</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="485"/>
+ <location filename="fileprocessdlg.cpp" line="512"/>
<source>,Combi Mode,</source>
<translation>，相结合的方式，</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="488"/>
+ <location filename="fileprocessdlg.cpp" line="515"/>
<source>,세제없이 헹굼,</source>
<translation>，无洗涤剂漂洗，</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="491"/>
+ <location filename="fileprocessdlg.cpp" line="518"/>
<source>,간이세척,</source>
<translation>，简易洗涤，</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="494"/>
+ <location filename="fileprocessdlg.cpp" line="521"/>
<source>,표준세척,</source>
<translation>，标准洗涤，</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="497"/>
+ <location filename="fileprocessdlg.cpp" line="524"/>
<source>,강세척</source>
<translation>，强洗涤</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="500"/>
+ <location filename="fileprocessdlg.cpp" line="527"/>
<source>,고속세척,</source>
<translation>，高速洗涤，</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="503"/>
+ <location filename="fileprocessdlg.cpp" line="530"/>
<source>,쿨다운,</source>
<translation>,变凉,</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="505"/>
+ <location filename="fileprocessdlg.cpp" line="532"/>
<source>,전체작동시간,</source>
<translation>,整个操作时间,</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="509"/>
+ <location filename="fileprocessdlg.cpp" line="536"/>
<source>,도어 Open,</source>
<translation>,门打开，</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="511"/>
+ <location filename="fileprocessdlg.cpp" line="538"/>
<source>,볼밸브 Open,</source>
<translation>,球阀打开，</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="513"/>
+ <location filename="fileprocessdlg.cpp" line="540"/>
<source>,S/G 급수 솔레노이드,</source>
<translation>,S/G 供水电磁阀，</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="515"/>
+ <location filename="fileprocessdlg.cpp" line="542"/>
<source>,퀀칭 솔레노이드,</source>
<translation>，供干热电磁阀，</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="517"/>
+ <location filename="fileprocessdlg.cpp" line="544"/>
<source>,고내살수 노즐 솔레노이드 ,</source>
<translation>,庫内撒水喷嘴电磁阀，</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="519"/>
+ <location filename="fileprocessdlg.cpp" line="546"/>
<source>,호스릴 솔레노이드,</source>
<translation>,软管盘电磁阀，</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="521"/>
+ <location filename="fileprocessdlg.cpp" line="548"/>
<source>,세제공급장치,</source>
<translation>,洗涤剂供应装置 ,</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="523"/>
+ <location filename="fileprocessdlg.cpp" line="550"/>
<source>,배습댐퍼,</source>
<translation>，排湿挡板，</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="525"/>
+ <location filename="fileprocessdlg.cpp" line="552"/>
<source>,소형펌프모터,</source>
<translation>，小型泵电机，</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="527"/>
+ <location filename="fileprocessdlg.cpp" line="554"/>
<source>,중형펌프모터,</source>
<translation>，中型泵电机，</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="557"/>
- <location filename="fileprocessdlg.cpp" line="614"/>
- <location filename="fileprocessdlg.cpp" line="655"/>
- <location filename="fileprocessdlg.cpp" line="711"/>
- <location filename="fileprocessdlg.cpp" line="777"/>
+ <location filename="fileprocessdlg.cpp" line="586"/>
+ <location filename="fileprocessdlg.cpp" line="716"/>
+ <location filename="fileprocessdlg.cpp" line="757"/>
+ <location filename="fileprocessdlg.cpp" line="813"/>
+ <location filename="fileprocessdlg.cpp" line="879"/>
<source>USB 인식을 실패하였습니다.</source>
<translation>USB识别失败了。</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="563"/>
+ <location filename="fileprocessdlg.cpp" line="649"/>
+ <source>CookBook Upload Success!.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="fileprocessdlg.cpp" line="653"/>
<source>완료</source>
<translation>完成</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="574"/>
+ <location filename="fileprocessdlg.cpp" line="661"/>
+ <source>에러 발생으로 종료합니다.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="fileprocessdlg.cpp" line="672"/>
<source>남은 예상 시간 : %1분 %2초</source>
<translation>剩下的预计时间：%1分%2秒</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="578"/>
+ <location filename="fileprocessdlg.cpp" line="676"/>
<source>남은 예상 시간 : %1초</source>
<translation>剩下的预计时间：%1秒</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="636"/>
+ <location filename="fileprocessdlg.cpp" line="738"/>
<source>설정 다운로드에 실패하였습니다.</source>
<translation>设定下载失败了。</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="650"/>
+ <location filename="fileprocessdlg.cpp" line="752"/>
<source>즐겨찾기 다운로드에 실패하였습니다.</source>
<translation>收藏夹下载失败了。</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="675"/>
- <location filename="fileprocessdlg.cpp" line="681"/>
- <location filename="fileprocessdlg.cpp" line="691"/>
+ <location filename="fileprocessdlg.cpp" line="777"/>
+ <location filename="fileprocessdlg.cpp" line="783"/>
+ <location filename="fileprocessdlg.cpp" line="793"/>
<source>설정 업로드에 실패하였습니다.</source>
<translation>设定上传失败了。</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="706"/>
+ <location filename="fileprocessdlg.cpp" line="808"/>
<source>즐겨찾기 업로드에 실패하였습니다.</source>
<translation>收藏夹上传失败了。</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="735"/>
+ <location filename="fileprocessdlg.cpp" line="837"/>
<source>남은 예상 시간 : 2초</source>
<translation>剩下的预计时间：2秒</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="738"/>
+ <location filename="fileprocessdlg.cpp" line="840"/>
<source>모델 정보 업로드에 실패하였습니다.</source>
<translation>上传模式失败。</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="751"/>
+ <location filename="fileprocessdlg.cpp" line="853"/>
<source>남은 예상 시간 : 1</source>
<translation>剩下的预计时间：1</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="755"/>
+ <location filename="fileprocessdlg.cpp" line="857"/>
<source>핫라인 쉐프 정보 업로드에 실패하였습니다.</source>
<translation>热线-主厨 设定上传失败了。</translation>
</message>
<message>
- <location filename="fileprocessdlg.cpp" line="772"/>
+ <location filename="fileprocessdlg.cpp" line="874"/>
<source>핫라인 서비스 정보 업로드에 실패하였습니다.</source>
<translation>热线-服务 设定上传失败了。</translation>
</message>
@@ -2474,25 +2552,25 @@
</message>
<message>
<location filename="historylistwindow.h" line="41"/>
- <source>상부점화장치</source>
+ <source>상부점화장치<byte value="x0"/></source>
<oldsource>상부점화장치</oldsource>
<translation type="unfinished">上部点火装置</translation>
</message>
<message>
<location filename="historylistwindow.h" line="42"/>
- <source>스팀점화장치</source>
+ <source>스팀점화장치<byte value="x0"/></source>
<oldsource>스팀점화장치</oldsource>
<translation type="unfinished">蒸汽点火装置</translation>
</message>
<message>
<location filename="historylistwindow.h" line="43"/>
- <source>하부점화장치</source>
+ <source>하부점화장치<byte value="x0"/></source>
<oldsource>하부점화장치</oldsource>
<translation type="unfinished">下部点火装置</translation>
</message>
<message>
<location filename="historylistwindow.h" line="44"/>
- <source>서비스에러기록종합</source>
+ <source>서비스에러기록종합<byte value="x0"/></source>
<oldsource>서비스에러기록종합</oldsource>
<translation type="unfinished">服务错误记录总结</translation>
</message>
@@ -2529,92 +2607,92 @@
</message>
<message>
<location filename="mainwindow.ui" line="179"/>
- <location filename="mainwindow.ui" line="208"/>
- <location filename="mainwindow.ui" line="234"/>
+ <location filename="mainwindow.ui" line="205"/>
+ <location filename="mainwindow.ui" line="231"/>
<source>function</source>
<translation>function</translation>
</message>
<message>
- <location filename="mainwindow.ui" line="205"/>
+ <location filename="mainwindow.ui" line="202"/>
<source>프로그래밍모드</source>
<translation>编程模式</translation>
</message>
<message>
- <location filename="mainwindow.ui" line="231"/>
+ <location filename="mainwindow.ui" line="228"/>
<source>세척모드</source>
<translation>洗涤模式</translation>
</message>
<message>
- <location filename="mainwindow.ui" line="329"/>
+ <location filename="mainwindow.ui" line="326"/>
<source>건열</source>
<translation>干热</translation>
</message>
<message>
- <location filename="mainwindow.ui" line="332"/>
- <location filename="mainwindow.ui" line="352"/>
- <location filename="mainwindow.ui" line="372"/>
+ <location filename="mainwindow.ui" line="329"/>
+ <location filename="mainwindow.ui" line="349"/>
+ <location filename="mainwindow.ui" line="369"/>
<source>mode</source>
<translation>mode</translation>
</message>
<message>
- <location filename="mainwindow.ui" line="349"/>
+ <location filename="mainwindow.ui" line="346"/>
<source>콤비</source>
<translation>组合</translation>
</message>
<message>
- <location filename="mainwindow.ui" line="369"/>
+ <location filename="mainwindow.ui" line="366"/>
<source>스팀</source>
<translation>蒸汽</translation>
</message>
<message>
- <location filename="mainwindow.ui" line="395"/>
+ <location filename="mainwindow.ui" line="392"/>
<source>육류</source>
<translation>肉类</translation>
</message>
<message>
- <location filename="mainwindow.ui" line="398"/>
- <location filename="mainwindow.ui" line="424"/>
- <location filename="mainwindow.ui" line="450"/>
- <location filename="mainwindow.ui" line="476"/>
- <location filename="mainwindow.ui" line="502"/>
- <location filename="mainwindow.ui" line="528"/>
- <location filename="mainwindow.ui" line="554"/>
- <location filename="mainwindow.ui" line="580"/>
+ <location filename="mainwindow.ui" line="395"/>
+ <location filename="mainwindow.ui" line="421"/>
+ <location filename="mainwindow.ui" line="447"/>
+ <location filename="mainwindow.ui" line="473"/>
+ <location filename="mainwindow.ui" line="499"/>
+ <location filename="mainwindow.ui" line="525"/>
+ <location filename="mainwindow.ui" line="551"/>
+ <location filename="mainwindow.ui" line="577"/>
<source>type</source>
<translation>type</translation>
</message>
<message>
- <location filename="mainwindow.ui" line="421"/>
+ <location filename="mainwindow.ui" line="418"/>
<source>디저트류</source>
<translation>甜点类</translation>
</message>
<message>
- <location filename="mainwindow.ui" line="447"/>
+ <location filename="mainwindow.ui" line="444"/>
<source>기타요리</source>
<translation>其他烹饪</translation>
</message>
<message>
- <location filename="mainwindow.ui" line="473"/>
+ <location filename="mainwindow.ui" line="470"/>
<source>채소및곡류</source>
<translation>蔬菜和谷物</translation>
</message>
<message>
- <location filename="mainwindow.ui" line="499"/>
+ <location filename="mainwindow.ui" line="496"/>
<source>가금류</source>
<translation>家禽类</translation>
</message>
<message>
- <location filename="mainwindow.ui" line="525"/>
+ <location filename="mainwindow.ui" line="522"/>
<source>생선류</source>
<translation>海鲜类</translation>
</message>
<message>
- <location filename="mainwindow.ui" line="551"/>
+ <location filename="mainwindow.ui" line="548"/>
<source>제과제빵류</source>
<translation>饼干面包类</translation>
</message>
<message>
- <location filename="mainwindow.ui" line="577"/>
+ <location filename="mainwindow.ui" line="574"/>
<source>부가기능</source>
<translation>附加功能</translation>
</message>
@@ -2623,7 +2701,7 @@
<translation type="vanished">V0.3.4</translation>
</message>
<message>
- <location filename="mainwindow.cpp" line="128"/>
+ <location filename="mainwindow.cpp" line="137"/>
<source>세척이 정상적으로 종료되지 않아
반드시 세척통을 자동 세척해야 합니다.
내부를 비워주세요</source>
@@ -2743,48 +2821,48 @@
<translation>tool</translation>
</message>
<message>
- <location filename="manualcookwindow.cpp" line="696"/>
- <location filename="manualcookwindow.cpp" line="706"/>
+ <location filename="manualcookwindow.cpp" line="702"/>
+ <location filename="manualcookwindow.cpp" line="712"/>
<source>문을 닫아주세요</source>
<translation>请把门关上</translation>
</message>
<message>
- <location filename="manualcookwindow.cpp" line="696"/>
+ <location filename="manualcookwindow.cpp" line="702"/>
<source>조리 중 문 열림 시간 모니터링 1단계</source>
<translation>烹饪中门打开的时间监测第一阶段</translation>
</message>
<message>
- <location filename="manualcookwindow.cpp" line="706"/>
+ <location filename="manualcookwindow.cpp" line="712"/>
<source>조리 중 문 열림 시간 모니터링 2단계</source>
<translation>烹饪中门打开的时间监测第二阶段</translation>
</message>
<message>
- <location filename="manualcookwindow.cpp" line="716"/>
+ <location filename="manualcookwindow.cpp" line="722"/>
<source>문이 오래 열려있어 조리가 취소되었습니다</source>
<translation>因为长时间开着门烹饪被取消了</translation>
</message>
<message>
- <location filename="manualcookwindow.cpp" line="716"/>
+ <location filename="manualcookwindow.cpp" line="722"/>
<source>조리 중 문 열림 시간 모니터링 3단계</source>
<translation>烹饪中门打开的时间监测第三阶段</translation>
</message>
<message>
- <location filename="manualcookwindow.cpp" line="1053"/>
+ <location filename="manualcookwindow.cpp" line="1059"/>
<source>즐겨찾기 항목에 추가하시겠습니까?</source>
<translation>添加到收藏夹项目吗？</translation>
</message>
<message>
- <location filename="manualcookwindow.cpp" line="1084"/>
+ <location filename="manualcookwindow.cpp" line="1090"/>
<source>요리가 중단되고 환경 설정 모드로 들어갑니다. 진행할까요?</source>
<translation>中断烹饪后进入设定环境模式。是否进行？</translation>
</message>
<message>
- <location filename="manualcookwindow.cpp" line="1107"/>
+ <location filename="manualcookwindow.cpp" line="1113"/>
<source>요리가 중단되고 즐겨찾기 모드로 들어갑니다. 진행할까요?</source>
<translation>中断烹饪后进入设定收藏夹模式。是否进行？</translation>
</message>
<message>
- <location filename="manualcookwindow.cpp" line="1131"/>
+ <location filename="manualcookwindow.cpp" line="1137"/>
<source>요리가 중단되고 자동 세척 모드로 들어갑니다. 진행할까요?</source>
<translation>中断烹饪后进入设定自动清洗模式。是否进行？</translation>
</message>
@@ -2818,6 +2896,225 @@
</message>
</context>
<context>
+ <name>MultiCookAutoWindow</name>
+ <message>
+ <location filename="multicookautowindow.cpp" line="140"/>
+ <source>다중 요리 목록에 추가하시겠습니까?</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>MultiCookManualWindow</name>
+ <message>
+ <location filename="multicookmanualwindow.ui" line="81"/>
+ <source>건열</source>
+ <translation type="unfinished">干热</translation>
+ </message>
+ <message>
+ <location filename="multicookmanualwindow.ui" line="170"/>
+ <source>0%</source>
+ <translation type="unfinished">0%</translation>
+ </message>
+ <message>
+ <location filename="multicookmanualwindow.ui" line="232"/>
+ <location filename="multicookmanualwindow.ui" line="378"/>
+ <source>감소</source>
+ <translation type="unfinished">减少</translation>
+ </message>
+ <message>
+ <location filename="multicookmanualwindow.ui" line="294"/>
+ <location filename="multicookmanualwindow.ui" line="709"/>
+ <source>증가</source>
+ <translation type="unfinished">增加</translation>
+ </message>
+ <message>
+ <location filename="multicookmanualwindow.ui" line="503"/>
+ <source>0<span style="font-size:11pt;">초</span></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="multicookmanualwindow.ui" line="527"/>
+ <source>콤비</source>
+ <translation type="unfinished">组合</translation>
+ </message>
+ <message>
+ <location filename="multicookmanualwindow.ui" line="580"/>
+ <source>스팀</source>
+ <translation type="unfinished">蒸汽</translation>
+ </message>
+ <message>
+ <location filename="multicookmanualwindow.ui" line="647"/>
+ <source>30<span style="font-size:11pt;">℃</span></source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>MultiCookSelectionWindow</name>
+ <message>
+ <location filename="multicookselectionwindow.ui" line="78"/>
+ <source>건열</source>
+ <translation type="unfinished">干热</translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.ui" line="121"/>
+ <source>채소및곡류</source>
+ <translation type="unfinished">蔬菜和谷物</translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.ui" line="164"/>
+ <source>제과제빵류</source>
+ <translation type="unfinished">饼干面包类</translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.ui" line="207"/>
+ <source>육류</source>
+ <translation type="unfinished">肉类</translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.ui" line="250"/>
+ <source>디저트류</source>
+ <translation type="unfinished">甜点类</translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.ui" line="280"/>
+ <source>가금류</source>
+ <translation type="unfinished">家禽类</translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.ui" line="304"/>
+ <source>콤비</source>
+ <translation type="unfinished">组合</translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.ui" line="337"/>
+ <source>다중요리</source>
+ <translation type="unfinished">多种烹饪</translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.ui" line="370"/>
+ <source>프로그래밍모드</source>
+ <translation type="unfinished">编程模式</translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.ui" line="413"/>
+ <source>기타요리</source>
+ <translation type="unfinished">其他烹饪</translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.ui" line="459"/>
+ <source>세척모드</source>
+ <translation type="unfinished">洗涤模式</translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.ui" line="489"/>
+ <source>부가기능</source>
+ <translation type="unfinished">附加功能</translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.ui" line="617"/>
+ <source>스팀</source>
+ <translation type="unfinished">蒸汽</translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.ui" line="647"/>
+ <source>생선류</source>
+ <translation type="unfinished">海鲜类</translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.ui" line="702"/>
+ <location filename="multicookselectionwindow.cpp" line="83"/>
+ <source>1. 다중 요리에서 사용할 요리 카테고리를 선택해주세요
+2. 스팀, 콤비, 건열 중에서 선택하시면 자동으로 다음 단계로 진행됩니다</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.cpp" line="103"/>
+ <source>스팀을</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.cpp" line="106"/>
+ <source>콤비를</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.cpp" line="109"/>
+ <source>건열을</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="multicookselectionwindow.cpp" line="113"/>
+ <source>1. %1 선택하였습니다
+2. 수동 메뉴 혹은 원하시는 자동 메뉴 상세 목록을 선택하세요</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>MultiCookWindow</name>
+ <message>
+ <location filename="multicookwindow.ui" line="14"/>
+ <source>MainWindow</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="multicookwindow.ui" line="113"/>
+ <source>문이 열려있습니다
+문을 닫으시면 다시 시작됩니다</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="multicookwindow.ui" line="170"/>
+ <source>문을 열어주세요</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="multicookwindow.ui" line="538"/>
+ <source>다중 요리 최근 요리 목록입니다</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="multicookwindow.ui" line="754"/>
+ <location filename="multicookwindow.ui" line="778"/>
+ <location filename="multicookwindow.ui" line="802"/>
+ <location filename="multicookwindow.ui" line="826"/>
+ <location filename="multicookwindow.ui" line="850"/>
+ <location filename="multicookwindow.ui" line="874"/>
+ <location filename="multicookwindow.ui" line="898"/>
+ <location filename="multicookwindow.ui" line="922"/>
+ <location filename="multicookwindow.ui" line="946"/>
+ <location filename="multicookwindow.ui" line="970"/>
+ <location filename="multicookwindow.ui" line="1034"/>
+ <source>slotLabel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="multicookwindow.ui" line="1027"/>
+ <source>1. 해당 조리 칸 버튼을 눌러 메뉴를 선택해주세요.
+2. 메뉴가 선택되면, 해당 작업 시간이 적용됩니다.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="multicookwindow.cpp" line="178"/>
+ <source>%1번 단 요리(%2)가 종료되었습니다</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="multicookwindow.cpp" line="405"/>
+ <location filename="multicookwindow.cpp" line="420"/>
+ <location filename="multicookwindow.cpp" line="435"/>
+ <source>요리를 취소하시겠습니까?</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>MultiManualCook</name>
+ <message>
+ <location filename="multimanualcook.cpp" line="39"/>
+ <source>수동 요리</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>NotiPopupDlg</name>
<message>
<location filename="notipopupdlg.ui" line="60"/>
@@ -3277,6 +3574,11 @@
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="ovenstatics.cpp" line="219"/>
+ <source>스팀 버너 컨트롤러 통신 이상</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="ovenstatics.cpp" line="220"/>
<source>스팀발생기 버너 컨트롤러 PCB 통신 불량이 발생하였습니다.
제품의 전원을 OFF한 후 다시 ON해 주십시오.
@@ -3284,6 +3586,11 @@
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="ovenstatics.cpp" line="225"/>
+ <source>하부 FAN 모터 컨트롤러 이상</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="ovenstatics.cpp" line="226"/>
<source>하부 Fan 모터 컨트롤러 이상 상황이 발생하였습니다.
제품의 전원을 OFF한 후 다시 ON해 주십시오.
@@ -3531,7 +3838,7 @@
<name>PreheatPopup</name>
<message>
<location filename="preheatpopup.ui" line="104"/>
- <location filename="preheatpopup.ui" line="549"/>
+ <location filename="preheatpopup.ui" line="552"/>
<source>10</source>
<translation>10</translation>
</message>
@@ -3541,17 +3848,17 @@
<translation>预热中</translation>
</message>
<message>
- <location filename="preheatpopup.ui" line="331"/>
+ <location filename="preheatpopup.ui" line="334"/>
<source>예열</source>
<translation>预热</translation>
</message>
<message>
- <location filename="preheatpopup.ui" line="491"/>
+ <location filename="preheatpopup.ui" line="494"/>
<source>00:00</source>
<translation type="unfinished">00:00</translation>
</message>
<message>
- <location filename="preheatpopup.ui" line="749"/>
+ <location filename="preheatpopup.ui" line="752"/>
<source>000/000</source>
<translation>000/000</translation>
</message>
@@ -3577,9 +3884,8 @@
<context>
<name>ProgrammedCookPanelButton</name>
<message>
- <location filename="programmedcookpanelbutton.ui" line="14"/>
<source>Form</source>
- <translation type="unfinished">Form</translation>
+ <translation type="obsolete">Form</translation>
</message>
</context>
<context>
@@ -3723,7 +4029,7 @@
<location filename="programmingselectionwindow.ui" line="417"/>
<location filename="programmingselectionwindow.ui" line="589"/>
<location filename="programmingselectionwindow.ui" line="643"/>
- <location filename="programmingselectionwindow.ui" line="739"/>
+ <location filename="programmingselectionwindow.ui" line="673"/>
<source>type</source>
<translation>type</translation>
</message>
@@ -3802,7 +4108,7 @@
<translation>附加功能</translation>
</message>
<message>
- <location filename="programmingselectionwindow.ui" line="736"/>
+ <location filename="programmingselectionwindow.ui" line="670"/>
<source>제과제빵류</source>
<translation>饼干面包类</translation>
</message>
@@ -3820,18 +4126,18 @@
<translation>手动烹饪</translation>
</message>
<message>
- <location filename="programmingwindow.cpp" line="110"/>
- <location filename="programmingwindow.cpp" line="122"/>
+ <location filename="programmingwindow.cpp" line="111"/>
+ <location filename="programmingwindow.cpp" line="123"/>
<source>추가하기</source>
<translation>添加</translation>
</message>
<message>
- <location filename="programmingwindow.cpp" line="308"/>
+ <location filename="programmingwindow.cpp" line="309"/>
<source>저장하지 않고 돌아가시겠습니까?</source>
<translation>不保存吗？</translation>
</message>
<message>
- <location filename="programmingwindow.cpp" line="318"/>
+ <location filename="programmingwindow.cpp" line="319"/>
<source>저장하시겠습니까?</source>
<translation>保存吗？</translation>
</message>
@@ -4254,17 +4560,6 @@
<translation>门传感器</translation>
</message>
<message>
- <location filename="realtimepartswindow.cpp" line="81"/>
- <location filename="realtimepartswindow.cpp" line="84"/>
- <location filename="realtimepartswindow.cpp" line="87"/>
- <location filename="realtimepartswindow.cpp" line="100"/>
- <location filename="realtimepartswindow.cpp" line="103"/>
- <location filename="realtimepartswindow.cpp" line="106"/>
- <location filename="realtimepartswindow.cpp" line="109"/>
- <source>ON</source>
- <translation>ON</translation>
- </message>
- <message>
<location filename="realtimepartswindow.cpp" line="82"/>
<location filename="realtimepartswindow.cpp" line="85"/>
<location filename="realtimepartswindow.cpp" line="88"/>
@@ -4272,21 +4567,32 @@
<location filename="realtimepartswindow.cpp" line="104"/>
<location filename="realtimepartswindow.cpp" line="107"/>
<location filename="realtimepartswindow.cpp" line="110"/>
+ <source>ON</source>
+ <translation>ON</translation>
+ </message>
+ <message>
+ <location filename="realtimepartswindow.cpp" line="83"/>
+ <location filename="realtimepartswindow.cpp" line="86"/>
+ <location filename="realtimepartswindow.cpp" line="89"/>
+ <location filename="realtimepartswindow.cpp" line="102"/>
+ <location filename="realtimepartswindow.cpp" line="105"/>
+ <location filename="realtimepartswindow.cpp" line="108"/>
+ <location filename="realtimepartswindow.cpp" line="111"/>
<source>OFF</source>
<translation>OFF</translation>
</message>
<message>
- <location filename="realtimepartswindow.cpp" line="93"/>
+ <location filename="realtimepartswindow.cpp" line="94"/>
<source>HIGH</source>
<translation>HIGH</translation>
</message>
<message>
- <location filename="realtimepartswindow.cpp" line="96"/>
+ <location filename="realtimepartswindow.cpp" line="97"/>
<source>LOW</source>
<translation>LOW</translation>
</message>
<message>
- <location filename="realtimepartswindow.cpp" line="98"/>
+ <location filename="realtimepartswindow.cpp" line="99"/>
<source>NORMAL</source>
<translation>NORMAL</translation>
</message>
@@ -4404,6 +4710,11 @@
<translation type="unfinished">月</translation>
</message>
<message>
+ <location filename="reservetimepopup.ui" line="167"/>
+ <source>분 후</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>분</source>
<translation type="vanished">分</translation>
</message>
@@ -4488,6 +4799,24 @@
</message>
</context>
<context>
+ <name>TouchTestWindow</name>
+ <message>
+ <location filename="touchtestwindow.ui" line="14"/>
+ <source>MainWindow</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="touchtestwindow.ui" line="31"/>
+ <source>X</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="touchtestwindow.ui" line="48"/>
+ <source>C</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>UsbCheckPopupDlg</name>
<message>
<location filename="usbcheckpopupdlg.ui" line="61"/>
@@ -4607,7 +4936,7 @@ USB를 삽입해 주세요!</source>
<name>WashWindow</name>
<message>
<location filename="washwindow.ui" line="200"/>
- <location filename="washwindow.cpp" line="354"/>
+ <location filename="washwindow.cpp" line="356"/>
<source>기기의 내부를 세척 중입니다</source>
<translation>进行设备的内部清洗</translation>
</message>
@@ -4683,80 +5012,80 @@ USB를 삽입해 주세요!</source>
<translation>干净</translation>
</message>
<message>
- <location filename="washwindow.cpp" line="80"/>
+ <location filename="washwindow.cpp" line="82"/>
<source>제품 스팀통을 세척 중입니다</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="washwindow.cpp" line="81"/>
+ <location filename="washwindow.cpp" line="83"/>
<source>완료될 때까지 문을 열지 마세요
제품의 스팀통 자동 세척 기능을 실행 중입니다</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="washwindow.cpp" line="214"/>
+ <location filename="washwindow.cpp" line="216"/>
<source>내부 헹굼 진행 중입니다.</source>
<translation>内部进行漂洗。</translation>
</message>
<message>
- <location filename="washwindow.cpp" line="217"/>
+ <location filename="washwindow.cpp" line="219"/>
<source>스팀 급수 진행 중입니다.</source>
<translation>蒸汽供水处理中。</translation>
</message>
<message>
- <location filename="washwindow.cpp" line="220"/>
+ <location filename="washwindow.cpp" line="222"/>
<source>내부 팬 세척 진행 중입니다.</source>
<translation>内部风扇进行洗涤。</translation>
</message>
<message>
- <location filename="washwindow.cpp" line="223"/>
+ <location filename="washwindow.cpp" line="225"/>
<source>내부 스팀 불림 진행 중입니다.</source>
<translation>内部蒸汽进行冲泡。</translation>
</message>
<message>
- <location filename="washwindow.cpp" line="226"/>
+ <location filename="washwindow.cpp" line="228"/>
<source>내부 강 세척 진행 중입니다.</source>
<translation>内部进行强洗涤。</translation>
</message>
<message>
- <location filename="washwindow.cpp" line="229"/>
+ <location filename="washwindow.cpp" line="231"/>
<source>내부 상부 세척 진행 중입니다.</source>
<translation>内部上部进行洗涤。</translation>
</message>
<message>
- <location filename="washwindow.cpp" line="232"/>
+ <location filename="washwindow.cpp" line="234"/>
<source>내부 스팀 세척 진행 중입니다.</source>
<translation>内部进行蒸汽洗涤。</translation>
</message>
<message>
- <location filename="washwindow.cpp" line="235"/>
+ <location filename="washwindow.cpp" line="237"/>
<source>세척 종료 진행 중입니다.</source>
<translation>洗涤结束进行中。</translation>
</message>
<message>
- <location filename="washwindow.cpp" line="238"/>
+ <location filename="washwindow.cpp" line="240"/>
<source>세제 세척수 만들기 진행 중입니다.</source>
<translation>做洗涤剂洗涤水进行中。</translation>
</message>
<message>
- <location filename="washwindow.cpp" line="241"/>
+ <location filename="washwindow.cpp" line="243"/>
<source>세제 세척수 헹굼 진행 중입니다.</source>
<translation>洗涤剂洗涤水进行漂洗。</translation>
</message>
<message>
- <location filename="washwindow.cpp" line="244"/>
+ <location filename="washwindow.cpp" line="246"/>
<source>하부 탱크 세척수 만들기 진행 중입니다.</source>
<translation>做下部槽洗涤水进行中。</translation>
</message>
<message>
- <location filename="washwindow.cpp" line="355"/>
+ <location filename="washwindow.cpp" line="357"/>
<source>완료될 때까지 문을 열지 마세요.
제품 내부의 자동 세척 기능을 실행 중입니다.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="washwindow.cpp" line="409"/>
- <location filename="washwindow.cpp" line="455"/>
+ <location filename="washwindow.cpp" line="413"/>
+ <location filename="washwindow.cpp" line="463"/>
<source>세척이 종료되었습니다</source>
<translation>洗涤结束了</translation>
</message>
--
2.1.4