--- a/i18n/eric5_zh_CN.GB2312.ts Sat Jun 02 17:41:24 2012 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Sun Jun 03 12:51:15 2012 +0200 @@ -42090,87 +42090,87 @@ <translation type="obsolete">svn 进程已由退出代码 %1 结束</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="196"/> <source>The svn process did not finish within 30s.</source> <translation>svn 进程在 30 秒内不结束。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="197"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="198"/> <source>Could not start the svn executable.</source> <translation>无法开始 svn 执行。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="223"/> <source>Create project in repository</source> <translation>在储存库中创建项目</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="223"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation>无法在储存库中创建项目。已给储存库可能不存在或储存库服务已关闭。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="245"/> <source>New project</source> <translation>新建项目</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="245"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation>无法从储存库中校验项目。<br />恢复原始内容。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="314"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="315"/> <source>Importing project into Subversion repository</source> <translation>将项目导入到版本控制储存库中</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="364"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="365"/> <source>Subversion Checkout</source> <translation>版本控制校验</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="427"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation>标签必须是标准标签或分支标签。请从列表中选择。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="385"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="386"/> <source>Checking project out of Subversion repository</source> <translation>正在从版本控制储存库中检查项目</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="427"/> <source>Subversion Export</source> <translation>版本控制导出</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="446"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="447"/> <source>Exporting project from Subversion repository</source> <translation>正在从版本控制储存库中导出项目</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="530"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="531"/> <source>Commiting changes to Subversion repository</source> <translation>正在将改变提交到版本控制储存库中</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="586"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="587"/> <source>Synchronizing with the Subversion repository</source> <translation>正在与版本控制储存库同步</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="687"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="688"/> <source>Adding files/directories to the Subversion repository</source> <translation>将文件或文件夹添加到版本控制储存库</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="786"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="787"/> <source>Adding directory trees to the Subversion repository</source> <translation>将目录树添加到版本控制储存库</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="822"/> <source>Removing files/directories from the Subversion repository</source> <translation>从版本控制储存库移除文件或文件夹</translation> </message> @@ -42180,17 +42180,17 @@ <translation type="obsolete">正在移动 %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1127"/> <source>Subversion Error</source> <translation>版本控制错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="987"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="988"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>项目储存库的 URL 无法从工作拷贝中检索。标签操作将被终止</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1011"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1012"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>项目储存库的 URL 包含无效格式。标签操作将被终止</translation> </message> @@ -42200,17 +42200,17 @@ <translation type="obsolete">在版本控制储存库中标记 %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1075"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1076"/> <source>Reverting changes</source> <translation>还原改变</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1103"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>项目储存库的 URL 无法从工作拷贝中检索。转换操作将被终止</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1127"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>项目储存库的 URL 包含无效格式。转换操作将被终止</translation> </message> @@ -42230,12 +42230,12 @@ <translation type="obsolete">清除 %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1564"/> <source>Subversion command</source> <translation>版本控制命令</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1670"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1671"/> <source>Resolving conficts</source> <translation>解析冲突</translation> </message> @@ -42245,72 +42245,72 @@ <translation type="obsolete">复制 %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1776"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1777"/> <source>Subversion Set Property</source> <translation>版本控制设置属性</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1809"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1810"/> <source>You have to supply a property name. Aborting.</source> <translation>必须提供一个属性名。终止。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1827"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1828"/> <source>Subversion Delete Property</source> <translation>版本控制删除属性</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1647"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1648"/> <source>Enter property name</source> <translation>输入属性名</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="924"/> <source>Subversion Log</source> <translation>版本控制日志</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="924"/> <source>Select number of entries to show.</source> <translation>选择要显示的条目数。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1993"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1994"/> <source>Locking in the Subversion repository</source> <translation>在版本控制储存库中锁定</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2031"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2032"/> <source>Unlocking in the Subversion repository</source> <translation>在版本控制储存库中解锁</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2076"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2077"/> <source>Relocating</source> <translation>重新定位</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2103"/> <source>Repository Browser</source> <translation>储存库浏览器</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2103"/> <source>Enter the repository URL.</source> <translation>输入储存库 URL。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2127"/> <source>Remove from changelist</source> <translation>从更改列表中移除</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2162"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2164"/> <source>Add to changelist</source> <translation>添加更改列表</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2152"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2153"/> <source>Enter name of the changelist:</source> <translation>输入更改列表名称:</translation> </message> @@ -42334,22 +42334,22 @@ </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1792"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1793"/> <source>Property set.</source> <translation>属性设置。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1842"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1843"/> <source>Property deleted.</source> <translation>属性已删除。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1974"/> <source>Subversion Lock</source> <translation>版本控制锁定</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1974"/> <source>Enter lock comment</source> <translation>输入锁定注释</translation> </message> @@ -42519,53 +42519,53 @@ <translation>unversioned</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="193"/> <source>The svn process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="883"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="884"/> <source>Moving {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1047"/> <source>Tagging {0} in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1148"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1149"/> <source>Switching to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1250"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1251"/> <source>Merging {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1527"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1528"/> <source>Cleaning up {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1709"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1710"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="330"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="331"/> <source>Imported revision {0}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="555"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="556"/> <source>Committed revision {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1155"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1156"/> <source>Revision {0}. </source> <translation type="unfinished"></translation> @@ -42776,6 +42776,96 @@ </message> </context> <context> + <name>SvnChangeListsDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="14"/> + <source>Subversion Change Lists</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="23"/> + <source>Change Lists:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="36"/> + <source><b>Change Lists</b> +<p>Select a change list here to see the associated files in the list below.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="63"/> + <source><b>Files</b> +<p>This shows a list of files associated with the change list selected above.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="80"/> + <source>Errors</source> + <translation type="unfinished">错误</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="99"/> + <source>Input</source> + <translation type="unfinished">输入</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="121"/> + <source>Press to send the input to the subversion process</source> + <translation type="unfinished">点击将输入发送到版本控制进程</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="124"/> + <source>&Send</source> + <translation type="unfinished">发送(&S)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="127"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="134"/> + <source>Enter data to be sent to the subversion process</source> + <translation type="unfinished">输入要发送到版本控制进程的数据</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="141"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished">选择将输入区域转换成密码模式</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="144"/> + <source>&Password Mode</source> + <translation type="unfinished">密码模式(&P)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="147"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="75"/> + <source>Files (relative to {0}):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="138"/> + <source>No changelists found</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="109"/> + <source>Process Generation Error</source> + <translation type="unfinished">进程生成错误</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="109"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>SvnCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.ui" line="14"/> @@ -42866,57 +42956,62 @@ <context> <name>SvnCommitDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="13"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="14"/> <source>Subversion</source> <translation>版本控制</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="19"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="20"/> <source>Commit Message</source> <translation>提交消息</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="25"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="26"/> <source>Enter the log message.</source> <translation>输入日志消息。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="28"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="29"/> <source><b>Log Message</b> <p>Enter the log message for the commit action.</p></source> <translation><b>日志消息</b> <p>为提交动作输入日志消息。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="42"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="43"/> <source>Recent commit messages</source> <translation>最近提交消息</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="49"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="50"/> <source>Select a recent commit message to use</source> <translation>选择使用一个最近提交消息</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="59"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="60"/> <source>Changelists</source> <translation>更改列表</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="65"/> <source>Enter the list of changelists separated by ';'</source> - <translation>输入更改列表的列表,用“;”分隔</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="72"/> + <translation type="obsolete">输入更改列表的列表,用“;”分隔</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="73"/> <source>Select to keep the changelists</source> <translation>选择保留更改列表</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="75"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="76"/> <source>Keep changelists</source> <translation>保留更改列表</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="66"/> + <source>Select the change lists to limit the commit</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnCopyDialog</name> @@ -44640,122 +44735,122 @@ <translation><b>显示状态</b><p>显示本地项目的状态。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="221"/> <source>Tag in repository</source> <translation>在储存库中标记</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="221"/> <source>&Tag in repository...</source> <translation>在储存库中标记(&T)……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="225"/> <source>Tag the local project in the repository</source> <translation>在储存库中标记本地项目</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="228"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>在储存库中标记</b><p>在储存库中标记本地项目。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="235"/> <source>Export from repository</source> <translation>从储存库导出</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="235"/> <source>&Export from repository...</source> <translation>从储存库导出(&E)……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="224"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="239"/> <source>Export a project from the repository</source> <translation>从储存库中导出一个项目</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="227"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="242"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>从储存库导出</b><p>从储存库导出一个项目。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> <source>Command options</source> <translation>命令选项</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> - <source>Command &options...</source> - <translation>命令选项(&o)……</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="237"/> - <source>Show the VCS command options</source> - <translation>显示版本控制系统命令选项</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="238"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> - <translation><b>命令选项……</b><p>显示一个对话框以编辑版本控制系统命令选项。</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> - <source>Revert changes</source> - <translation>还原改变</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> - <source>Re&vert changes</source> - <translation>还原改变(&v)</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> - <source>Revert all changes made to the local project</source> - <translation>还原所有改变到本地项目中</translation> + <source>Command &options...</source> + <translation>命令选项(&o)……</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="252"/> + <source>Show the VCS command options</source> + <translation>显示版本控制系统命令选项</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="253"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation><b>命令选项……</b><p>显示一个对话框以编辑版本控制系统命令选项。</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <source>Revert changes</source> + <translation>还原改变</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <source>Re&vert changes</source> + <translation>还原改变(&v)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="264"/> + <source>Revert all changes made to the local project</source> + <translation>还原所有改变到本地项目中</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="267"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>还原改变</b><p>还原所有改变到本地项目中。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> <source>Merge</source> <translation>合并</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> <source>Mer&ge changes...</source> <translation>合并更改(&g)……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="263"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="278"/> <source>Merge changes of a tag/revision into the local project</source> <translation>将标签或修订本的改变合并到当前项目</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="266"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="281"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation><b>合并</b><p>将标签或修订本的改变合并到当前项目。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="288"/> <source>Switch</source> <translation>转换</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="288"/> <source>S&witch...</source> <translation>转换(&w)……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="292"/> <source>Switch the local copy to another tag/branch</source> <translation>转换本地副本到另一个标签或分支</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="295"/> <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> <translation><b>转换</b><p>转换本地副本到另一个标签或分支。</p></translation> </message> @@ -44780,258 +44875,273 @@ <translation type="obsolete"><b>解析冲突</b><p>解析本地项目的所有冲突。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> <source>Cleanup</source> <translation>清除</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> <source>Cleanu&p</source> <translation>清除(&p)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="318"/> <source>Cleanup the local project</source> <translation>清除本地项目</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="321"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>清除</b><p>执行对本地项目的清除。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="328"/> <source>Execute command</source> <translation>执行命令</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="328"/> <source>E&xecute command...</source> <translation>执行命令(&x)……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="331"/> <source>Execute an arbitrary VCS command</source> <translation>执行任意的版本控制系统命令</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="334"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation><b>执行命令</b><p>打开一个对话框以输入任意一个版本控制系统命令。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="341"/> <source>List tags</source> <translation>列出标签</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="341"/> <source>List tags...</source> <translation>列出标签……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> <source>List tags of the project</source> <translation>列出项目的标签</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="332"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="347"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>列出标签</b><p>列出项目的标签。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="354"/> <source>List branches</source> <translation>列出分支</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="354"/> <source>List branches...</source> <translation>列出分支……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="342"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches of the project</source> <translation>列出项目的分支</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="345"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="360"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>列出分支</b><p>列出项目的分支。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="367"/> <source>List repository contents</source> <translation>列出储存库内容</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="367"/> <source>List repository contents...</source> <translation>列出储存库内容……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="355"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="370"/> <source>Lists the contents of the repository</source> <translation>列出储存库的内容</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="373"/> <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation><b>列出储存库内容</b><p>列出储存库的内容。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="380"/> <source>Set Property</source> <translation>设置属性</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="380"/> <source>Set Property...</source> <translation>设置属性……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="383"/> <source>Set a property for the project files</source> <translation>为项目文件设置一个属性</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation><b>设置属性</b><p>为项目文件设置一个属性。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> <source>List Properties</source> <translation>列出属性</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> <source>List Properties...</source> <translation>列出属性……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="381"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="396"/> <source>List properties of the project files</source> <translation>列出项目文件的属性</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation><b>列出属性</b><p>列出项目文件的属性。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source>Delete Property</source> <translation>删除属性</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source>Delete Property...</source> <translation>删除属性……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="409"/> <source>Delete a property for the project files</source> <translation>从项目文件中删除一个属性</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="397"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="412"/> <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> <translation><b>删除属性</b><p>从项目文件中删除一个属性。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> <source>Relocate</source> <translation>重定位</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> <source>Relocate...</source> <translation>重定位……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="408"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="423"/> <source>Relocate the working copy to a new repository URL</source> <translation>将工作副本重定位到一个新的储存库 URL</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="411"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="426"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation><b>重定位</b><p>将工作副本重定位到一个新的储存库 URL 。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="433"/> <source>Repository Browser</source> <translation>储存库浏览器</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="433"/> <source>Repository Browser...</source> <translation>储存库浏览器……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="437"/> <source>Show the Repository Browser dialog</source> <translation>显示储存库浏览器对话框</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="440"/> <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> <translation><b>储存库浏览器</b><p>显示储存库浏览器对话框。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> <source>Configure</source> <translation>配置</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> <source>Configure...</source> <translation>配置……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="450"/> <source>Show the configuration dialog with the Subversion page selected</source> <translation>显示配置对话框并自动选择版本控制页面</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="438"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="453"/> <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> <translation><b>配置</b><p>显示配置对话框并自动选择版本控制页面。</p></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> + <source>Show repository info</source> + <translation>显示储存库信息</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> + <source>Show some repository related information for the local project</source> + <translation>显示本地项目的一些储存库相关信息</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/> + <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> + <translation><b>显示储存库信息</b><p>显示本地项目的一些储存库相关信息。</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="302"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="302"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="305"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="308"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="191"/> - <source>Show repository info</source> - <translation>显示储存库信息</translation> + <source>Show change lists</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> - <source>Show some repository related information for the local project</source> - <translation>显示本地项目的一些储存库相关信息</translation> + <source>Show the change lists and associated files of the local project</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="198"/> - <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> - <translation><b>显示储存库信息</b><p>显示本地项目的一些储存库相关信息。</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> - <source>Conflicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> - <source>Con&flicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> <translation type="unfinished"></translation> </message> </context> @@ -45619,17 +45729,17 @@ <translation>添加更改列表</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="784"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="785"/> <source>Remove from Changelist</source> <translation>从更改列表中移除</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="701"/> <source>Lock</source> <translation>闭锁</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="716"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="717"/> <source>Unlock</source> <translation>解锁</translation> </message> @@ -45749,57 +45859,57 @@ <translation type="obsolete">无法启动进程 %1,在搜索路径中。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="584"/> <source>Commit</source> <translation>提交</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="682"/> <source>There are no uncommitted changes available/selected.</source> <translation>没有未提交的更改可用或被选择。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="622"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="623"/> <source>Add</source> <translation>添加</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="622"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="623"/> <source>There are no unversioned entries available/selected.</source> <translation>没有未版本化的条目可用或被选择。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="664"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="665"/> <source>Revert</source> <translation>还原</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="701"/> <source>There are no unlocked files available/selected.</source> <translation>没有未解锁的文件可用或被选择。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="750"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="751"/> <source>There are no locked files available/selected.</source> <translation>没有闭锁的文件可用或被选择。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="733"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="734"/> <source>Break Lock</source> <translation>Break Lock</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="750"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="751"/> <source>Steal Lock</source> <translation>Steal Lock</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="766"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="767"/> <source>There are no files available/selected not belonging to a changelist.</source> <translation>没有不属于更改列表的文件可用或被选择。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="784"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="785"/> <source>There are no files available/selected belonging to a changelist.</source> <translation>没有属于更改列表的文件可用或被选择。</translation> </message> @@ -45879,7 +45989,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="503"/> <source>all</source> <translation type="unfinished"></translation> </message> @@ -45889,17 +45999,17 @@ <translation type="obsolete">差异</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="682"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="584"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="664"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="665"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> @@ -58821,7 +58931,7 @@ <translation type="obsolete"><h3>储存库信息</h3><table><tr><td><b>版本控制版本</b></td><td>%1</td></tr><tr><td><b>URL</b></td><td>%2</td></tr><tr><td><b>当前修订</b></td><td>%3</td></tr><tr><td><b>已提交的修订</b></td><td>%4</td></tr><tr><td><b>提交日期</b></td><td>%5</td></tr><tr><td><b>提交时间</b></td><td>%6</td></tr><tr><td><b>最终作者</b></td><td>%7</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1604"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1605"/> <source>unknown</source> <translation>未知</translation> </message> @@ -58831,12 +58941,12 @@ <translation type="obsolete"><h3>储存库信息</h3><table><tr><td><b>PySvn 版本</b></td><td>%1</td></tr><tr><td><b>版本控制版本</b></td><td>%2</td></tr><tr><td><b>版本控制 API 版本</b></td><td>%3</td></tr><tr><td><b>URL</b></td><td>%4</td></tr><tr><td><b>当前修订</b></td><td>%5</td></tr><tr><td><b>已提交的修订</b></td><td>%6</td></tr><tr><td><b>提交日期</b></td><td>%7</td></tr><tr><td><b>提交时间</b></td><td>%8</td></tr><tr><td><b>最终作者</b></td><td>%9</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1474"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1605"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1606"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation type="unfinished"></translation> </message>