--- a/eric6/i18n/eric6_zh_CN.ts Mon Mar 09 19:51:02 2020 +0100 +++ b/eric6/i18n/eric6_zh_CN.ts Mon Mar 09 19:51:19 2020 +0100 @@ -30816,7 +30816,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> @@ -30826,7 +30826,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -30946,62 +30946,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Delete Bookmark</source> <translation type="unfinished">删除书签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3557"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3590"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3632"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3738"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3782"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -31967,42 +31967,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="91"/> <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/HgClient.py" line="133"/> - <source>Did not receive the 'hello' message.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="135"/> - <source>Received data on unexpected channel.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="140"/> + <source>Did not receive the 'hello' message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="142"/> + <source>Received data on unexpected channel.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="152"/> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="160"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="165"/> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="383"/> <source>For message see output dialog.</source> <translation type="unfinished"></translation> </message> @@ -32409,32 +32409,32 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="73"/> <source>Input</source> - <translation type="obsolete">输入</translation> + <translation type="unfinished">输入</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="98"/> <source>&Send</source> - <translation type="obsolete">发送(&S)</translation> + <translation type="unfinished">发送(&S)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="101"/> <source>Alt+S</source> - <translation type="obsolete">Alt+S</translation> + <translation type="unfinished">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="115"/> <source>Select to switch the input field to password mode</source> - <translation type="obsolete">选择将输入区域转换成密码模式</translation> + <translation type="unfinished">选择将输入区域转换成密码模式</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="118"/> <source>&Password Mode</source> - <translation type="obsolete">密码模式(&P)</translation> + <translation type="unfinished">密码模式(&P)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="121"/> <source>Alt+P</source> - <translation type="obsolete">Alt+P</translation> + <translation type="unfinished">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="172"/> @@ -32446,6 +32446,26 @@ <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> + <source>Press to send the input to the subversion process</source> + <translation type="obsolete">点击将输入发送到 subversion 进程</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> + <source>Enter data to be sent to the subversion process</source> + <translation type="obsolete">输入要发送到 subversion 进程的数据</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> + <source>Press to send the input to the Mercurial process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> + <source>Enter data to be sent to the Mercurial process</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgDiffDialog</name> @@ -52816,17 +52836,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1621"/> + <location filename="../Preferences/__init__.py" line="1622"/> <source>Export Preferences</source> <translation>导出首选项</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1649"/> + <location filename="../Preferences/__init__.py" line="1650"/> <source>Import Preferences</source> <translation>导入首选项</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1649"/> + <location filename="../Preferences/__init__.py" line="1650"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>属性文件 (*.ini);;所有文件 (*)</translation> </message> @@ -62007,27 +62027,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="242"/> <source>pyuic / pyside-uic Options</source> <translation>pyuic / pyside-uic 选项</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="248"/> + <source>Indent Width:</source> + <translation>缩进宽度:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> + <source>Select the indent width (default: 4)</source> + <translation>缩进宽度(默认值:4)</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="287"/> + <source>Generate imports relative to '.'</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="216"/> - <source>Indent Width:</source> - <translation>缩进宽度:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> - <source>Select the indent width (default: 4)</source> - <translation>缩进宽度(默认值:4)</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> - <source>Generate imports relative to '.'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="184"/> <source>Tools Directory:</source> <translation type="unfinished"></translation> </message> @@ -62047,10 +62067,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.py" line="67"/> + <location filename="../Preferences/ConfigurationPages/QtPage.py" line="72"/> <source>Sample: {0}designer{1}</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> + <source>PySide2 Tools</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="232"/> + <source>Enter the path of the PySide2 tools directory, if they are not found.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Queues</name> @@ -86226,12 +86256,12 @@ <translation type="obsolete">输入样式表文件的名称</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="36"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="37"/> <source>Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="62"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="63"/> <source>System</source> <translation type="unfinished"></translation> </message>