diff --git a/app/scanner2/Scanner_zh_CN.qm b/app/scanner2/Scanner_zh_CN.qm index 1f0c33a6..f5028050 100644 Binary files a/app/scanner2/Scanner_zh_CN.qm and b/app/scanner2/Scanner_zh_CN.qm differ diff --git a/app/scanner2/Scanner_zh_CN.ts b/app/scanner2/Scanner_zh_CN.ts index bc0d3d49..c0bea4a9 100644 --- a/app/scanner2/Scanner_zh_CN.ts +++ b/app/scanner2/Scanner_zh_CN.ts @@ -2788,7 +2788,9 @@ Please finish scanning first. - <p>Company website: <a href=%1>%1</p> + + <p>Company website: <a href="%1">%1</a></p> + <p>Company website: <a href=%1>%1</p> <p>公司网址: <a href="%1">%1</p> @@ -2805,12 +2807,6 @@ Please finish scanning first. <p>Company telephone: %1</p> <p>公司电话: %1</p> - - - <p>Company website: <a href="%1">%1</a></p> - <p>Company GPS: <a href=%1>%2</p> - <p>公司网址: <a href="%1">%1</a></p> - Baidu map access diff --git a/app/scanner2/Scanner_zh_EN.qm b/app/scanner2/Scanner_zh_EN.qm index 5c81663c..f56a279b 100644 Binary files a/app/scanner2/Scanner_zh_EN.qm and b/app/scanner2/Scanner_zh_EN.qm differ diff --git a/app/scanner2/Scanner_zh_EN.ts b/app/scanner2/Scanner_zh_EN.ts index 428cca0f..5a969ec8 100644 --- a/app/scanner2/Scanner_zh_EN.ts +++ b/app/scanner2/Scanner_zh_EN.ts @@ -2806,7 +2806,9 @@ Please contact the equipment supplier promptly to purchase a replacement paper r - <p>Company website: <a href=%1>%1</p> + + <p>Company website: <a href="%1">%1</a></p> + <p>Company website: <a href=%1>%1</p> <p>Website: <a href="%1">%1</p> @@ -2827,12 +2829,6 @@ Please contact the equipment supplier promptly to purchase a replacement paper r <p>Company telephone: %1</p> <p>Phone Number: %1</p> - - - <p>Company website: <a href="%1">%1</a></p> - <p>Company GPS: <a href=%1>%2</p> - <p>Website: <a href="%1">%2</a></p> - Baidu map access @@ -3139,7 +3135,7 @@ Please go to “Scan to” and change the accessible scan folder and then perfor Widget zuobiaozhou - Coordinate axis + Coordinate axis diff --git a/app/scanner2/mainwindow.cpp b/app/scanner2/mainwindow.cpp index 03e62a40..30d4d3a3 100644 --- a/app/scanner2/mainwindow.cpp +++ b/app/scanner2/mainwindow.cpp @@ -3221,7 +3221,7 @@ void MainWindow::on_act_about_triggered() content += tr("

Vendor: %1

").arg(QString::fromLocal8Bit(COMPANY_NAME)); content += tr("

Company address: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_ADDRESS)); content += tr("

Company telephone: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_TEL)); - content += tr("

Company website: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_URL)); + content += tr("

Company website: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_URL)); content += tr("

Copyright: %1

").arg(QString::fromLocal8Bit(BRAND_COPYRIGHT)); } else if(appLang == "english") @@ -3229,7 +3229,7 @@ void MainWindow::on_act_about_triggered() content += tr("

Vendor: %1

").arg(QString::fromLocal8Bit(COMPANY_NAME_EN)); content += tr("

Company address: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_ADDRESS_EN)); content += tr("

Company telephone: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_TEL_EN)); - content += tr("

Company website: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_URL)); + content += tr("

Company website: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_URL)); content += tr("

Copyright: %1

").arg(QString::fromLocal8Bit(BRAND_COPYRIGHT_EN)); } #else