Merge branch 'master' of http://192.168.10.5:8099/sane/code_app

app/scanner/mainwindow.cpp

@@ -1666,6 +1666,7 @@ askIfClear MainWindow::startScanMessageBox(QWidget *parent)
     QPushButton* clearBtn = box.addButton(tr("Clear, then start scan"), QMessageBox::ActionRole);
     box.addButton(tr("Do NOT clear, then start scan"), QMessageBox::ActionRole);
     QPushButton* cancelBtn = box.addButton(QMessageBox::Cancel);
+    cancelBtn->setText(tr("cancel"));
     box.setWindowTitle(tr("Question"));
     box.setText(tr("Already exist images in image list.\nDo you want to clear?"));
     box.exec();

app/scanner/qt_zh_CN.ts

@@ -2142,6 +2142,10 @@ Are you sure to close?</source>
         <source>Out of memory</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Phonon::</name>