Merge branch 'master' of http://192.168.10.5:8099/sane/code_app
This commit is contained in:
commit
0b750b1a79
Binary file not shown.
File diff suppressed because it is too large
Load Diff
|
@ -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();
|
||||
|
|
|
@ -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>
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue