--- a/i18n/eric6_zh_CN.ts Sat Aug 26 17:10:43 2017 +0200 +++ b/i18n/eric6_zh_CN.ts Sat Aug 26 19:26:07 2017 +0200 @@ -5476,24 +5476,24 @@ <context> <name>DebugServer</name> <message> - <location filename="../Debugger/DebugServer.py" line="177"/> + <location filename="../Debugger/DebugServer.py" line="179"/> <source>created</source> <comment>must be same as in EditWatchpointDialog</comment> <translation>创建</translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="179"/> + <location filename="../Debugger/DebugServer.py" line="181"/> <source>changed</source> <comment>must be same as in EditWatchpointDialog</comment> <translation>改变</translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="733"/> + <location filename="../Debugger/DebugServer.py" line="744"/> <source>Connection from illegal host</source> <translation>连接非法主机</translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="1353"/> + <location filename="../Debugger/DebugServer.py" line="1364"/> <source> Not connected </source> @@ -5502,29 +5502,29 @@ </translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="733"/> + <location filename="../Debugger/DebugServer.py" line="744"/> <source><p>A connection was attempted by the illegal host <b>{0}</b>. Accept this connection?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="1533"/> + <location filename="../Debugger/DebugServer.py" line="1544"/> <source>Passive debug connection received </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="1547"/> + <location filename="../Debugger/DebugServer.py" line="1558"/> <source>Passive debug connection closed </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="321"/> + <location filename="../Debugger/DebugServer.py" line="323"/> <source>Register Debugger Interface</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="321"/> + <location filename="../Debugger/DebugServer.py" line="323"/> <source><p>The debugger interface <b>{0}</b> has already been registered. Ignoring this request.</p></source> <translation type="unfinished"></translation> </message> @@ -6693,77 +6693,82 @@ <context> <name>DebuggerInterfacePython</name> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="356"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="370"/> <source>Start Debugger</source> - <translation type="obsolete">启动调试器</translation> - </message> - <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="356"/> + <translation type="unfinished">启动调试器</translation> + </message> + <message> + <location filename="../Debugger/DebuggerInterfacePython.py" line="370"/> <source><p>The debugger backend could not be started.</p></source> - <translation type="obsolete"><p>调试器后端无法启动。</p></translation> - </message> - <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="797"/> + <translation type="unfinished"><p>调试器后端无法启动。</p></translation> + </message> + <message> + <location filename="../Debugger/DebuggerInterfacePython.py" line="844"/> <source>Parent Process</source> - <translation type="obsolete">父进程</translation> - </message> - <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="798"/> + <translation type="unfinished">父进程</translation> + </message> + <message> + <location filename="../Debugger/DebuggerInterfacePython.py" line="845"/> <source>Child process</source> - <translation type="obsolete">子进程</translation> + <translation type="unfinished">子进程</translation> </message> <message> <location filename="../Debugger/DebuggerInterfacePython.py" line="147"/> <source><p>No Python2 interpreter configured.</p></source> <translation type="obsolete"><p>没有已配置的 Python2 解释器。</p></translation> </message> + <message> + <location filename="../Debugger/DebuggerInterfacePython.py" line="152"/> + <source><p>No {0} interpreter configured.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Debugger/DebuggerInterfacePython.py" line="846"/> + <source>Client forking</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Debugger/DebuggerInterfacePython.py" line="846"/> + <source>Select the fork branch to follow.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Debugger/DebuggerInterfacePython.py" line="891"/> + <source>Debug Protocol Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Debugger/DebuggerInterfacePython.py" line="891"/> + <source><p>The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{0}</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>DebuggerInterfacePython2</name> <message> <location filename="../Debugger/DebuggerInterfacePython2.py" line="348"/> <source>Start Debugger</source> - <translation type="unfinished">启动调试器</translation> + <translation type="obsolete">启动调试器</translation> </message> <message> <location filename="../Debugger/DebuggerInterfacePython2.py" line="143"/> <source><p>No Python2 interpreter configured.</p></source> - <translation type="unfinished"><p>没有已配置的 Python2 解释器。</p></translation> + <translation type="obsolete"><p>没有已配置的 Python2 解释器。</p></translation> </message> <message> <location filename="../Debugger/DebuggerInterfacePython2.py" line="348"/> <source><p>The debugger backend could not be started.</p></source> - <translation type="unfinished"><p>调试器后端无法启动。</p></translation> + <translation type="obsolete"><p>调试器后端无法启动。</p></translation> </message> <message> <location filename="../Debugger/DebuggerInterfacePython2.py" line="822"/> <source>Parent Process</source> - <translation type="unfinished">父进程</translation> + <translation type="obsolete">父进程</translation> </message> <message> <location filename="../Debugger/DebuggerInterfacePython2.py" line="823"/> <source>Child process</source> - <translation type="unfinished">子进程</translation> - </message> - <message> - <location filename="../Debugger/DebuggerInterfacePython2.py" line="824"/> - <source>Client forking</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/DebuggerInterfacePython2.py" line="824"/> - <source>Select the fork branch to follow.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/DebuggerInterfacePython2.py" line="869"/> - <source>Debug Protocol Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/DebuggerInterfacePython2.py" line="869"/> - <source><p>The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{0}</p></source> - <translation type="unfinished"></translation> + <translation type="obsolete">子进程</translation> </message> </context> <context> @@ -6771,47 +6776,27 @@ <message> <location filename="../Debugger/DebuggerInterfacePython3.py" line="348"/> <source>Start Debugger</source> - <translation>启动调试器</translation> + <translation type="obsolete">启动调试器</translation> </message> <message> <location filename="../Debugger/DebuggerInterfacePython3.py" line="348"/> <source><p>The debugger backend could not be started.</p></source> - <translation><p>调试器后端无法启动。</p></translation> + <translation type="obsolete"><p>调试器后端无法启动。</p></translation> </message> <message> <location filename="../Debugger/DebuggerInterfacePython3.py" line="822"/> <source>Parent Process</source> - <translation>父进程</translation> + <translation type="obsolete">父进程</translation> </message> <message> <location filename="../Debugger/DebuggerInterfacePython3.py" line="823"/> <source>Child process</source> - <translation>子进程</translation> - </message> - <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="824"/> - <source>Client forking</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="824"/> - <source>Select the fork branch to follow.</source> - <translation type="unfinished"></translation> + <translation type="obsolete">子进程</translation> </message> <message> <location filename="../Debugger/DebuggerInterfacePython3.py" line="143"/> <source><p>No Python3 interpreter configured.</p></source> - <translation><p>没有已配置的 Python3 解释器。</p></translation> - </message> - <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="869"/> - <source>Debug Protocol Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="869"/> - <source><p>The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{0}</p></source> - <translation type="unfinished"></translation> + <translation type="obsolete"><p>没有已配置的 Python3 解释器。</p></translation> </message> </context> <context> @@ -23037,12 +23022,12 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="140"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="141"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="140"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="141"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> @@ -23518,27 +23503,27 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="55"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="57"/> <source>Mercurial Incoming Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="57"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="59"/> <source>Mercurial Outgoing Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="144"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="146"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="144"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="146"/> <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/HgBookmarksInOutDialog.py" line="177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="179"/> <source>no bookmarks found</source> <translation type="unfinished"></translation> </message> @@ -23628,82 +23613,82 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="147"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="147"/> <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/HgBookmarksListDialog.py" line="185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="186"/> <source>no bookmarks defined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="46"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="47"/> <source>Refresh</source> <translation type="unfinished">刷新</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="48"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="49"/> <source>Press to refresh the bookmarks display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="403"/> <source>Switch to</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="407"/> <source>Delete</source> <translation type="unfinished">删除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="409"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="410"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="414"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="417"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="418"/> <source>Push</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="434"/> <source>Switch</source> <translation type="unfinished">转换</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="434"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="452"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="453"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="452"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="453"/> <source><p>Shall the bookmark <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="469"/> <source>Rename Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="469"/> <source><p>Enter the new name for bookmark <b>{0}</b>:</p></source> <translation type="unfinished"></translation> </message> @@ -24095,7 +24080,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="247"/> <source>Resolved</source> <translation type="unfinished"></translation> </message> @@ -24105,7 +24090,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="245"/> <source>Unresolved</source> <translation type="unfinished"></translation> </message> @@ -24175,27 +24160,27 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="54"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="55"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="56"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="57"/> <source>Press to refresh the list of conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="158"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="158"/> <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/HgConflictsListDialog.py" line="248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="249"/> <source>Unknown Status</source> <translation type="unfinished"></translation> </message> @@ -24331,12 +24316,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="172"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="172"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> @@ -24730,7 +24715,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="319"/> <source>Revision</source> <translation type="unfinished">修订</translation> </message> @@ -24805,17 +24790,17 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="122"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="122"/> <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/GpgExtension/HgGpgSignaturesDialog.py" line="153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="155"/> <source>no signatures found</source> <translation type="unfinished"></translation> </message> @@ -28202,42 +28187,42 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="201"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="201"/> <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/QueuesExtension/HgQueuesListDialog.py" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="234"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="60"/> - <source>applied</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="62"/> + <source>applied</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="64"/> <source>guarded</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="65"/> + <source>missing</source> + <translation type="unfinished">遗漏</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="308"/> + <source>unknown</source> + <translation type="unfinished">未知</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="63"/> - <source>missing</source> - <translation type="unfinished">遗漏</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="306"/> - <source>unknown</source> - <translation type="unfinished">未知</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="61"/> <source>not applied</source> <translation type="unfinished"></translation> </message> @@ -29120,56 +29105,56 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="56"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="58"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="58"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="60"/> <source>Press to refresh the list of shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="75"/> - <source>Restore selected shelve</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="77"/> - <source>Delete selected shelves</source> + <source>Restore selected shelve</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="79"/> + <source>Delete selected shelves</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="81"/> <source>Delete all shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="189"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="189"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="375"/> <source>%n file(s) changed</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="375"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="377"/> <source>%n line(s) inserted</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="377"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="379"/> <source>%n line(s) deleted</source> <translation type="unfinished"> <numerusform></numerusform> @@ -30046,72 +30031,72 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> <source>Mercurial Branches List</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="113"/> <source>Status</source> <translation type="unfinished">状态</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="157"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="157"/> <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/HgTagBranchListDialog.py" line="288"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="289"/> <source>active</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="294"/> <source>yes</source> <translation type="unfinished">是</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="49"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="50"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="51"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="52"/> <source>Press to refresh the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="434"/> <source>Switch to</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="477"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="478"/> <source>Close Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="451"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="452"/> <source>Switch</source> <translation type="unfinished">转换</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="451"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="452"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="471"/> <source>The branch "default" cannot be closed. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="477"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="478"/> <source><p>Shall the branch <b>{0}</b> really be closed?</p></source> <translation type="unfinished"></translation> </message> @@ -40925,22 +40910,22 @@ <context> <name>PreviewProcessingThread</name> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="461"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="483"/> <source><p>No preview available for this type of file.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../UI/Previewers/PreviewerHTML.py" line="652"/> + <source><p>ReStructuredText preview requires the <b>python-docutils</b> package.<br/>Install it with your package manager, 'pip install docutils' or see <a href="http://pypi.python.org/pypi/docutils">this page.</a></p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../UI/Previewers/PreviewerHTML.py" line="596"/> - <source><p>ReStructuredText preview requires the <b>python-docutils</b> package.<br/>Install it with your package manager, 'pip install docutils' or see <a href="http://pypi.python.org/pypi/docutils">this page.</a></p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="540"/> <source><p>ReStructuredText preview requires the <b>sphinx</b> package.<br/>Install it with your package manager,'pip install Sphinx' or see <a href="http://pypi.python.org/pypi/Sphinx">this page.</a></p><p>Alternatively you may disable Sphinx usage on the Editor, Filehandling configuration page.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="624"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="680"/> <source><p>Markdown preview requires the <b>python-markdown</b> package.<br/>Install it with your package manager, 'pip install docutils' or see <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></source> <translation type="unfinished"></translation> </message> @@ -40948,37 +40933,37 @@ <context> <name>PreviewerHTML</name> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="75"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="77"/> <source>Select to enable JavaScript for HTML previews</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="74"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="76"/> <source>Enable JavaScript</source> <translation>允许 JavaScript</translation> </message> <message> + <location filename="../UI/Previewers/PreviewerHTML.py" line="83"/> + <source>Select to enable support for Server Side Includes</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../UI/Previewers/PreviewerHTML.py" line="81"/> - <source>Select to enable support for Server Side Includes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="79"/> <source>Enable Server Side Includes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="178"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="190"/> <source><p>No preview available for this type of file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="232"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="252"/> <source>Preview - {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="234"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="254"/> <source>Preview</source> <translation>预览</translation> </message> @@ -55334,12 +55319,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="102"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="103"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="102"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="103"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> @@ -55414,22 +55399,22 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="88"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="89"/> <source>Files (relative to {0}):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="150"/> <source>No changelists found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="119"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="120"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="119"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="120"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> @@ -55710,7 +55695,7 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="156"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="157"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> @@ -55720,7 +55705,7 @@ <translation> (binary)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="156"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="157"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> @@ -55830,22 +55815,22 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="193"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="194"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="213"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="214"/> <source>There is no difference.</source> <translation>没有差异。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="406"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="407"/> <source>Save Diff</source> <translation>保存差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="373"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="374"/> <source>Patch Files (*.diff)</source> <translation>补丁文件 (*.diff)</translation> </message> @@ -55855,12 +55840,12 @@ <translation>无可用临时文件夹。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="193"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="194"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="406"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="407"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>补丁文件 <b>{0}</b> 无法保存。<br />原因:{1}</p></translation> </message> @@ -55872,27 +55857,27 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="391"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>补丁文件 <b>{0}</b> 已经存在。是否覆盖?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="226"/> - <source><Start></source> - <translation><开始></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="227"/> + <source><Start></source> + <translation><开始></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="228"/> <source><End></source> <translation><结束></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="48"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="49"/> <source>Refresh</source> <translation>刷新</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="50"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="51"/> <source>Press to refresh the display</source> <translation>点击刷新显示</translation> </message> @@ -56073,17 +56058,17 @@ <translation>选择要过滤的区域</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="662"/> <source>Revision</source> <translation>修订</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="658"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="659"/> <source>Author</source> <translation>作者</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="166"/> <source>Message</source> <translation>消息</translation> </message> @@ -56213,17 +56198,17 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="93"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="94"/> <source>Added</source> <translation>已添加</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="94"/> - <source>Deleted</source> - <translation>已删除</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="95"/> + <source>Deleted</source> + <translation>已删除</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="96"/> <source>Modified</source> <translation>已修改</translation> </message> @@ -56233,17 +56218,17 @@ <translation>Subversion 错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="313"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="314"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="313"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="314"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="96"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="97"/> <source>Replaced</source> <translation type="unfinished"></translation> </message> @@ -57758,12 +57743,12 @@ <translation>Subversion 错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="268"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="269"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="268"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="269"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> @@ -57879,7 +57864,7 @@ <context> <name>SvnStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="394"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="395"/> <source>Subversion Status</source> <translation>Subversion 状态</translation> </message> @@ -57996,217 +57981,217 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="59"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="60"/> <source>Refresh</source> <translation>刷新</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="61"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="62"/> <source>Press to refresh the status display</source> <translation>点击刷新状态显示</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="85"/> <source>Commit changes to repository...</source> <translation>将更改提交到储存库中…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="91"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="92"/> <source>Add to repository</source> <translation>添加到储存库</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="98"/> <source>Revert changes</source> <translation>还原改变</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="103"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="104"/> <source>Add to Changelist</source> <translation>添加更改列表</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="948"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="949"/> <source>Remove from Changelist</source> <translation>从更改列表中移除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="859"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="860"/> <source>Lock</source> <translation>闭锁</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="876"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="877"/> <source>Unlock</source> <translation>解锁</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="114"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="115"/> <source>Break lock</source> <translation>Break lock</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="117"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="118"/> <source>Steal lock</source> <translation>Steal lock</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="121"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="122"/> <source>Adjust column sizes</source> <translation>调整列宽</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="161"/> - <source>added</source> - <translation>已添加</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="162"/> + <source>added</source> + <translation>已添加</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="163"/> <source>deleted</source> <translation>已删除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="175"/> <source>modified</source> <translation>已修改</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="169"/> <source>unversioned</source> <translation>unversioned</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="191"/> - <source>locked</source> - <translation>已闭锁</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="192"/> - <source>other lock</source> - <translation>其它闭锁</translation> + <source>locked</source> + <translation>已闭锁</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="193"/> - <source>stolen lock</source> - <translation>stolen 闭锁</translation> + <source>other lock</source> + <translation>其它闭锁</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="194"/> + <source>stolen lock</source> + <translation>stolen 闭锁</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="195"/> <source>broken lock</source> <translation>broken 闭锁</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="190"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="191"/> <source>not locked</source> <translation>未闭锁</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="174"/> <source>normal</source> <translation>标准</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="164"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="165"/> <source>replaced</source> <translation>已替换</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="175"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="176"/> <source>conflict</source> <translation>冲突</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="166"/> - <source>external</source> - <translation>外部</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="167"/> + <source>external</source> + <translation>外部</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="168"/> <source>ignored</source> <translation>已忽略</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="169"/> - <source>missing</source> - <translation>遗漏</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="170"/> + <source>missing</source> + <translation>遗漏</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="171"/> <source>type error</source> <translation>类型错误</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="199"/> + <source>no</source> + <translation>否</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="198"/> - <source>no</source> - <translation>否</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="197"/> <source>yes</source> <translation>是</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="401"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="402"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="711"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="712"/> <source>Commit</source> <translation>提交</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="836"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="837"/> <source>There are no uncommitted changes available/selected.</source> <translation>没有未提交的更改可用或被选择。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="751"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="752"/> <source>Add</source> <translation>添加</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="751"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="752"/> <source>There are no unversioned entries available/selected.</source> <translation>没有未版本化的条目可用或被选择。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="797"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="798"/> <source>Revert</source> <translation>还原</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="859"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="860"/> <source>There are no unlocked files available/selected.</source> <translation>没有未解锁的文件可用或被选择。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="912"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="913"/> <source>There are no locked files available/selected.</source> <translation>没有闭锁的文件可用或被选择。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="894"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="895"/> <source>Break Lock</source> <translation>Break Lock</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="912"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="913"/> <source>Steal Lock</source> <translation>Steal Lock</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="929"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="930"/> <source>There are no files available/selected not belonging to a changelist.</source> <translation>没有不属于更改列表的文件可用或被选择。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="948"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="949"/> <source>There are no files available/selected belonging to a changelist.</source> <translation>没有属于更改列表的文件可用或被选择。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="401"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="402"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> @@ -58271,42 +58256,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="93"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="94"/> <source>Show differences</source> <translation type="unfinished">显示差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="100"/> <source>Restore missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="623"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="624"/> <source>all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="816"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="711"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="712"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="797"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="798"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="87"/> <source>Select all for commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="88"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="89"/> <source>Deselect all from commit</source> <translation type="unfinished"></translation> </message> @@ -58321,17 +58306,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="96"/> <source>Show differences side-by-side</source> <translation>并排显示差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="843"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="844"/> <source>Side-by-Side Diff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="843"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="844"/> <source>Only one file with uncommitted changes must be selected.</source> <translation type="unfinished"></translation> </message> @@ -58507,42 +58492,42 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="94"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="95"/> <source>Subversion Branches List</source> <translation>Subversion 分支列表</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="125"/> <source>Subversion Error</source> <translation>Subversion 错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="105"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="106"/> <source>The URL of the project repository could not be retrieved from the working copy. The list operation will be aborted</source> <translation>无法从工作副本中检索项目仓库的 URL 。列表操作将被终止</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="125"/> <source>The URL of the project repository has an invalid format. The list operation will be aborted</source> <translation>项目仓库的 URL 包含无效格式。列表操作将被终止</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="153"/> <source>Subversion List</source> <translation>Subversion 列表</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="142"/> <source>Enter the repository URL containing the tags or branches</source> <translation>输入包含标签或分支的仓库 URL</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="153"/> <source>The repository URL is empty. Aborting...</source> <translation>仓库 URL 为空。终止…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="169"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="170"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> @@ -58552,7 +58537,7 @@ <translation>已安装的 PySvn 版本应为 1.4.0 或更高。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="169"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="170"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message>