diff -Nru kylin-aiassistant-2.0.0/debian/changelog kylin-aiassistant-2.0.0/debian/changelog --- kylin-aiassistant-2.0.0/debian/changelog 2025-03-12 14:50:57.000000000 +0800 +++ kylin-aiassistant-2.0.0/debian/changelog 2025-03-14 15:40:42.000000000 +0800 @@ -1,3 +1,12 @@ +kylin-aiassistant (2.0.0-ok4.12) nile; urgency=medium + + * BUG: #IBSHIV 【英文】【AI助手】设置页面翻译不准确 + * 需求号: 无 + * 其他改动说明: 无 + * 其他改动影响域: 无 + + -- chairui <chairui@kylinos.cn> Fri, 14 Mar 2025 15:40:42 +0800 + kylin-aiassistant (2.0.0-ok4.11) nile; urgency=medium * BUG: 无 diff -Nru kylin-aiassistant-2.0.0/debian/patches/0122-IBSHIV-AI.patch kylin-aiassistant-2.0.0/debian/patches/0122-IBSHIV-AI.patch --- kylin-aiassistant-2.0.0/debian/patches/0122-IBSHIV-AI.patch 1970-01-01 08:00:00.000000000 +0800 +++ kylin-aiassistant-2.0.0/debian/patches/0122-IBSHIV-AI.patch 2025-03-14 15:40:42.000000000 +0800 @@ -0,0 +1,384 @@ +From: =?utf-8?b?5p+06ZSQ?= <chairui@kylinos.cn> +Date: Fri, 14 Mar 2025 15:37:59 +0800 +Subject: =?utf-8?b?I0lCU0hJViDjgJDoi7HmlofjgJHjgJBBSeWKqeaJi+OAkeiuvue9rg==?= + =?utf-8?b?6aG16Z2i57+76K+R5LiN5YeG56Gu?= + +--- + msgpane.cpp | 20 +++++------ + setting/kamodelitem.cpp | 14 ++++---- + setting/kamultimodelsettingpage.cpp | 18 +++++----- + translations/Internationalization_zh_CN.ts | 54 +++++++++++++++--------------- + 4 files changed, 53 insertions(+), 53 deletions(-) + +diff --git a/msgpane.cpp b/msgpane.cpp +index f03fb4c..ce9dc56 100755 +--- a/msgpane.cpp ++++ b/msgpane.cpp +@@ -869,11 +869,11 @@ void CMsgPane::saveMeetingToFile() + if(model == "baidu") + tmpStr = tr("BAIDU-ERNIE 4.0"); + else if(model == "xunfei") +- tmpStr = tr("XUNFEI-Spark3.5 Max"); ++ tmpStr = tr("iFLYTEK-Spark3.5 Max"); + else if(model == "xunfei_4") +- tmpStr = tr("XUNFEI-Spark4.0 Ultra"); ++ tmpStr = tr("iFLYTEK-Spark4.0 Ultra"); + else if(model == "default") +- tmpStr = tr("XUNFEI-Spark4.0 Ultra (Free Trial Version)"); ++ tmpStr = tr("iFLYTEK-Spark4.0 Ultra (Free Trial Version)"); + else + tmpStr = tr("Tong yi Qian Wen"); + m_summary.replace("\\n", "\n"); +@@ -1671,13 +1671,13 @@ QString CMsgPane::getSdkModelMsg(Capability capability) + switch(capability) + { + case CAPABILITY_VISION: +- tmpStr = tr("Generated by XUNFEI-Image Generation"); ++ tmpStr = tr("Generated by iFLYTEK-Image Generation"); + break; + case CAPABILITY_NLP: +- tmpStr = tr("Generated by XUNFEI-Spark3.5 Max"); ++ tmpStr = tr("Generated by iFLYTEK-Spark3.5 Max"); + break; + case CAPABILITY_SPEECH: +- tmpStr = tr("Generated by XUNFEI-Voice Big Model"); ++ tmpStr = tr("Generated by iFLYTEK-Voice Big Model"); + break; + default: + break; +@@ -1688,13 +1688,13 @@ QString CMsgPane::getSdkModelMsg(Capability capability) + switch(capability) + { + case CAPABILITY_VISION: +- tmpStr = tr("Generated by XUNFEI-Image Generation (Free Trial Version)"); ++ tmpStr = tr("Generated by iFLYTEK-Image Generation (Free Trial Version)"); + break; + case CAPABILITY_NLP: +- tmpStr = tr("Generated by XUNFEI-Spark4.0 Ultra (Free Trial Version)"); ++ tmpStr = tr("Generated by iFLYTEK-Spark4.0 Ultra (Free Trial Version)"); + break; + case CAPABILITY_SPEECH: +- tmpStr = tr("Generated by XUNFEI-Voice Big Model (Free Trial Version)"); ++ tmpStr = tr("Generated by iFLYTEK-Voice Big Model (Free Trial Version)"); + break; + default: + break; +@@ -1720,7 +1720,7 @@ QString CMsgPane::getSdkModelMsg(Capability capability) + } + else if(QString(model) == "xunfei_4") + { +- tmpStr = tr("Generated by XUNFEI-Spark4.0 Ultra"); ++ tmpStr = tr("Generated by iFLYTEK-Spark4.0 Ultra"); + } + return tmpStr; + } +diff --git a/setting/kamodelitem.cpp b/setting/kamodelitem.cpp +index de82f8a..51c2e52 100644 +--- a/setting/kamodelitem.cpp ++++ b/setting/kamodelitem.cpp +@@ -45,13 +45,13 @@ void KAModelItem::initLayout() + model_name = tr("BAIDU-ERNIE 4.0"); // 百度-ERNIE 4.0 + break; + case XUNFEI_TYPE: +- model_name = tr("XUNFEI-Spark3.5 Max"); // XUNFEI_TYPE讯飞-星火大模型 V3.5 ++ model_name = tr("iFLYTEK-Spark3.5 Max"); // XUNFEI_TYPE讯飞-星火大模型 V3.5 + break; + case XUNFEI_TYPE_4: +- model_name = tr("XUNFEI-Spark4.0 Ultra"); // XUNFEI_TYPE_4讯飞-星火大模型 V4.0 ++ model_name = tr("iFLYTEK-Spark4.0 Ultra"); // XUNFEI_TYPE_4讯飞-星火大模型 V4.0 + break; + case DEFAULT_TYPE: +- model_name = tr("XUNFEI-Spark4.0 Ultra (Free Trial Version)"); // 讯飞-星火大模型 V4.0(免费试用版) ++ model_name = tr("iFLYTEK-Spark4.0 Ultra (Free Trial Version)"); // 讯飞-星火大模型 V4.0(免费试用版) + break; + default: + model_name = tr("No Vendor"); +@@ -63,10 +63,10 @@ void KAModelItem::initLayout() + model_name = tr("BAIDU-AI Painting-Advanced Edition"); // 百度-AI作画-高级版 + break; + case XUNFEI_TYPE: +- model_name = tr("XUNFEI-Image Generation"); // 讯飞-图片生成 ++ model_name = tr("iFLYTEK-Image Generation"); // 讯飞-图片生成 + break; + case DEFAULT_TYPE: +- model_name = tr("XUNFEI-Image Generation (Free Trial Version)"); // 讯飞-图片生成(免费试用版) ++ model_name = tr("iFLYTEK-Image Generation (Free Trial Version)"); // 讯飞-图片生成(免费试用版) + break; + default: + model_name = tr("No Vendor"); +@@ -78,10 +78,10 @@ void KAModelItem::initLayout() + model_name = tr("BAIDU-Voice Big Model"); // 百度-语音大模型 + break; + case XUNFEI_TYPE: +- model_name = tr("XUNFEI-Voice Big Model"); // 讯飞-语音大模型 ++ model_name = tr("iFLYTEK-Voice Big Model"); // 讯飞-语音大模型 + break; + case DEFAULT_TYPE: +- model_name = tr("XUNFEI-Voice Big Model (Free Trial Version)"); // 讯飞-语音大模型(免费试用版) ++ model_name = tr("iFLYTEK-Voice Big Model (Free Trial Version)"); // 讯飞-语音大模型(免费试用版) + break; + default: + model_name = tr("No Vendor"); +diff --git a/setting/kamultimodelsettingpage.cpp b/setting/kamultimodelsettingpage.cpp +index 13ba752..f6c2722 100644 +--- a/setting/kamultimodelsettingpage.cpp ++++ b/setting/kamultimodelsettingpage.cpp +@@ -1961,7 +1961,7 @@ void KAConfigModelSettingDialog::initLayout() + errorInfoLayout->addStretch(); + + +- d_ptr->btnHelpLink = new kdk::KBorderlessButton(tr("No account? Get Now")); ++ d_ptr->btnHelpLink = new kdk::KBorderlessButton(tr("No account? Register now!")); + + d_ptr->buttonCancel = new QPushButton(tr("Cancel")); + d_ptr->buttonCancel->setFixedHeight(36); +@@ -2136,11 +2136,11 @@ QString KAConfigModelSettingDialog::modelVendorToString(const ModelTypeId modelT + case BAIDU_TYPE: + return tr("BAIDU-ERNIE 4.0"); // 百度-ERNIE 4.0 + case XUNFEI_TYPE: +- return tr("XUNFEI-Spark3.5 Max"); // 讯飞-星火大模型 V3.5 ++ return tr("iFLYTEK-Spark3.5 Max"); // 讯飞-星火大模型 V3.5 + case DEFAULT_TYPE: +- return tr("XUNFEI-Spark4.0 Ultra (Free Trial Version)"); // 讯飞-星火大模型 V4.0(免费试用版) ++ return tr("iFLYTEK-Spark4.0 Ultra (Free Trial Version)"); // 讯飞-星火大模型 V4.0(免费试用版) + case XUNFEI_TYPE_4: +- return tr("XUNFEI-Spark4.0 Ultra"); // 讯飞-星火大模型 V4.0 ++ return tr("iFLYTEK-Spark4.0 Ultra"); // 讯飞-星火大模型 V4.0 + default: + return tr("No Vendor"); + } +@@ -2150,9 +2150,9 @@ QString KAConfigModelSettingDialog::modelVendorToString(const ModelTypeId modelT + case BAIDU_TYPE: + return tr("BAIDU-AI Painting-Advanced Edition"); // 百度-AI作画-高级版 + case XUNFEI_TYPE: +- return tr("XUNFEI-Image Generation"); // 讯飞-图片生成 ++ return tr("iFLYTEK-Image Generation"); // 讯飞-图片生成 + case DEFAULT_TYPE: +- return tr("XUNFEI-Image Generation (Free Trial Version)"); // 讯飞-图片生成(免费试用版) ++ return tr("iFLYTEK-Image Generation (Free Trial Version)"); // 讯飞-图片生成(免费试用版) + default: + return tr("No Vendor"); + } +@@ -2162,9 +2162,9 @@ QString KAConfigModelSettingDialog::modelVendorToString(const ModelTypeId modelT + case BAIDU_TYPE: + return tr("BAIDU-Voice Big Model"); // 百度-语音大模型 + case XUNFEI_TYPE: +- return tr("XUNFEI-Voice Big Model"); // 讯飞-语音大模型 ++ return tr("iFLYTEK-Voice Big Model"); // 讯飞-语音大模型 + case DEFAULT_TYPE: +- return tr("XUNFEI-Voice Big Model (Free Trial Version)"); // 讯飞-语音大模型(免费试用版) ++ return tr("iFLYTEK-Voice Big Model (Free Trial Version)"); // 讯飞-语音大模型(免费试用版) + default: + return tr("No Vendor"); + } +@@ -2313,7 +2313,7 @@ void KAConfigModelSettingDialog::initUIData(const ModelTypeId vid) + { + d_ptr->vid = vid; + if(vid == NLP_TYPE){ +- setWindowTitle(tr("Add-NLP Language Big Model")); //添加-NLP语言大模型 ++ setWindowTitle(tr("Add-NLP Large Language Model")); //添加-NLP语言大模型 + for (int vendor = BAIDU_TYPE; vendor <= XUNFEI_TYPE_4; ++vendor) + { + d_ptr->comboboxModelVendor->addItem(modelVendorToString(static_cast<ModelTypeId>(vid), static_cast<ModelVendorId>(vendor))); +diff --git a/translations/Internationalization_zh_CN.ts b/translations/Internationalization_zh_CN.ts +index 941fb6c..a7ee34d 100644 +--- a/translations/Internationalization_zh_CN.ts ++++ b/translations/Internationalization_zh_CN.ts +@@ -244,17 +244,17 @@ + </message> + <message> + <location filename="../msgpane.cpp" line="872"/> +- <source>XUNFEI-Spark3.5 Max</source> ++ <source>iFLYTEK-Spark3.5 Max</source> + <translation>讯飞-Spark3.5 Max</translation> + </message> + <message> + <location filename="../msgpane.cpp" line="874"/> +- <source>XUNFEI-Spark4.0 Ultra</source> ++ <source>iFLYTEK-Spark4.0 Ultra</source> + <translation>讯飞-Spark4.0 Ultra</translation> + </message> + <message> + <location filename="../msgpane.cpp" line="876"/> +- <source>XUNFEI-Spark4.0 Ultra (Free Trial Version)</source> ++ <source>iFLYTEK-Spark4.0 Ultra (Free Trial Version)</source> + <translation>讯飞-Spark4.0 Ultra(免费试用版)</translation> + </message> + <message> +@@ -332,32 +332,32 @@ + </message> + <message> + <location filename="../msgpane.cpp" line="1674"/> +- <source>Generated by XUNFEI-Image Generation</source> ++ <source>Generated by iFLYTEK-Image Generation</source> + <translation>由讯飞-图片生成生成</translation> + </message> + <message> + <location filename="../msgpane.cpp" line="1677"/> +- <source>Generated by XUNFEI-Spark3.5 Max</source> ++ <source>Generated by iFLYTEK-Spark3.5 Max</source> + <translation>由讯飞-Spark3.5 Max生成</translation> + </message> + <message> + <location filename="../msgpane.cpp" line="1680"/> +- <source>Generated by XUNFEI-Voice Big Model</source> ++ <source>Generated by iFLYTEK-Voice Big Model</source> + <translation>由讯飞-语音大模型生成</translation> + </message> + <message> + <location filename="../msgpane.cpp" line="1691"/> +- <source>Generated by XUNFEI-Image Generation (Free Trial Version)</source> ++ <source>Generated by iFLYTEK-Image Generation (Free Trial Version)</source> + <translation>由讯飞-图片生成(免费试用版)生成</translation> + </message> + <message> + <location filename="../msgpane.cpp" line="1694"/> +- <source>Generated by XUNFEI-Spark4.0 Ultra (Free Trial Version)</source> ++ <source>Generated by iFLYTEK-Spark4.0 Ultra (Free Trial Version)</source> + <translation>由讯飞-Spark4.0 Ultra(免费试用版)生成</translation> + </message> + <message> + <location filename="../msgpane.cpp" line="1697"/> +- <source>Generated by XUNFEI-Voice Big Model (Free Trial Version)</source> ++ <source>Generated by iFLYTEK-Voice Big Model (Free Trial Version)</source> + <translation>由讯飞-语音大模型(免费试用版)生成</translation> + </message> + <message> +@@ -377,7 +377,7 @@ + </message> + <message> + <location filename="../msgpane.cpp" line="1723"/> +- <source>Generated by XUNFEI-Spark4.0 Ultra</source> ++ <source>Generated by iFLYTEK-Spark4.0 Ultra</source> + <translation>由讯飞-Spark4.0 UItra生成</translation> + </message> + </context> +@@ -492,7 +492,7 @@ + </message> + <message> + <location filename="../setting/kamultimodelsettingpage.cpp" line="1964"/> +- <source>No account? Get Now</source> ++ <source>No account? Register now!</source> + <translation>没有账号?立即获取</translation> + </message> + <message> +@@ -533,7 +533,7 @@ + </message> + <message> + <location filename="../setting/kamultimodelsettingpage.cpp" line="2139"/> +- <source>XUNFEI-Spark3.5 Max</source> ++ <source>iFLYTEK-Spark3.5 Max</source> + <translation>讯飞-Spark3.5 Max</translation> + </message> + <message> +@@ -551,12 +551,12 @@ + </message> + <message> + <location filename="../setting/kamultimodelsettingpage.cpp" line="2153"/> +- <source>XUNFEI-Image Generation</source> ++ <source>iFLYTEK-Image Generation</source> + <translation>讯飞-图片生成</translation> + </message> + <message> + <location filename="../setting/kamultimodelsettingpage.cpp" line="2155"/> +- <source>XUNFEI-Image Generation (Free Trial Version)</source> ++ <source>iFLYTEK-Image Generation (Free Trial Version)</source> + <translation>讯飞-图片生成(免费试用版)</translation> + </message> + <message> +@@ -566,17 +566,17 @@ + </message> + <message> + <location filename="../setting/kamultimodelsettingpage.cpp" line="2165"/> +- <source>XUNFEI-Voice Big Model</source> ++ <source>iFLYTEK-Voice Big Model</source> + <translation>讯飞-语音大模型</translation> + </message> + <message> + <location filename="../setting/kamultimodelsettingpage.cpp" line="2167"/> +- <source>XUNFEI-Voice Big Model (Free Trial Version)</source> ++ <source>iFLYTEK-Voice Big Model (Free Trial Version)</source> + <translation>讯飞-语音大模型(免费试用版)</translation> + </message> + <message> + <location filename="../setting/kamultimodelsettingpage.cpp" line="2316"/> +- <source>Add-NLP Language Big Model</source> ++ <source>Add-NLP Large Language Model</source> + <translation>添加-NLP语言大模型</translation> + </message> + <message> +@@ -632,12 +632,12 @@ + </message> + <message> + <location filename="../setting/kamultimodelsettingpage.cpp" line="2141"/> +- <source>XUNFEI-Spark4.0 Ultra (Free Trial Version)</source> ++ <source>iFLYTEK-Spark4.0 Ultra (Free Trial Version)</source> + <translation>讯飞-Spark4.0 Ultra(免费试用版)</translation> + </message> + <message> + <location filename="../setting/kamultimodelsettingpage.cpp" line="2143"/> +- <source>XUNFEI-Spark4.0 Ultra</source> ++ <source>iFLYTEK-Spark4.0 Ultra</source> + <translation>讯飞-Spark4.0 Ultra</translation> + </message> + <message> +@@ -756,17 +756,17 @@ + </message> + <message> + <location filename="../setting/kamodelitem.cpp" line="48"/> +- <source>XUNFEI-Spark3.5 Max</source> ++ <source>iFLYTEK-Spark3.5 Max</source> + <translation>讯飞-Spark3.5 Max</translation> + </message> + <message> + <location filename="../setting/kamodelitem.cpp" line="51"/> +- <source>XUNFEI-Spark4.0 Ultra</source> ++ <source>iFLYTEK-Spark4.0 Ultra</source> + <translation>讯飞-Spark4.0 Ultra</translation> + </message> + <message> + <location filename="../setting/kamodelitem.cpp" line="54"/> +- <source>XUNFEI-Spark4.0 Ultra (Free Trial Version)</source> ++ <source>iFLYTEK-Spark4.0 Ultra (Free Trial Version)</source> + <translation>讯飞-Spark4.0 Ultra(免费试用版)</translation> + </message> + <message> +@@ -783,12 +783,12 @@ + </message> + <message> + <location filename="../setting/kamodelitem.cpp" line="66"/> +- <source>XUNFEI-Image Generation</source> ++ <source>iFLYTEK-Image Generation</source> + <translation>讯飞-图片生成</translation> + </message> + <message> + <location filename="../setting/kamodelitem.cpp" line="69"/> +- <source>XUNFEI-Image Generation (Free Trial Version)</source> ++ <source>iFLYTEK-Image Generation (Free Trial Version)</source> + <translation>讯飞-图片生成(免费试用版)</translation> + </message> + <message> +@@ -798,12 +798,12 @@ + </message> + <message> + <location filename="../setting/kamodelitem.cpp" line="81"/> +- <source>XUNFEI-Voice Big Model</source> ++ <source>iFLYTEK-Voice Big Model</source> + <translation>讯飞-语音大模型</translation> + </message> + <message> + <location filename="../setting/kamodelitem.cpp" line="84"/> +- <source>XUNFEI-Voice Big Model (Free Trial Version)</source> ++ <source>iFLYTEK-Voice Big Model (Free Trial Version)</source> + <translation>讯飞-语音大模型(免费试用版)</translation> + </message> + <message> +@@ -848,7 +848,7 @@ + <translation type="vanished">确认</translation> + </message> + <message> +- <source>Must write</source> ++ <source>Required</source> + <translation type="vanished">必填</translation> + </message> + <message> diff -Nru kylin-aiassistant-2.0.0/debian/patches/series kylin-aiassistant-2.0.0/debian/patches/series --- kylin-aiassistant-2.0.0/debian/patches/series 2025-03-12 14:50:57.000000000 +0800 +++ kylin-aiassistant-2.0.0/debian/patches/series 2025-03-14 15:40:42.000000000 +0800 @@ -119,3 +119,4 @@ 0119-170-IA7XFN-29308-AI.patch 0120-188-AI-bug-fix-bug-I9QV2C-I9QUZL.patch 0121-189.patch +0122-IBSHIV-AI.patch