!15 close-cd:#I833QV 【次要】【计算器】计算器右上角“选项”悬浮显示为英文

Merge pull request !15 from 李德成/openkylin/yangtze

debian/changelog

@@ -1,3 +1,13 @@
+kylin-calculator (1.2.0.0-ok4.1) yangtze; urgency=medium
+
+   * BUG号：#I833QV【次要】【计算器】计算器右上角“选项”悬浮显示为英文
+   * 需求号：无
+   * 任务号：无
+   * 其他更改说明：无
+   * 其他改动影响域：无
+
+ -- lidecheng <lidecheng@kylinos.cn>  Thu, 16 Nov 2023 09:39:49 +0800
+
 kylin-calculator (1.2.0.0-ok4) yangtze; urgency=medium
 
    * BUG号：#I5XHG7 【Wayland】【计算器】【平板模式】未全屏化

translations/kylin-calculator_zh_CN.ts

@@ -4,52 +4,52 @@
 <context>
     <name>Calc</name>
     <message>
-        <location filename="../calc_programmer/calc/calc.cpp" line="85"/>
+        <location filename="../calc_programmer/calc/calc.cpp" line="87"/>
         <source>The expression is empty!</source>
         <translation>表达式为空!</translation>
     </message>
     <message>
-        <location filename="../calc_programmer/calc/calc.cpp" line="106"/>
-        <location filename="../calc_programmer/calc/calc.cpp" line="121"/>
+        <location filename="../calc_programmer/calc/calc.cpp" line="109"/>
         <location filename="../calc_programmer/calc/calc.cpp" line="126"/>
-        <location filename="../calc_programmer/calc/calc.cpp" line="153"/>
-        <location filename="../calc_programmer/calc/calc.cpp" line="180"/>
-        <location filename="../calc_programmer/calc/calc.cpp" line="247"/>
-        <location filename="../calc_programmer/calc/calc.cpp" line="272"/>
-        <location filename="../calc_programmer/calc/calc.cpp" line="298"/>
+        <location filename="../calc_programmer/calc/calc.cpp" line="132"/>
+        <location filename="../calc_programmer/calc/calc.cpp" line="160"/>
+        <location filename="../calc_programmer/calc/calc.cpp" line="188"/>
+        <location filename="../calc_programmer/calc/calc.cpp" line="259"/>
+        <location filename="../calc_programmer/calc/calc.cpp" line="286"/>
+        <location filename="../calc_programmer/calc/calc.cpp" line="314"/>
         <source>Expression error!</source>
         <translation>表达式错误!</translation>
     </message>
     <message>
-        <location filename="../calc_programmer/calc/calc.cpp" line="116"/>
-        <location filename="../calc_programmer/calc/calc.cpp" line="140"/>
+        <location filename="../calc_programmer/calc/calc.cpp" line="120"/>
+        <location filename="../calc_programmer/calc/calc.cpp" line="147"/>
         <source>Missing left parenthesis!</source>
         <translation>缺少左括号!</translation>
     </message>
     <message>
-        <location filename="../calc_programmer/calc/calc.cpp" line="207"/>
+        <location filename="../calc_programmer/calc/calc.cpp" line="217"/>
         <source>The value is too large!</source>
         <translation>数值过大!</translation>
     </message>
     <message>
-        <location filename="../calc_programmer/calc/calc.cpp" line="219"/>
+        <location filename="../calc_programmer/calc/calc.cpp" line="230"/>
         <source>Miss operand!</source>
         <translation>缺少操作数!</translation>
     </message>
     <message>
-        <location filename="../calc_programmer/calc/calc.cpp" line="328"/>
-        <location filename="../calc_programmer/calc/calc.cpp" line="386"/>
+        <location filename="../calc_programmer/calc/calc.cpp" line="345"/>
+        <location filename="../calc_programmer/calc/calc.cpp" line="404"/>
         <source>Operator undefined!</source>
         <translation>未定义操作符!</translation>
     </message>
     <message>
-        <location filename="../calc_programmer/calc/calc.cpp" line="350"/>
+        <location filename="../calc_programmer/calc/calc.cpp" line="367"/>
         <source>Divisor cannot be 0!</source>
         <translation>除数不能为0!</translation>
     </message>
     <message>
-        <location filename="../calc_programmer/calc/calc.cpp" line="370"/>
-        <location filename="../calc_programmer/calc/calc.cpp" line="378"/>
+        <location filename="../calc_programmer/calc/calc.cpp" line="387"/>
+        <location filename="../calc_programmer/calc/calc.cpp" line="395"/>
         <source>Right operand error!</source>
         <translation>右操作数错误!</translation>
     </message>
@@ -102,57 +102,57 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../src/mainwindow.cpp" line="233"/>
+        <location filename="../src/mainwindow.cpp" line="249"/>
         <source>Calculator</source>
         <translation>计算器</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="996"/>
-        <location filename="../src/mainwindow.cpp" line="1185"/>
-        <location filename="../src/mainwindow.cpp" line="1201"/>
+        <location filename="../src/mainwindow.cpp" line="1087"/>
+        <location filename="../src/mainwindow.cpp" line="1305"/>
+        <location filename="../src/mainwindow.cpp" line="1321"/>
         <source>standard</source>
         <translation>标准</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="1183"/>
+        <location filename="../src/mainwindow.cpp" line="1303"/>
         <source>calculator</source>
         <translation>计算器</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="260"/>
+        <location filename="../src/mainwindow.cpp" line="276"/>
         <source>Copy</source>
         <translation>复制</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="261"/>
+        <location filename="../src/mainwindow.cpp" line="277"/>
         <source>Paste</source>
         <translation>粘贴</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="853"/>
+        <location filename="../src/mainwindow.cpp" line="931"/>
         <source>input too long</source>
         <translation>输入过长</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="55"/>
-        <location filename="../src/mainwindow.cpp" line="1185"/>
-        <location filename="../src/mainwindow.cpp" line="1205"/>
+        <location filename="../src/mainwindow.cpp" line="77"/>
+        <location filename="../src/mainwindow.cpp" line="1305"/>
+        <location filename="../src/mainwindow.cpp" line="1325"/>
         <source>scientific</source>
         <translation>科学</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="1218"/>
+        <location filename="../src/mainwindow.cpp" line="1338"/>
         <source>exchange rate</source>
         <translation>汇率</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="748"/>
-        <location filename="../src/mainwindow.cpp" line="752"/>
+        <location filename="../src/mainwindow.cpp" line="827"/>
+        <location filename="../src/mainwindow.cpp" line="831"/>
         <source>Error!</source>
         <translation>错误!</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="756"/>
+        <location filename="../src/mainwindow.cpp" line="835"/>
         <source>Input error!</source>
         <translation>输入错误!</translation>
     </message>
@@ -169,13 +169,13 @@
 <context>
     <name>ProgramModel</name>
     <message>
-        <location filename="../src/programmer/programmodel.cpp" line="234"/>
-        <location filename="../src/programmer/programmodel.cpp" line="318"/>
+        <location filename="../src/programmer/programmodel.cpp" line="232"/>
+        <location filename="../src/programmer/programmodel.cpp" line="316"/>
         <source>Input error!</source>
         <translation>输入错误!</translation>
     </message>
     <message>
-        <location filename="../src/programmer/programmodel.cpp" line="400"/>
+        <location filename="../src/programmer/programmodel.cpp" line="398"/>
         <source>ShowBinary</source>
         <translation>显示二进制</translation>
     </message>
@@ -184,7 +184,7 @@
         <translation type="vanished">显示二进制</translation>
     </message>
     <message>
-        <location filename="../src/programmer/programmodel.cpp" line="406"/>
+        <location filename="../src/programmer/programmodel.cpp" line="409"/>
         <source>HideBinary</source>
         <translation>隐藏二进制</translation>
     </message>
@@ -196,12 +196,12 @@
         <translation type="vanished">功能列表</translation>
     </message>
     <message>
-        <location filename="../src/titlebar.cpp" line="280"/>
+        <location filename="../src/titlebar.cpp" line="288"/>
         <source>Standard</source>
         <translation>计算器—标准</translation>
     </message>
     <message>
-        <location filename="../src/titlebar.cpp" line="281"/>
+        <location filename="../src/titlebar.cpp" line="289"/>
         <source>Scientific</source>
         <translation>计算器—科学</translation>
     </message>
@@ -210,15 +210,15 @@
         <translation type="vanished">标准 </translation>
     </message>
     <message>
-        <location filename="../src/titlebar.cpp" line="56"/>
-        <location filename="../src/titlebar.cpp" line="67"/>
-        <location filename="../src/titlebar.cpp" line="248"/>
+        <location filename="../src/titlebar.cpp" line="55"/>
+        <location filename="../src/titlebar.cpp" line="70"/>
+        <location filename="../src/titlebar.cpp" line="256"/>
         <source>standard</source>
         <translation>标准</translation>
     </message>
     <message>
-        <location filename="../src/titlebar.cpp" line="57"/>
-        <location filename="../src/titlebar.cpp" line="260"/>
+        <location filename="../src/titlebar.cpp" line="56"/>
+        <location filename="../src/titlebar.cpp" line="268"/>
         <source>scientific</source>
         <translation>科学</translation>
     </message>
@@ -227,41 +227,41 @@
         <translation type="vanished">科学 </translation>
     </message>
     <message>
-        <location filename="../src/titlebar.cpp" line="282"/>
+        <location filename="../src/titlebar.cpp" line="290"/>
         <source>Exchange Rate</source>
         <translation>计算器—汇率</translation>
     </message>
     <message>
-        <location filename="../src/titlebar.cpp" line="283"/>
+        <location filename="../src/titlebar.cpp" line="291"/>
         <source>Programmer</source>
         <translation>计算器—程序员</translation>
     </message>
     <message>
-        <location filename="../src/titlebar.cpp" line="308"/>
+        <location filename="../src/titlebar.cpp" line="316"/>
         <source>StayTop</source>
         <translation>置顶</translation>
     </message>
     <message>
-        <location filename="../src/titlebar.cpp" line="413"/>
+        <location filename="../src/titlebar.cpp" line="426"/>
         <source>Restore</source>
         <translation>还原</translation>
     </message>
     <message>
-        <location filename="../src/titlebar.cpp" line="112"/>
-        <location filename="../src/titlebar.cpp" line="309"/>
+        <location filename="../src/titlebar.cpp" line="120"/>
+        <location filename="../src/titlebar.cpp" line="317"/>
         <source>Minimize</source>
         <translation>最小化</translation>
     </message>
     <message>
-        <location filename="../src/titlebar.cpp" line="113"/>
-        <location filename="../src/titlebar.cpp" line="310"/>
-        <location filename="../src/titlebar.cpp" line="404"/>
+        <location filename="../src/titlebar.cpp" line="121"/>
+        <location filename="../src/titlebar.cpp" line="318"/>
+        <location filename="../src/titlebar.cpp" line="417"/>
         <source>Maximize</source>
         <translation>最大化</translation>
     </message>
     <message>
-        <location filename="../src/titlebar.cpp" line="114"/>
-        <location filename="../src/titlebar.cpp" line="311"/>
+        <location filename="../src/titlebar.cpp" line="122"/>
+        <location filename="../src/titlebar.cpp" line="319"/>
         <source>Close</source>
         <translation>关闭</translation>
     </message>
@@ -274,14 +274,14 @@
     </message>
     <message>
         <location filename="../src/programmer/toolbar.cpp" line="63"/>
