diff --git a/app/scanner2/mainwindow.cpp b/app/scanner2/mainwindow.cpp index f5abef37..33a9b89c 100644 --- a/app/scanner2/mainwindow.cpp +++ b/app/scanner2/mainwindow.cpp @@ -208,7 +208,9 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent) m_act_English->setCheckable(true); ui->menu_info->addMenu(m_menu_language); m_menu_language->addAction(m_act_simpCN); +#if defined (OEM_ZHONGJING) m_menu_language->addAction(m_act_tradCN); +#endif m_menu_language->addAction(m_act_English); if (m_currLang == "english") @@ -3276,6 +3278,8 @@ void MainWindow::on_act_help_triggered() filename = QApplication::applicationDirPath() + "/UniScan_App_Help_manual.pdf"; #elif defined(OEM_NEUTRAL) filename = QApplication::applicationDirPath() + "/NeuScan_App_Help_manual.pdf"; + if (m_currLang == "english") + filename = QApplication::applicationDirPath() + "/NeuScan_App_Help_manual_EN.pdf"; #elif defined(OEM_DELI) filename = QApplication::applicationDirPath() + "/DeliScan_App_Help_manual.pdf"; #else @@ -3301,6 +3305,8 @@ void MainWindow::on_act_help_triggered() filename = QApplication::applicationDirPath() + "/../../entries/help/UniScan_App_Help_manual.pdf"; #elif defined(OEM_NEUTRAL) filename = QApplication::applicationDirPath() + "/../../entries/help/NeuScan_App_Help_manual.pdf"; + if (m_currLang == "english") + filename = QApplication::applicationDirPath() + "/../../entries/help/NeuScan_App_Help_manual_EN.pdf"; #elif defined(OEM_DELI) filename = QApplication::applicationDirPath() + "/../../entries/help/DeliScan_App_Help_manual.pdf"; #else @@ -3325,6 +3331,8 @@ void MainWindow::on_act_help_triggered() filename = QApplication::applicationDirPath() + "/../doc/UniScan_App_Help_manual.pdf"; #elif defined(OEM_NEUTRAL) filename = QApplication::applicationDirPath() + "/../doc/NeuScan_App_Help_manual.pdf"; + if (m_currLang == "english") + filename = QApplication::applicationDirPath() + "/../doc/NeuScan_App_Help_manual_EN.pdf"; #elif defined(OEM_DELI) filename = QApplication::applicationDirPath() + "/../doc/DeliScan_App_Help_manual.pdf"; #else diff --git a/doc/scanner/NeuScan_App_Help_manual.pdf b/doc/scanner/NeuScan_App_Help_manual.pdf index 4c85a7f7..4b58cb30 100644 Binary files a/doc/scanner/NeuScan_App_Help_manual.pdf and b/doc/scanner/NeuScan_App_Help_manual.pdf differ diff --git a/doc/scanner/NeuScan_App_Help_manual_EN.pdf b/doc/scanner/NeuScan_App_Help_manual_EN.pdf index f2464180..93831588 100644 Binary files a/doc/scanner/NeuScan_App_Help_manual_EN.pdf and b/doc/scanner/NeuScan_App_Help_manual_EN.pdf differ diff --git a/doc/scanner/NeuScan_scanSettings_Help_manual.pdf b/doc/scanner/NeuScan_scanSettings_Help_manual.pdf index d16221c3..672c7f47 100644 Binary files a/doc/scanner/NeuScan_scanSettings_Help_manual.pdf and b/doc/scanner/NeuScan_scanSettings_Help_manual.pdf differ diff --git a/doc/scanner/NeuScan_scanSettings_Help_manual_EN.pdf b/doc/scanner/NeuScan_scanSettings_Help_manual_EN.pdf index 394bf68f..38d869b2 100644 Binary files a/doc/scanner/NeuScan_scanSettings_Help_manual_EN.pdf and b/doc/scanner/NeuScan_scanSettings_Help_manual_EN.pdf differ