From d7cc4cd18190fed0abf28d45059a59fa25b26a25 Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Wed, 13 Mar 2024 14:20:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=AD=E6=99=B6=E5=85=B3?= =?UTF-8?q?=E4=BA=8E=E7=95=8C=E9=9D=A2=E4=B8=8E=E7=B9=81=E4=BD=93=E7=BF=BB?= =?UTF-8?q?=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scanner2/Scanner_zh_TW.qm | Bin 38747 -> 38719 bytes app/scanner2/Scanner_zh_TW.ts | 14 +++++++------- app/scanner2/mainwindow.cpp | 12 ++++++++++-- modules/twainui/TwainUI_zh_TW.qm | Bin 7804 -> 7804 bytes modules/twainui/TwainUI_zh_TW.ts | 4 ++-- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/app/scanner2/Scanner_zh_TW.qm b/app/scanner2/Scanner_zh_TW.qm index 6f93d1f91c5f81a7950b775978b6a496075b7b74..1118b3b361befb2dd035c43b9c18391f86a8879a 100644 GIT binary patch delta 2229 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 WXwSWMR@ymU9UC2av(>b~)B8U?mYnne 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 7261e158143e000a964a12826bca85cb7708e3e9..70aa160f9c4766252aaa039c01483b674f820b49 100644 GIT binary patch delta 23 fcmexk^T%exZ2_k2^38Vz9F30x{Ct 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>