-        <location filename="../src/programmer/toolbar.cpp" line="219"/>
-        <location filename="../src/programmer/toolbar.cpp" line="222"/>
+        <location filename="../src/programmer/toolbar.cpp" line="207"/>
+        <location filename="../src/programmer/toolbar.cpp" line="210"/>
         <source>ShowBinary</source>
         <translation>显示二进制</translation>
     </message>
     <message>
-        <location filename="../src/programmer/toolbar.cpp" line="220"/>
-        <location filename="../src/programmer/toolbar.cpp" line="221"/>
+        <location filename="../src/programmer/toolbar.cpp" line="208"/>
+        <location filename="../src/programmer/toolbar.cpp" line="209"/>
         <source>HideBinary</source>
         <translation>隐藏二进制</translation>
     </message>
@@ -289,22 +289,22 @@
 <context>
     <name>ToolModelOutput</name>
     <message>
-        <location filename="../src/toolmodel.cpp" line="80"/>
+        <location filename="../src/toolmodel.cpp" line="82"/>
         <source>Rate update</source>
         <translation>汇率更新</translation>
     </message>
     <message>
-        <location filename="../src/toolmodel.cpp" line="95"/>
+        <location filename="../src/toolmodel.cpp" line="97"/>
         <source>Chinese Yuan</source>
         <translation>人民币</translation>
     </message>
     <message>
-        <location filename="../src/toolmodel.cpp" line="103"/>
+        <location filename="../src/toolmodel.cpp" line="104"/>
         <source>US Dollar</source>
         <translation>美元</translation>
     </message>
     <message>
-        <location filename="../src/toolmodel.cpp" line="515"/>
+        <location filename="../src/toolmodel.cpp" line="504"/>
         <source>Error!</source>
         <translation>错误!</translation>
     </message>
@@ -312,14 +312,12 @@
 <context>
     <name>UnitListWidget</name>
     <message>
-        <location filename="../src/toolmodel.cpp" line="1163"/>
         <source>currency</source>
-        <translation>货币</translation>
+        <translation type="vanished">货币</translation>
     </message>
     <message>
-        <location filename="../src/toolmodel.cpp" line="1169"/>
         <source>cancel</source>
-        <translation>取消</translation>
+        <translation type="vanished">取消</translation>
     </message>
     <message>
         <source>search</source>
@@ -329,94 +327,93 @@
 <context>
     <name>menuModule</name>
     <message>
-        <location filename="../src/menumodule/menumodule.cpp" line="44"/>
         <source>Menu</source>
-        <translation>菜单</translation>
+        <translation type="vanished">菜单</translation>
     </message>
     <message>
-        <location filename="../src/menumodule/menumodule.cpp" line="56"/>
-        <location filename="../src/menumodule/menumodule.cpp" line="155"/>
+        <location filename="../src/menumodule/menumodule.cpp" line="40"/>
+        <source>Options</source>
+        <translation>选项</translation>
+    </message>
+    <message>
+        <location filename="../src/menumodule/menumodule.cpp" line="52"/>
+        <location filename="../src/menumodule/menumodule.cpp" line="90"/>
         <source>Standard</source>
         <translation>标准</translation>
     </message>
     <message>
-        <location filename="../src/menumodule/menumodule.cpp" line="58"/>
-        <location filename="../src/menumodule/menumodule.cpp" line="157"/>
+        <location filename="../src/menumodule/menumodule.cpp" line="54"/>
+        <location filename="../src/menumodule/menumodule.cpp" line="92"/>
         <source>Scientific</source>
         <translation>科学</translation>
     </message>
     <message>
-        <location filename="../src/menumodule/menumodule.cpp" line="60"/>
-        <location filename="../src/menumodule/menumodule.cpp" line="159"/>
+        <location filename="../src/menumodule/menumodule.cpp" line="56"/>
+        <location filename="../src/menumodule/menumodule.cpp" line="94"/>
         <source>Exchange Rate</source>
         <translation>汇率</translation>
     </message>
     <message>
