diff --git a/app/scanner2/Scanner_zh_TW.qm b/app/scanner2/Scanner_zh_TW.qm index 6f93d1f9..1118b3b3 100644 Binary files a/app/scanner2/Scanner_zh_TW.qm and b/app/scanner2/Scanner_zh_TW.qm differ diff --git a/app/scanner2/Scanner_zh_TW.ts b/app/scanner2/Scanner_zh_TW.ts index 349b0462..2c60fbd2 100644 --- a/app/scanner2/Scanner_zh_TW.ts +++ b/app/scanner2/Scanner_zh_TW.ts @@ -2786,7 +2786,7 @@ Please finish scanning first. <p>Company GPS: <a href="%1">%2</a></p> - <p>公司地圖定位: <a href="%1">%2</a></p> + <p>位置: <a href="%1">%2</a></p> @@ -2813,7 +2813,7 @@ Please finish scanning first. <p>DriverVer: %1</p> - <p>版本號碼: %1</p> + <p>版本: %1</p> @@ -2827,7 +2827,7 @@ Please finish scanning first. <p>Copyright: %1</p> - <p>版權信息: %1</p> + <p>版權: %1</p> @@ -2835,26 +2835,26 @@ Please finish scanning first. <p>Company website: <a href="%1">%1</a></p> <p>Company website: <a href=%1>%1</p> - <p>公司網址: <a href="%1">%1</p> + <p>網址: <a href="%1">%1</p> <p>Company address: %1</p> - <p>公司地址: %1</p> + <p>地址: %1</p> <p>Company telephone: %1</p> - <p>公司電話: %1</p> + <p>電話: %1</p> Baidu map access - 百度地圖存取 + 百度地圖連結 Open device failed diff --git a/app/scanner2/mainwindow.cpp b/app/scanner2/mainwindow.cpp index 9ea49107..f5abef37 100644 --- a/app/scanner2/mainwindow.cpp +++ b/app/scanner2/mainwindow.cpp @@ -3487,7 +3487,6 @@ void MainWindow::on_act_about_triggered() content += tr("

Company address: %1

").arg(QString::fromStdWString(BRAND_COMPANY_ADDRESS_TRADCN)); content += tr("

Company telephone: %1

").arg(QString::fromStdWString(BRAND_COMPANY_TEL_TRADCN)); content += tr("

Company website: %1

").arg(QString::fromStdWString(BRAND_COMPANY_URL_EN)); - content += tr("

Copyright: %1

").arg(QString::fromStdWString(BRAND_COPYRIGHT_TRADCN)); } #else content += tr("

Vendor: %1

").arg(QString::fromStdWString(COMPANY_NAME)); @@ -3505,10 +3504,19 @@ void MainWindow::on_act_about_triggered() #endif #if defined (OEM_ZHONGJING) - if (appLang == "chinese-trad" || appLang == "english") + if (appLang == "english") + { content += tr("

Company GPS: %2

").arg(QString::fromStdWString(BRAND_URL_GPS_TRADCN)).arg(tr("Baidu map access")); + } + else if (appLang == "chinese-trad") + { + content += tr("

Company GPS: %2

").arg(QString::fromStdWString(BRAND_URL_GPS_TRADCN)).arg(tr("Baidu map access")); + content += tr("

Copyright: %1

").arg(QString::fromStdWString(BRAND_COPYRIGHT_TRADCN)); + } else + { content += tr("

Company GPS: %2

").arg(QString::fromStdWString(BRAND_URL_GPS)).arg(tr("Baidu map access")); + } #else content += tr("

Company GPS: %2

").arg(QString::fromStdWString(BRAND_URL_GPS)).arg(tr("Baidu map access")); #endif diff --git a/modules/twainui/TwainUI_zh_TW.qm b/modules/twainui/TwainUI_zh_TW.qm index 7261e158..70aa160f 100644 Binary files a/modules/twainui/TwainUI_zh_TW.qm and b/modules/twainui/TwainUI_zh_TW.qm differ diff --git a/modules/twainui/TwainUI_zh_TW.ts b/modules/twainui/TwainUI_zh_TW.ts index 77ad18d7..6b7bb30c 100644 --- a/modules/twainui/TwainUI_zh_TW.ts +++ b/modules/twainui/TwainUI_zh_TW.ts @@ -2885,7 +2885,7 @@ Are you sure to close? The current parameter settings are inconsistent with the configuration scheme '%1'. To use the configuration scheme '%1' parameters, please click the restore button - 當前參數設置與設定方案 “%1” 不壹致,如需使用設定方案 “%1” 參數,請點擊恢複按鈕 + 當前參數設置與設定方案 “%1” 不一致,如需使用設定方案 “%1” 參數,請點擊恢複按鈕
@@ -2999,7 +2999,7 @@ Are you sure to close? <p>History count: %1</p> - <p>設備曆史掃描張數: %1</p> + <p>設備歷史掃描張數: %1</p>