--- a/eric6/i18n/eric6_zh_CN.ts Thu Jan 14 17:51:12 2021 +0100 +++ b/eric6/i18n/eric6_zh_CN.ts Thu Jan 14 17:58:40 2021 +0100 @@ -2872,42 +2872,42 @@ <context> <name>CheckerCategories</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="62"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="67"/> <source>Annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="65"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="70"/> <source>Code Complexity</source> <translation type="unfinished">代码复杂度</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="68"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="73"/> <source>Documentation</source> <translation type="unfinished">文档</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="71"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="76"/> <source>Errors</source> <translation type="unfinished">错误</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="74"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="79"/> <source>Miscellaneous</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="77"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="82"/> <source>Naming</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="80"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="85"/> <source>Security</source> <translation type="unfinished">安全</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="83"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="88"/> <source>Warnings</source> <translation type="unfinished"></translation> </message> @@ -3491,27 +3491,27 @@ <translation>输入要排除文件的文件名样式,用逗号分隔</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1090"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1128"/> <source>Press to start the code style check run</source> <translation>按下以开始代码格式检查</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1321"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1359"/> <source>Press to fix the selected issues</source> <translation>按下以修复已选的问题</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1113"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1151"/> <source>Press to load the default values</source> <translation>按下以加载默认值</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1123"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1161"/> <source>Press to store the current values as defaults</source> <translation>按下以储存当前值为默认值</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1133"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1171"/> <source>Press to reset the default values</source> <translation>按下以重置默认值</translation> </message> @@ -3561,32 +3561,32 @@ <translation>输入不需要自动修复的问题信息代码</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="283"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="271"/> <source>Max. Line Length:</source> <translation>最大行宽:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="316"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="304"/> <source>Enter the maximum allowed line length (PEP-8: 79 characters)</source> <translation>输入允许的最大行宽(PEP-8: 79 字符)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="443"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="431"/> <source>Docstring Type:</source> <translation>文本注释类型:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="450"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="438"/> <source>Select the rule set for docstrings</source> <translation>为文本注释选择规则集</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="424"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="412"/> <source>Select to allow hanging closing brackets</source> <translation>选择以允许悬挂式右括号</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="427"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="415"/> <source>Allow hanging closing brackets</source> <translation>充许悬挂式右括号</translation> </message> @@ -3611,7 +3611,7 @@ <translation>自动修复问题</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1263"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1301"/> <source><b>Result List</b> <p>This list shows the results of the code style check. Double clicking an entry will open this entry in an editor window and position the cursor at @@ -3622,52 +3622,52 @@ 在相应的行和位置。</p></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1279"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1317"/> <source>File/Line</source> <translation>文件/行</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1284"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1322"/> <source>Code</source> <translation>代码</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1289"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1327"/> <source>Message</source> <translation>消息</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="121"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="126"/> <source>PEP-257</source> <translation>PEP-257</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="122"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="127"/> <source>Eric</source> <translation>Eric</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1354"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1392"/> <source>Statistics...</source> <translation>统计…</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1351"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1389"/> <source>Press to show some statistics for the last run</source> <translation>按下以显示最后一次运行的统计</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1344"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1382"/> <source>Show</source> <translation>显示</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1341"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1379"/> <source>Press to show all files containing an issue</source> <translation>按下以统计所有有问题的文件</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="237"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="244"/> <source>Error: {0}</source> <translation>错误:{0}</translation> </message> @@ -3677,17 +3677,17 @@ <translation>修复: {0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="1014"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="1037"/> <source>No issues found.</source> <translation>未发现问题。</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1189"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1227"/> <source>Shows the progress of the code style check</source> <translation>显示代码格式检查的进度</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1198"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1236"/> <source>%v/%m Files</source> <translation>%v/%m 文件</translation> </message> @@ -3702,27 +3702,27 @@ <translation>显示忽略</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="940"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="963"/> <source>{0} (ignored)</source> <translation>{0}(已忽略)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="833"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="856"/> <source>Preparing files...</source> <translation>正在准备文件…</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="698"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="736"/> <source>Enter the maximum allowed code complexity (McCabe: 10)</source> <translation>输入充许的最大代码复杂度(McCabe: 10)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="210"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="217"/> <source>Errors</source> <translation>错误</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="872"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="895"/> <source>Transferring data...</source> <translation>传输数据…</translation> </message> @@ -3737,227 +3737,227 @@ <translation>特殊选项</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="275"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="263"/> <source>Source Style</source> <translation>源码风格</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="437"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="425"/> <source>Documentation Style</source> <translation>文档风格</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="473"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="461"/> <source>Coding Line</source> <translation>编码行</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="479"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="467"/> <source>Valid Encodings:</source> <translation>可用编码:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="486"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="474"/> <source>Enter valid encodings separated by a comma (leave empty to use defaults)</source> <translation>输入可用编码,以逗号分隔(留空则使用默认)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="496"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="484"/> <source>Copyright</source> <translation>版权</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="502"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="490"/> <source>Min. File Size:</source> <translation>最小文件大小:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="509"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="497"/> <source>Enter the minimum size a file must have to be checked (0 for all files)</source> <translation>输入必须检查的最小的文件大小(0 代表所有文件)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="535"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="523"/> <source>Author:</source> <translation>作者:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="542"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="530"/> <source>Enter a copyright author name to check for (leave empty to omit this check)</source> <translation>输入版权作者名字以检查(留空则忽略该检查)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="552"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="540"/> <source>Future Imports</source> <translation>将来导入</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="558"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="546"/> <source>Expected Imports:</source> <translation>期望导入:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="672"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="710"/> <source>Code Complexity</source> <translation>代码复杂度</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1093"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1131"/> <source>&Start</source> <translation>开始(&S)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1324"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1362"/> <source>&Fix Selected</source> <translation>修复所选(&F)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1116"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1154"/> <source>&Load Defaults</source> <translation>加载默认(&L)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1126"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1164"/> <source>St&ore Defaults</source> <translation>储存默认(&O)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1136"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1174"/> <source>&Reset Defaults</source> <translation>重置(&R)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="1017"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="1040"/> <source>No files found (check your ignore list).</source> <translation>找不到文件(检查您忽略的列表)。</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="584"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="572"/> <source>Ignore Built-ins Assignment</source> <translation>忽略内置作业</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="600"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="588"/> <source>Left</source> <translation>左</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="605"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="593"/> <source>Right</source> <translation>右</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="615"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="603"/> <source>Press to add a built-in assignment to be ignored</source> <translation>按下以添加欲忽略的内置作业</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="625"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="682"/> <source>Press to delete the selected entries</source> <translation>点击删除选中的条目</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="691"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="729"/> <source>Max. McCabe Complexity:</source> <translation>最大 McCabe 复杂度:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="714"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="752"/> <source>Max. Line Complexity:</source> <translation>最大行复杂度:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="721"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="759"/> <source>Enter the maximum complexity (number of nodes) for a line of code</source> <translation>为某行代码输入最大的复杂度(节点数)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="737"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="775"/> <source>Max. Line Complexity Score:</source> <translation>最大行复杂度得分:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="744"/> - <source>Enter the maximum allowed median for line complexity</source> - <translation>为行复杂度输入允许最大的中位数</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="350"/> - <source>Blank Lines Before</source> - <translation>在前空行</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="356"/> - <source>Top Level Classes and Functions:</source> - <translation>顶层类和函数:</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="363"/> - <source>Enter the number of blank lines before top level classes and functions</source> - <translation>输入在顶层类和函数前的空行数</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="395"/> - <source>Methods and Nested Classes and Functions:</source> - <translation>方法和嵌套类和函数:</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="402"/> - <source>Enter the number of blank lines before methods and nested classes or functions</source> - <translation>输入方法和嵌套类或函数前的空行数</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="309"/> - <source>Max. Documentation Line Length:</source> - <translation>最大文件行宽:</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="653"/> - <source>Commented Code</source> - <translation>注释代码</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="659"/> - <source>Select to search for commented code more aggressively. This may increase the number of false positives.</source> - <translation>选择以更宽松地搜索注释代码。这将增加误报数。</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="662"/> - <source>Search aggressively</source> - <translation>宽式搜索</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="763"/> - <source>Type Annotations</source> - <translation>类型注释</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="769"/> - <source>Min. Coverage:</source> - <translation>最小覆盖:</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="776"/> - <source>Enter the minimum percentage of type annotations</source> - <translation>输入类型注释的最小百分比</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="779"/> - <source>off</source> - <translation>关</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="782"/> + <source>Enter the maximum allowed median for line complexity</source> + <translation>为行复杂度输入允许最大的中位数</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="338"/> + <source>Blank Lines Before</source> + <translation>在前空行</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="344"/> + <source>Top Level Classes and Functions:</source> + <translation>顶层类和函数:</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="351"/> + <source>Enter the number of blank lines before top level classes and functions</source> + <translation>输入在顶层类和函数前的空行数</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="383"/> + <source>Methods and Nested Classes and Functions:</source> + <translation>方法和嵌套类和函数:</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="390"/> + <source>Enter the number of blank lines before methods and nested classes or functions</source> + <translation>输入方法和嵌套类或函数前的空行数</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="297"/> + <source>Max. Documentation Line Length:</source> + <translation>最大文件行宽:</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="641"/> + <source>Commented Code</source> + <translation>注释代码</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="647"/> + <source>Select to search for commented code more aggressively. This may increase the number of false positives.</source> + <translation>选择以更宽松地搜索注释代码。这将增加误报数。</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="650"/> + <source>Search aggressively</source> + <translation>宽式搜索</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="801"/> + <source>Type Annotations</source> + <translation>类型注释</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="807"/> + <source>Min. Coverage:</source> + <translation>最小覆盖:</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="814"/> + <source>Enter the minimum percentage of type annotations</source> + <translation>输入类型注释的最小百分比</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="817"/> + <source>off</source> + <translation>关</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="820"/> <source>%</source> <translation>%</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="805"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="843"/> <source>Max. Complexity:</source> <translation>最大复杂度:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="812"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="850"/> <source>Enter the maximum type annotation complexity</source> <translation>输入类型注释的最大复杂度</translation> </message> @@ -3972,12 +3972,12 @@ <translation type="obsolete">运行</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1311"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1349"/> <source>Press to restart the code style check run</source> <translation>按下以重新开始代码格式检查</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1314"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1352"/> <source>Restart</source> <translation>重启</translation> </message> @@ -4002,135 +4002,155 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="833"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="871"/> <source>Security Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="839"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="877"/> <source>Hardcoded 'tmp' Directories:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="849"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="887"/> <source>Weak Cryptographic Keys</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="855"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="893"/> <source>DSA</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="973"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1011"/> <source>High Risk:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="868"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="906"/> <source>Select the bit length below which a DSA key is to be considered very weak</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="990"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1028"/> <source>Medium Risk:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="885"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="923"/> <source>Select the bit length below which a DSA key is to be considered weak</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="911"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="949"/> <source>RSA</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="924"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="962"/> <source>Select the bit length below which a RSA key is to be considered very weak</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="941"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="979"/> <source>Select the bit length below which a RSA key is to be considered weak</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="967"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1005"/> <source>Elliptic Curves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="980"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1018"/> <source>Select the bit length below which an Elliptic Curve is to be considered very weak</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="997"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1035"/> <source>Select the bit length below which an Elliptic Curve is to be considered weak</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1026"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1064"/> <source>Enter the names of insecure SSL protocols and methods (one per line)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1033"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1071"/> <source>Insecure SSL Protocols:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1043"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1081"/> <source>Insecure Hashes:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1050"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1088"/> <source>Enter a list of hash methods to be considered insecure separated by comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1057"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1095"/> <source>Select to also check for insecure exception handling for typed exceptions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1060"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1098"/> <source>Check Typed Exceptions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1067"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1105"/> <source>Enter directory names (one per line) to be checked for</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1146"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1184"/> <source>Progress</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1154"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1192"/> <source>Shows the list of files still to be checked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1219"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1257"/> <source>Cancel</source> <translation type="unfinished">取消</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1242"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1280"/> <source>Results</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1250"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1288"/> <source><b>Note:</b> Mark reviewed security issues with a "<b># secok</b>" comment.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="657"/> + <source>Whitelist:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="672"/> + <source>Press to add a commented code whitelist pattern</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="1995"/> + <source>Commented Code Whitelist Pattern</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="1995"/> + <source>Enter a Commented Code Whitelist Pattern</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CodeStyleCheckerPlugin</name> @@ -31573,137 +31593,137 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1170"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1338"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1323"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1638"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1698"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1683"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1842"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1952"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1981"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1966"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1979"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1992"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1860"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2131"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2205"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2229"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2005"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2037"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2037"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>文件 <b>{0}</b> 已经存在。是否覆盖?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2267"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2252"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2103"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2169"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2295"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2105"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2326"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2311"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2304"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -31713,72 +31733,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2977"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2809"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2977"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2363"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2427"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2404"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2464"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2441"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2490"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2553"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2530"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2695"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2673"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2655"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2746"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2724"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2746"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2724"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -31808,17 +31828,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2601"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2578"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1558"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1558"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>文件 <b>{0}</b> 无法读取。</p></translation> </message> @@ -31833,7 +31853,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> @@ -31843,62 +31863,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3089"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3103"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3073"/> <source>Delete Bookmark</source> <translation type="unfinished">删除书签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3103"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3073"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3114"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3084"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3108"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3172"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3142"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3210"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3210"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3222"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3245"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3245"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3287"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3257"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -31923,37 +31943,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1797"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1814"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1799"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2589"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2589"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2565"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2542"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2578"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2555"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1820"/> <source>Aborting uncommitted merge</source> <translation type="unfinished"></translation> </message> @@ -38277,37 +38297,37 @@ <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="494"/> <source>Commit</source> <translation type="unfinished">提交</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="664"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="660"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished">没有未提交的更改可用或被选择。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="558"/> <source>Add</source> <translation type="unfinished">添加</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="558"/> <source>There are no unversioned entries available/selected.</source> <translation type="unfinished">没有未版本化的条目可用或被选择。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="622"/> <source>Revert</source> <translation type="unfinished">还原</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="585"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="581"/> <source>Remove</source> <translation type="unfinished">移除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="622"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> @@ -38327,17 +38347,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="420"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="416"/> <source>all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="640"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="494"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> @@ -38352,12 +38372,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="667"/> <source>Side-by-Side Diff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="667"/> <source>Only one file with uncommitted changes must be selected.</source> <translation type="unfinished"></translation> </message> @@ -38457,7 +38477,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="765"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="761"/> <source>Merge</source> <translation type="unfinished">合并</translation> </message> @@ -63610,182 +63630,182 @@ <context> <name>Queues</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="197"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="195"/> <source>New Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="237"/> <source>Update Current Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="282"/> <source>Pop Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="288"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="286"/> <source>Push Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="290"/> <source>Go to Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="396"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="394"/> <source>Select Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="302"/> <source>Select the target patch name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="396"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="394"/> <source>No patches to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="345"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="343"/> <source>Finish Applied Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="368"/> <source>Rename Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="380"/> <source>Select the patch to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="389"/> <source>Delete Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="429"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="427"/> <source>Fold Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="424"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="422"/> <source>No patches selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="429"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="427"/> <source>No patches available to be folded.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="444"/> <source>List Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="444"/> <source>No patches available to list guards for.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="470"/> <source>Define Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="498"/> <source>No patches available to define guards for.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="498"/> <source>Drop All Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="484"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="482"/> <source>Select the patch to drop guards for (leave empty for the current patch):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="528"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="526"/> <source>Set Active Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="528"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="526"/> <source>No guards available to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="541"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="539"/> <source>Deactivate Guards</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="563"/> + <source>Create New Queue</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="565"/> - <source>Create New Queue</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="567"/> <source>Rename Active Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="589"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="587"/> <source>Error while creating a new queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="592"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="590"/> <source>Error while renaming the active queue.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="613"/> + <source>Purge Queue</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="615"/> - <source>Purge Queue</source> + <source>Delete Queue</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="617"/> - <source>Delete Queue</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="619"/> <source>Activate Queue</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="642"/> + <source>Error while purging the queue.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="644"/> - <source>Error while purging the queue.</source> + <source>Error while deleting the queue.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="646"/> - <source>Error while deleting the queue.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="648"/> <source>Error while setting the active queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="666"/> <source>Available Queues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="691"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="682"/> <source>Initializing new queue repository</source> <translation type="unfinished"></translation> </message> @@ -92496,46 +92516,46 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1224"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1736"/> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746"/> + <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1244"/> + <source><tr><td><b>Last author</b></td><td>{0}</td></tr> +<tr><td><b>Committed date</b></td><td>{1}</td></tr> +<tr><td><b>Committed time</b></td><td>{2}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1728"/> + <source><tr><td><b>Tip</b></td><td></td></tr> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> + <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1751"/> - <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1761"/> - <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1259"/> - <source><tr><td><b>Last author</b></td><td>{0}</td></tr> -<tr><td><b>Committed date</b></td><td>{1}</td></tr> -<tr><td><b>Committed time</b></td><td>{2}</td></tr></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> - <source><tr><td><b>Tip</b></td><td></td></tr> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746"/> - <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1766"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1755"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -92543,12 +92563,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1756"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1741"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1267"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -92559,13 +92579,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1733"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1738"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>