-        <location filename="../src/menumodule/menumodule.cpp" line="62"/>
-        <location filename="../src/menumodule/menumodule.cpp" line="161"/>
+        <location filename="../src/menumodule/menumodule.cpp" line="58"/>
+        <location filename="../src/menumodule/menumodule.cpp" line="96"/>
         <source>Programmer</source>
         <translation>程序员</translation>
     </message>
     <message>
-        <location filename="../src/menumodule/menumodule.cpp" line="68"/>
+        <location filename="../src/menumodule/menumodule.cpp" line="64"/>
         <source>Theme</source>
         <translation>主题</translation>
     </message>
     <message>
-        <location filename="../src/menumodule/menumodule.cpp" line="70"/>
-        <location filename="../src/menumodule/menumodule.cpp" line="153"/>
+        <location filename="../src/menumodule/menumodule.cpp" line="66"/>
+        <location filename="../src/menumodule/menumodule.cpp" line="88"/>
         <source>Help</source>
         <translation>帮助</translation>
     </message>
     <message>
-        <location filename="../src/menumodule/menumodule.cpp" line="72"/>
-        <location filename="../src/menumodule/menumodule.cpp" line="151"/>
+        <location filename="../src/menumodule/menumodule.cpp" line="68"/>
+        <location filename="../src/menumodule/menumodule.cpp" line="86"/>
         <source>About</source>
         <translation>关于</translation>
     </message>
     <message>
-        <location filename="../src/menumodule/menumodule.cpp" line="74"/>
-        <location filename="../src/menumodule/menumodule.cpp" line="149"/>
+        <location filename="../src/menumodule/menumodule.cpp" line="70"/>
+        <location filename="../src/menumodule/menumodule.cpp" line="84"/>
         <source>Quit</source>
         <translation>退出</translation>
     </message>
     <message>
-        <location filename="../src/menumodule/menumodule.cpp" line="85"/>
         <source>Auto</source>
-        <translation>自动</translation>
+        <translation type="vanished">自动</translation>
     </message>
     <message>
-        <location filename="../src/menumodule/menumodule.cpp" line="89"/>
         <source>Light</source>
-        <translation>浅色</translation>
+        <translation type="vanished">浅色</translation>
     </message>
     <message>
-        <location filename="../src/menumodule/menumodule.cpp" line="93"/>
         <source>Dark</source>
-        <translation>深色</translation>
+        <translation type="vanished">深色</translation>
     </message>
     <message>
-        <location filename="../src/menumodule/menumodule.cpp" line="302"/>
+        <location filename="../src/menumodule/menumodule.cpp" line="104"/>
         <source>Version: </source>
         <translation>版本号: </translation>
     </message>
     <message>
-        <location filename="../src/menumodule/menumodule.cpp" line="306"/>
+        <location filename="../src/menumodule/menumodule.cpp" line="107"/>
         <source>Calculator is a lightweight calculator based on Qt5, which provides standard calculation, scientific calculation and exchange rate conversion.</source>
         <translation>计算器是一款基于qt5开发的轻量级计算器，提供标准计算，科学计算和汇率换算。</translation>
     </message>
     <message>
-        <location filename="../src/menumodule/menumodule.cpp" line="371"/>
-        <location filename="../src/menumodule/menumodule.cpp" line="379"/>
         <source>Service &amp; Support: </source>
-        <translation>服务与支持团队：</translation>
+        <translation type="vanished">服务与支持团队：</translation>
     </message>
     <message>
         <source>Support: support@kylinos.cn</source>
         <translation type="vanished">支持：support@kylinos.cn</translation>
     </message>
     <message>
-        <location filename="../src/menumodule/menumodule.h" line="66"/>
+        <location filename="../src/menumodule/menumodule.cpp" line="103"/>
         <source>Calculator</source>
         <translation>计算器</translation>
     </message>