--- a/i18n/eric6_zh_CN.ts Mon Oct 24 19:55:05 2016 +0200
+++ b/i18n/eric6_zh_CN.ts Tue Oct 25 19:33:11 2016 +0200
@@ -390,7 +390,7 @@
<context>
<name>AddBookmarkDialog</name>
<message>
- <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="198"/>
+ <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.ui" line="26"/>
<source>Add Bookmark</source>
<translation>添加书签</translation>
</message>
@@ -1787,7 +1787,7 @@
<translation>编辑地址(&A)</translation>
</message>
<message>
- <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/>
+ <location filename="../WebBrowser/Bookmarks/BookmarksDialog.ui" line="75"/>
<source>&Delete</source>
<translation>删除(&D)</translation>
</message>
@@ -2481,12 +2481,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Debugger/CallTraceViewer.py" line="54"/>
+ <location filename="../Debugger/CallTraceViewer.ui" line="109"/>
<source>From</source>
<translation type="unfinished">从</translation>
</message>
<message>
- <location filename="../Debugger/CallTraceViewer.py" line="54"/>
+ <location filename="../Debugger/CallTraceViewer.ui" line="114"/>
<source>To</source>
<translation type="unfinished">到</translation>
</message>
@@ -2649,7 +2649,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Cooperation/ChatWidget.py" line="513"/>
+ <location filename="../Cooperation/ChatWidget.ui" line="230"/>
<source>Clear</source>
<translation>清除</translation>
</message>
@@ -2946,7 +2946,7 @@
<context>
<name>ClickToFlashWhitelistDialog</name>
<message>
- <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py" line="54"/>
+ <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="14"/>
<source>ClickToFlash Whitelist</source>
<translation type="unfinished"></translation>
</message>
@@ -4873,7 +4873,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/>
+ <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="223"/>
<source><no cookie selected></source>
<translation type="unfinished"></translation>
</message>
@@ -7647,7 +7647,7 @@
<context>
<name>DownloadManager</name>
<message>
- <location filename="../WebBrowser/Download/DownloadManager.py" line="363"/>
+ <location filename="../WebBrowser/Download/DownloadManager.ui" line="14"/>
<source>Downloads</source>
<translation>下载</translation>
</message>
@@ -8097,92 +8097,92 @@
<translation type="unfinished">标准按钮</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="41"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="257"/>
<source>Abort</source>
<translation>终止</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="42"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="264"/>
<source>Apply</source>
<translation>应用</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="43"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="271"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="44"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="278"/>
<source>Close</source>
<translation>关闭</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="45"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="285"/>
<source>Discard</source>
<translation>放弃</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="46"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="292"/>
<source>Help</source>
<translation>帮助</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="47"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="299"/>
<source>Ignore</source>
<translation>忽略</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="48"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="306"/>
<source>No</source>
<translation type="unfinished">否</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="49"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="313"/>
<source>No to all</source>
<translation type="unfinished">全部否</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="50"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="320"/>
<source>Ok</source>
<translation type="unfinished">确定</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="51"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="327"/>
<source>Open</source>
<translation type="unfinished">打开</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="52"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="334"/>
<source>Reset</source>
<translation type="unfinished">重置</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="53"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="341"/>
<source>Restore defaults</source>
<translation type="unfinished">恢复默认</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="54"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="348"/>
<source>Retry</source>
<translation type="unfinished">重试</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="55"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="355"/>
<source>Save</source>
<translation type="unfinished">保存</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="56"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="362"/>
<source>Save all</source>
<translation type="unfinished">全部保存</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="57"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="369"/>
<source>Yes</source>
<translation type="unfinished">是</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="58"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="376"/>
<source>Yes to all</source>
<translation type="unfinished">全部是</translation>
</message>
@@ -10227,7 +10227,7 @@
<translation>点击以从已安装的 AIP 文件列表中选择一个 API 文件</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="184"/>
+ <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="132"/>
<source>Add from installed APIs</source>
<translation>从已安装的 API 中添加</translation>
</message>
@@ -10237,7 +10237,7 @@
<translation>点击以从通过插件安装的 API 文件列表中选择一个 API 文件</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="203"/>
+ <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="142"/>
<source>Add from Plugin APIs</source>
<translation>从插件 API 中添加</translation>
</message>
@@ -10247,7 +10247,7 @@
<translation>点击编译已选 API 定义</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="236"/>
+ <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="159"/>
<source>Compile APIs</source>
<translation>编译 API</translation>
</message>
@@ -11301,7 +11301,7 @@
<translation>选择字体。</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="69"/>
+ <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="103"/>
<source>Font</source>
<translation>字体</translation>
</message>
@@ -11311,7 +11311,7 @@
<translation>选择行尾填充。</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="353"/>
+ <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="113"/>
<source>Fill to end of line</source>
<translation>填充到行尾</translation>
</message>
@@ -12832,7 +12832,7 @@
<translation>模式：</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="58"/>
+ <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1080"/>
<source>Disabled</source>
<translation>已禁用</translation>
</message>
@@ -13571,7 +13571,7 @@
<context>
<name>EmailDialog</name>
<message>
- <location filename="../UI/EmailDialog.py" line="339"/>
+ <location filename="../UI/EmailDialog.ui" line="13"/>
<source>Send bug report</source>
<translation>发送错误报告</translation>
</message>
@@ -15017,12 +15017,12 @@
<translation>通知</translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="110"/>
+ <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="122"/>
<source>Host</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="111"/>
+ <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="127"/>
<source>Permission</source>
<translation type="unfinished"></translation>
</message>
@@ -15037,7 +15037,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="51"/>
+ <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="97"/>
<source>Geolocation</source>
<translation>地理位置</translation>
</message>
@@ -16177,7 +16177,7 @@
<translation type="unfinished">名称：</translation>
</message>
<message>
- <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="193"/>
+ <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="158"/>
<source><no flash cookie selected></source>
<translation type="unfinished"></translation>
</message>
@@ -16187,7 +16187,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="122"/>
+ <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="137"/>
<source>Origin:</source>
<translation type="unfinished"></translation>
</message>
@@ -16222,7 +16222,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="213"/>
+ <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="225"/>
<source>Remove Cookie</source>
<translation type="unfinished"></translation>
</message>
@@ -16648,7 +16648,7 @@
<context>
<name>GreaseMonkeyAddScriptDialog</name>
<message>
- <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.py" line="105"/>
+ <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.ui" line="14"/>
<source>GreaseMonkey Script Installation</source>
<translation type="unfinished"></translation>
</message>
@@ -22299,7 +22299,7 @@
<context>
<name>HgAddSubrepositoryDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py" line="98"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="14"/>
<source>Add Sub-repository</source>
<translation type="unfinished"></translation>
</message>
@@ -23385,7 +23385,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="246"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="73"/>
<source>Resolved</source>
<translation type="unfinished"></translation>
</message>
@@ -23395,7 +23395,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="244"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="83"/>
<source>Unresolved</source>
<translation type="unfinished"></translation>
</message>
@@ -24020,7 +24020,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="317"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="55"/>
<source>Revision</source>
<translation type="unfinished">修订</translation>
</message>
@@ -24299,7 +24299,7 @@
<context>
<name>HgLogBrowserDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="71"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="14"/>
<source>Mercurial Log</source>
<translation type="unfinished"></translation>
</message>
@@ -24329,17 +24329,17 @@
<translation type="unfinished">选择要过滤的区域</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="181"/>
<source>Revision</source>
<translation type="unfinished">修订</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="191"/>
<source>Author</source>
<translation type="unfinished">作者</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="201"/>
<source>Message</source>
<translation type="unfinished">消息</translation>
</message>
@@ -24479,27 +24479,27 @@
<translation type="unfinished">已修改</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="861"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="868"/>
<source>Process Generation Error</source>
<translation type="unfinished">进程生成错误</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="861"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="868"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="634"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="641"/>
<source>The hg process did not finish within 30s.</source>
<translation type="unfinished">hg 进程没有在 30 秒内结束。</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="637"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="644"/>
<source>Could not start the hg executable.</source>
<translation type="unfinished">无法启动 hg 可执行程序。</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="640"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="647"/>
<source>Mercurial Error</source>
<translation type="unfinished"></translation>
</message>
@@ -24590,12 +24590,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1671"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1692"/>
<source>Copy Changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1708"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1729"/>
<source>The project should be reread. Do this now?</source>
<translation type="unfinished"></translation>
</message>
@@ -24630,7 +24630,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1708"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1729"/>
<source>Switch</source>
<translation type="unfinished">转换</translation>
</message>
@@ -24650,7 +24650,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="951"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="958"/>
<source>{0} (large file)</source>
<translation type="unfinished"></translation>
</message>
@@ -24700,12 +24700,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1852"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1891"/>
<source>Find Commit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1852"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1891"/>
<source>'{0}' was not found.</source>
<translation type="unfinished"></translation>
</message>
@@ -24740,25 +24740,35 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="221"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/>
<source>Push Selected Changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="225"/>
<source>Push changes of the selected changeset and its ancestors to a remote repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="226"/>
- <source>Push All Changes</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="228"/>
+ <source>Push All Changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="230"/>
<source>Push all changes to a remote repository</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="218"/>
+ <source>Fetch Changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="235"/>
+ <source>Strip Changesets</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgLogDialog</name>
@@ -28201,7 +28211,7 @@
<context>
<name>HgStatusDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="313"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="14"/>
<source>Mercurial Status</source>
<translation type="unfinished"></translation>
</message>
@@ -28342,7 +28352,7 @@
<translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="708"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="87"/>
<source>Commit</source>
<translation type="unfinished">提交</translation>
</message>
@@ -28462,7 +28472,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="854"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="203"/>
<source>Differences</source>
<translation type="unfinished"></translation>
</message>
@@ -29542,7 +29552,7 @@
<translation>点击移除选中的条目</translation>
</message>
<message>
- <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/>
+ <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/>
<source>&Remove</source>
<translation>移除(&R)</translation>
</message>
@@ -35395,92 +35405,92 @@
<translation>标准按钮</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="40"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="219"/>
<source>Apply</source>
<translation>应用</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="39"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="226"/>
<source>Abort</source>
<translation>终止</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="41"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="233"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="45"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="240"/>
<source>Ignore</source>
<translation>忽略</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="54"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="247"/>
<source>Save all</source>
<translation>全部保存</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="53"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="254"/>
<source>Save</source>
<translation>保存</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="43"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="261"/>
<source>Discard</source>
<translation>放弃</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="56"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="268"/>
<source>Yes to all</source>
<translation>全部是</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="49"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="275"/>
<source>Open</source>
<translation>打开</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="50"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="282"/>
<source>Reset</source>
<translation>重置</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="48"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="289"/>
<source>Ok</source>
<translation>确定</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="46"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="296"/>
<source>No</source>
<translation>否</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="44"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="303"/>
<source>Help</source>
<translation>帮助</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="47"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="310"/>
<source>No to all</source>
<translation>全部否</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="52"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="317"/>
<source>Retry</source>
<translation>重试</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="51"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="324"/>
<source>Restore defaults</source>
<translation>恢复默认</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="55"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="331"/>
<source>Yes</source>
<translation>是</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="42"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="338"/>
<source>Close</source>
<translation>关闭</translation>
</message>
@@ -37230,7 +37240,7 @@
<context>
<name>NoCacheHostsDialog</name>
<message>
- <location filename="../Helpviewer/Network/NoCacheHostsDialog.py" line="52"/>
+ <location filename="../Helpviewer/Network/NoCacheHostsDialog.ui" line="14"/>
<source>Not Cached Hosts</source>
<translation type="unfinished"></translation>
</message>
@@ -37338,7 +37348,7 @@
<translation>按下以可视化地选择坐标，松开以得到坐标</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/NotificationsPage.py" line="81"/>
+ <location filename="../Preferences/ConfigurationPages/NotificationsPage.ui" line="146"/>
<source>Visual Selection</source>
<translation>可视化选择</translation>
</message>
@@ -38010,7 +38020,7 @@
<context>
<name>PasswordsDialog</name>
<message>
- <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="91"/>
+ <location filename="../WebBrowser/Passwords/PasswordsDialog.ui" line="14"/>
<source>Saved Passwords</source>
<translation type="unfinished"></translation>
</message>
@@ -42821,7 +42831,7 @@
<translation>已执行</translation>
</message>
<message>
- <location filename="../DataViews/PyCoverageDialog.py" line="349"/>
+ <location filename="../DataViews/PyCoverageDialog.ui" line="172"/>
<source>Coverage</source>
<translation>覆盖率</translation>
</message>
@@ -42900,7 +42910,7 @@
</translation>
</message>
<message>
- <location filename="../DataViews/PyCoverageDialog.py" line="345"/>
+ <location filename="../DataViews/PyCoverageDialog.ui" line="192"/>
<source>%v/%m Files</source>
<translation type="unfinished">%v/%m 文件</translation>
</message>
@@ -42908,7 +42918,7 @@
<context>
<name>PyProfileDialog</name>
<message>
- <location filename="../DataViews/PyProfileDialog.py" line="233"/>
+ <location filename="../DataViews/PyProfileDialog.ui" line="20"/>
<source>Profile Results</source>
<translation>剖析结果</translation>
</message>
@@ -47581,7 +47591,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="150"/>
+ <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="89"/>
<source>Remove Filters</source>
<translation type="unfinished"></translation>
</message>
@@ -47591,7 +47601,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="178"/>
+ <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="99"/>
<source>Remove Attributes</source>
<translation type="unfinished"></translation>
</message>
@@ -49059,7 +49069,7 @@
<context>
<name>SendRefererWhitelistDialog</name>
<message>
- <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.py" line="52"/>
+ <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.ui" line="14"/>
<source>Send Referer Whitelist</source>
<translation type="unfinished"></translation>
</message>
@@ -50266,7 +50276,7 @@
<translation>复制预览(&P)</translation>
</message>
<message>
- <location filename="../Snapshot/SnapWidget.py" line="531"/>
+ <location filename="../Snapshot/SnapWidget.ui" line="20"/>
<source>eric6 Snapshot</source>
<translation>eric6 快照</translation>
</message>
@@ -51759,7 +51769,7 @@
<context>
<name>Strip</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/strip.py" line="68"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/strip.py" line="73"/>
<source>Stripping changesets from repository</source>
<translation type="unfinished"></translation>
</message>
@@ -51777,12 +51787,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="83"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="85"/>
<source>Strip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="83"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="85"/>
<source>The project should be reread. Do this now?</source>
<translation type="unfinished"></translation>
</message>
@@ -52873,7 +52883,7 @@
<context>
<name>SvnDiffDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="14"/>
<source>Subversion Diff</source>
<translation>Subversion 差异</translation>
</message>
@@ -53176,17 +53186,17 @@
<translation>选择要过滤的区域</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="621"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="112"/>
<source>Revision</source>
<translation>修订</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="618"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="117"/>
<source>Author</source>
<translation>作者</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="141"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="127"/>
<source>Message</source>
<translation>消息</translation>
</message>
@@ -53647,7 +53657,7 @@
<translation><b>URL</b><p>输入模块的 URL 。由于仓库具有标准布局，则该 URL 必须包含主干、标签或分支部分。</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py" line="128"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui" line="45"/>
<source>&URL:</source>
<translation>&URL：</translation>
</message>
@@ -53762,7 +53772,7 @@
<translation type="obsolete">通过文件夹选择对话框或储存库浏览器选择储存库 URL</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py" line="95"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui" line="45"/>
<source>&URL:</source>
<translation>&URL：</translation>
</message>
@@ -55002,7 +55012,7 @@
<context>
<name>SvnStatusDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="394"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="14"/>
<source>Subversion Status</source>
<translation>Subversion 状态</translation>
</message>
@@ -55274,7 +55284,7 @@
<translation>进程生成错误</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="711"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="80"/>
<source>Commit</source>
<translation>提交</translation>
</message>
@@ -60562,7 +60572,7 @@
<context>
<name>UnittestDialog</name>
<message>
- <location filename="../PyUnit/UnittestDialog.py" line="400"/>
+ <location filename="../PyUnit/UnittestDialog.ui" line="14"/>
<source>Unittest</source>
<translation>单元测试</translation>
</message>
@@ -63197,167 +63207,167 @@
<context>
<name>Variable Types</name>
<message>
- <location filename="../Debugger/Config.py" line="17"/>
+ <location filename="../Debugger/Config.py" line="16"/>
<source>Hidden Attributes</source>
<translation>隐藏的属性</translation>
</message>
<message>
+ <location filename="../Debugger/Config.py" line="17"/>
+ <source>None</source>
+ <translation>无</translation>
+ </message>
+ <message>
<location filename="../Debugger/Config.py" line="18"/>
- <source>None</source>
- <translation>无</translation>
+ <source>Type</source>
+ <translation>类型</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="19"/>
- <source>Type</source>
- <translation>类型</translation>
+ <source>Boolean</source>
+ <translation>布尔类型</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="20"/>
- <source>Boolean</source>
- <translation>布尔类型</translation>
+ <source>Integer</source>
+ <translation>整型</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="21"/>
- <source>Integer</source>
- <translation>整型</translation>
+ <source>Long Integer</source>
+ <translation>长整型</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="22"/>
- <source>Long Integer</source>
- <translation>长整型</translation>
+ <source>Float</source>
+ <translation>浮点型</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="23"/>
- <source>Float</source>
- <translation>浮点型</translation>
+ <source>Complex</source>
+ <translation>复数类型</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="24"/>
- <source>Complex</source>
- <translation>复数类型</translation>
+ <source>String</source>
+ <translation>字符串</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="25"/>
- <source>String</source>
- <translation>字符串</translation>
+ <source>Unicode String</source>
+ <translation>Unicode 字符串</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="26"/>
- <source>Unicode String</source>
- <translation>Unicode 字符串</translation>
+ <source>Tuple</source>
+ <translation>元组（Tuple）</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="27"/>
- <source>Tuple</source>
- <translation>元组（Tuple）</translation>
+ <source>List/Array</source>
+ <translation>列表/数组（List/Array）</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="28"/>
- <source>List/Array</source>
- <translation>列表/数组（List/Array）</translation>
+ <source>Dictionary/Hash/Map</source>
+ <translation>字典/散列/映射（Dictionary/Hash/Map）</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="29"/>
- <source>Dictionary/Hash/Map</source>
- <translation>字典/散列/映射（Dictionary/Hash/Map）</translation>
- </message>
- <message>
- <location filename="../Debugger/Config.py" line="30"/>
<source>Dictionary Proxy</source>
<translation>字典代理（Dictionary Proxy）</translation>
</message>
<message>
+ <location filename="../Debugger/Config.py" line="32"/>
+ <source>File</source>
+ <translation>文件</translation>
+ </message>
+ <message>
<location filename="../Debugger/Config.py" line="33"/>
- <source>File</source>
- <translation>文件</translation>
+ <source>X Range</source>
+ <translation>X 范围</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="34"/>
- <source>X Range</source>
- <translation>X 范围</translation>
+ <source>Slice</source>
+ <translation>切片（Slice）</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="35"/>
- <source>Slice</source>
- <translation>切片（Slice）</translation>
+ <source>Buffer</source>
+ <translation>缓冲</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="36"/>
- <source>Buffer</source>
- <translation>缓冲</translation>
+ <source>Class</source>
+ <translation>类</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="37"/>
- <source>Class</source>
- <translation>类</translation>
+ <source>Class Instance</source>
+ <translation>类实例</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="38"/>
- <source>Class Instance</source>
- <translation>类实例</translation>
+ <source>Class Method</source>
+ <translation>类方法</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="39"/>
- <source>Class Method</source>
- <translation>类方法</translation>
+ <source>Class Property</source>
+ <translation>类属性</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="40"/>
- <source>Class Property</source>
- <translation>类属性</translation>
+ <source>Generator</source>
+ <translation>生成器</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="41"/>
- <source>Generator</source>
- <translation>生成器</translation>
- </message>
- <message>
- <location filename="../Debugger/Config.py" line="42"/>
<source>Function</source>
<translation>函数</translation>
</message>
<message>
+ <location filename="../Debugger/Config.py" line="43"/>
+ <source>Builtin Function</source>
+ <translation>内建函数</translation>
+ </message>
+ <message>
<location filename="../Debugger/Config.py" line="44"/>
- <source>Builtin Function</source>
- <translation>内建函数</translation>
+ <source>Code</source>
+ <translation>代码</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="45"/>
- <source>Code</source>
- <translation>代码</translation>
+ <source>Module</source>
+ <translation>模块</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="46"/>
- <source>Module</source>
- <translation>模块</translation>
+ <source>Ellipsis</source>
+ <translation>省略号</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="47"/>
- <source>Ellipsis</source>
- <translation>省略号</translation>
+ <source>Traceback</source>
+ <translation>追踪</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="48"/>
- <source>Traceback</source>
- <translation>追踪</translation>
+ <source>Frame</source>
+ <translation>框架</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="49"/>
- <source>Frame</source>
- <translation>框架</translation>
- </message>
- <message>
- <location filename="../Debugger/Config.py" line="50"/>
<source>Other</source>
<translation>其它</translation>
</message>
<message>
+ <location filename="../Debugger/Config.py" line="30"/>
+ <source>Set</source>
+ <translation>集合</translation>
+ </message>
+ <message>
<location filename="../Debugger/Config.py" line="31"/>
- <source>Set</source>
- <translation>集合</translation>
- </message>
- <message>
- <location filename="../Debugger/Config.py" line="32"/>
<source>Frozen Set</source>
<translation type="unfinished"></translation>
</message>
