--- a/eric6/i18n/eric6_zh_CN.ts Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/i18n/eric6_zh_CN.ts Sun Feb 02 11:27:46 2020 +0100 @@ -1845,32 +1845,32 @@ <translation>添加文件夹(&F)</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="151"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="154"/> <source>&Open</source> <translation>打开(&O)</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="153"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> <source>Open in New &Tab</source> <translation>在新选项卡中打开(&T)</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="164"/> - <source>Edit &Name</source> - <translation>编辑名称(&N)</translation> - </message> - <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="167"/> + <source>Edit &Name</source> + <translation>编辑名称(&N)</translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="170"/> <source>Edit &Address</source> <translation>编辑地址(&A)</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="172"/> <source>&Delete</source> <translation>删除(&D)</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="328"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="331"/> <source>New Folder</source> <translation>新文件夹</translation> </message> @@ -1880,22 +1880,22 @@ <translation>点击删除选中的条目</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="173"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="176"/> <source>&Properties...</source> <translation>属性(&P)…</translation> </message> <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="161"/> + <source>Open in New &Window</source> + <translation type="unfinished">在新窗口中打开(&W)</translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="163"/> + <source>Open in New Pri&vate Window</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="158"/> - <source>Open in New &Window</source> - <translation type="unfinished">在新窗口中打开(&W)</translation> - </message> - <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="160"/> - <source>Open in New Pri&vate Window</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="155"/> <source>Open in New &Background Tab</source> <translation type="unfinished"></translation> </message> @@ -5837,17 +5837,17 @@ <translation>状态</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="79"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="83"/> <source>Allow</source> <translation>允许</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="88"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="92"/> <source>Block</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="97"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="101"/> <source>Allow For Session</source> <translation type="unfinished"></translation> </message> @@ -6184,7 +6184,7 @@ <translation type="unfinished">移除全部(&A)</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="64"/> + <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="72"/> <source>Allow For Session</source> <translation type="unfinished"></translation> </message> @@ -30618,445 +30618,445 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1796"/> <source>The hg process did not finish within 30s.</source> - <translation>hg 进程没有在 30 秒内结束。</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <translation type="obsolete">hg 进程没有在 30 秒内结束。</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> <source>Create project repository</source> <translation>创建项目仓库</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> <source>The project repository could not be created.</source> <translation>无法创建项目仓库。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> <source>Creating Mercurial repository</source> <translation>创建 Mercurial 仓库</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="330"/> <source>Initial commit to Mercurial repository</source> <translation>向 Mercurial 仓库进行初始提交</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="614"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="661"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="768"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="726"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="783"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="973"/> <source>Reverting changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1462"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2010"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1861"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2053"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2443"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2494"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2605"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2686"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2506"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2525"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2734"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2554"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2499"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2499"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>文件 <b>{0}</b> 已经存在。是否覆盖?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2586"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2382"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2800"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2399"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2660"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="563"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="543"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3450"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2787"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3098"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3079"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3299"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3119"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> <source>Revert changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="958"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>文件 <b>{0}</b> 无法读取。</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1799"/> <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/hg.py" line="962"/> + <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="916"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3714"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3522"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> + <source>Delete Bookmark</source> + <translation type="unfinished">删除书签</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> + <source>Select the bookmark to be deleted:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> + <source>Delete Mercurial Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3588"/> + <source>Rename Mercurial Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> + <source>Move Mercurial Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <source>Pull Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <source>Select the bookmark to be pulled:</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3736"/> - <source>Delete Bookmark</source> - <translation type="unfinished">删除书签</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3736"/> - <source>Select the bookmark to be deleted:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3747"/> - <source>Delete Mercurial Bookmark</source> + <source>Pulling bookmark from a remote Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> + <source>Push Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> + <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3780"/> - <source>Rename Mercurial Bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3822"/> - <source>Move Mercurial Bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3916"/> - <source>Pull Bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3916"/> - <source>Select the bookmark to be pulled:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3928"/> - <source>Pulling bookmark from a remote Mercurial repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3960"/> - <source>Push Bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3960"/> - <source>Select the bookmark to be push:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3972"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1122"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1076"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3132"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2965"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> <source>Aborting uncommitted merge</source> <translation type="unfinished"></translation> </message> @@ -31144,52 +31144,42 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="98"/> <source>Input</source> - <translation>输入</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="120"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">输入</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="123"/> <source>&Send</source> - <translation type="unfinished">发送(&S)</translation> + <translation type="obsolete">发送(&S)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="126"/> <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="133"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="140"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">选择将输入区域转换成密码模式</translation> + <translation type="obsolete">选择将输入区域转换成密码模式</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="143"/> <source>&Password Mode</source> - <translation type="unfinished">密码模式(&P)</translation> + <translation type="obsolete">密码模式(&P)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="146"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="139"/> <source>Process Generation Error</source> - <translation type="unfinished">进程生成错误</translation> + <translation type="obsolete">进程生成错误</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="139"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> </context> <context> @@ -31625,65 +31615,55 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="84"/> <source>Input</source> - <translation type="unfinished">输入</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="106"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">输入</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="109"/> <source>&Send</source> - <translation type="unfinished">发送(&S)</translation> + <translation type="obsolete">发送(&S)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="112"/> <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="119"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="126"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">选择将输入区域转换成密码模式</translation> + <translation type="obsolete">选择将输入区域转换成密码模式</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="129"/> <source>&Password Mode</source> - <translation type="unfinished">密码模式(&P)</translation> + <translation type="obsolete">密码模式(&P)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="132"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="53"/> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="48"/> <source>Mercurial Incoming Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="55"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="50"/> <source>Mercurial Outgoing Bookmarks</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="144"/> <source>Process Generation Error</source> - <translation type="unfinished">进程生成错误</translation> + <translation type="obsolete">进程生成错误</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="144"/> <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="179"/> + <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="126"/> <source>no bookmarks found</source> <translation type="unfinished"></translation> </message> @@ -31735,120 +31715,110 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="101"/> <source>Input</source> - <translation type="unfinished">输入</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="123"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">输入</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="126"/> <source>&Send</source> - <translation type="unfinished">发送(&S)</translation> + <translation type="obsolete">发送(&S)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="129"/> <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="136"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="143"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">选择将输入区域转换成密码模式</translation> + <translation type="obsolete">选择将输入区域转换成密码模式</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="146"/> <source>&Password Mode</source> - <translation type="unfinished">密码模式(&P)</translation> + <translation type="obsolete">密码模式(&P)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="149"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="146"/> <source>Process Generation Error</source> - <translation type="unfinished">进程生成错误</translation> + <translation type="obsolete">进程生成错误</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.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/HgBookmarksListDialog.py" line="187"/> + <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="132"/> <source>no bookmarks defined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="45"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="41"/> <source>Refresh</source> <translation type="unfinished">刷新</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="47"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="43"/> <source>Press to refresh the bookmarks display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="261"/> <source>Switch to</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="265"/> <source>Delete</source> <translation type="unfinished">删除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="408"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="268"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="272"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="276"/> <source>Push</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="292"/> <source>Switch</source> <translation type="unfinished">转换</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="292"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="451"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="311"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="451"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="311"/> <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="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="327"/> <source>Rename Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="327"/> <source><p>Enter the new name for bookmark <b>{0}</b>:</p></source> <translation type="unfinished"></translation> </message> @@ -32032,7 +32002,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="352"/> <source>For message see output dialog.</source> <translation type="unfinished"></translation> </message> @@ -32268,7 +32238,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="188"/> <source>Resolved</source> <translation type="unfinished"></translation> </message> @@ -32278,7 +32248,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="186"/> <source>Unresolved</source> <translation type="unfinished"></translation> </message> @@ -32310,65 +32280,55 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="163"/> <source>Input</source> - <translation type="unfinished">输入</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="185"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">输入</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="188"/> <source>&Send</source> - <translation type="unfinished">发送(&S)</translation> + <translation type="obsolete">发送(&S)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="191"/> <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="198"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="205"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">选择将输入区域转换成密码模式</translation> + <translation type="obsolete">选择将输入区域转换成密码模式</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="208"/> <source>&Password Mode</source> - <translation type="unfinished">密码模式(&P)</translation> + <translation type="obsolete">密码模式(&P)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="211"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="56"/> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="53"/> <source>&Refresh</source> <translation type="unfinished">刷新(&R)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="58"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="55"/> <source>Press to refresh the list of conflicts</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="161"/> <source>Process Generation Error</source> - <translation type="unfinished">进程生成错误</translation> + <translation type="obsolete">进程生成错误</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="161"/> <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="254"/> + <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="190"/> <source>Unknown Status</source> <translation type="unfinished"></translation> </message> @@ -32449,52 +32409,42 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="73"/> <source>Input</source> - <translation type="unfinished">输入</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">输入</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="98"/> <source>&Send</source> - <translation type="unfinished">发送(&S)</translation> + <translation type="obsolete">发送(&S)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="101"/> <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="115"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">选择将输入区域转换成密码模式</translation> + <translation type="obsolete">选择将输入区域转换成密码模式</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="118"/> <source>&Password Mode</source> - <translation type="unfinished">密码模式(&P)</translation> + <translation type="obsolete">密码模式(&P)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="121"/> <source>Alt+P</source> - <translation>Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="172"/> <source>Process Generation Error</source> - <translation type="unfinished">进程生成错误</translation> + <translation type="obsolete">进程生成错误</translation> </message> <message> <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> + <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> </context> <context> @@ -32866,7 +32816,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="231"/> <source>Revision</source> <translation type="unfinished">修订</translation> </message> @@ -32903,55 +32853,45 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="159"/> <source>Input</source> - <translation type="unfinished">输入</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="181"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">输入</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="184"/> <source>&Send</source> - <translation type="unfinished">发送(&S)</translation> + <translation type="obsolete">发送(&S)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="187"/> <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="194"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="201"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">选择将输入区域转换成密码模式</translation> + <translation type="obsolete">选择将输入区域转换成密码模式</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="204"/> <source>&Password Mode</source> - <translation type="unfinished">密码模式(&P)</translation> + <translation type="obsolete">密码模式(&P)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="207"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="121"/> <source>Process Generation Error</source> - <translation type="unfinished">进程生成错误</translation> + <translation type="obsolete">进程生成错误</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="121"/> <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="156"/> + <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="101"/> <source>no signatures found</source> <translation type="unfinished"></translation> </message> @@ -33389,7 +33329,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> @@ -33419,17 +33359,17 @@ <translation type="unfinished">选择要过滤的区域</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/> <source>Revision</source> <translation type="unfinished">修订</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> <source>Author</source> <translation type="unfinished">作者</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> <source>Message</source> <translation type="unfinished">消息</translation> </message> @@ -33501,80 +33441,70 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="542"/> <source>Input</source> - <translation type="unfinished">输入</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="564"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">输入</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="567"/> <source>&Send</source> - <translation type="unfinished">发送(&S)</translation> + <translation type="obsolete">发送(&S)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="570"/> <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="577"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="584"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">选择将输入区域转换成密码模式</translation> + <translation type="obsolete">选择将输入区域转换成密码模式</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="587"/> <source>&Password Mode</source> - <translation type="unfinished">密码模式(&P)</translation> + <translation type="obsolete">密码模式(&P)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="590"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="212"/> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/> <source>Added</source> <translation type="unfinished">已添加</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/> <source>Deleted</source> <translation type="unfinished">已删除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="202"/> <source>Modified</source> <translation type="unfinished">已修改</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> <source>Process Generation Error</source> - <translation type="unfinished">进程生成错误</translation> + <translation type="obsolete">进程生成错误</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="951"/> <source>The hg process did not finish within 30s.</source> - <translation type="unfinished">hg 进程没有在 30 秒内结束。</translation> + <translation type="obsolete">hg 进程没有在 30 秒内结束。</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="954"/> <source>Could not start the hg executable.</source> - <translation type="unfinished">无法启动 hg 可执行程序。</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="957"/> + <translation type="obsolete">无法启动 hg 可执行程序。</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="840"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -33594,63 +33524,63 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="186"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="182"/> <source>All</source> <translation type="unfinished">全部</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> <source>Mercurial Log (Incoming)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> <source>Mercurial Log (Outgoing)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/> <source>Bookmarks</source> <translation type="unfinished">书签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="109"/> <source>&Refresh</source> <translation type="unfinished">刷新(&R)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> <source>Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="268"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="270"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="266"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2257"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2000"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2600"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -33660,42 +33590,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="257"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="287"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/> <source>Tag</source> <translation type="unfinished">标签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="278"/> <source>Tag the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2072"/> <source>Switch</source> <translation type="unfinished">转换</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="288"/> <source>Switch the working directory to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="311"/> <source>Pull Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="313"/> <source>Pull large files for selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1130"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -33720,147 +33650,147 @@ <translation type="unfinished">点击查找下一次出现</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/> <source>Find</source> <translation type="unfinished">查找</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>Filter</source> <translation type="unfinished">过滤器</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>'{0}' was not found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/> <source>File</source> <translation type="unfinished">文件</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="218"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/> <source>Draft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/> <source>Public</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/> <source>Secret</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2462"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2205"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309"/> <source>Pull changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="334"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322"/> <source>Push Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/> <source>Push All Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/> <source>Push all changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2427"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2170"/> <source>Fetch Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2508"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2251"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/> <source>Fetch changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374"/> <source>Strip changesets from a repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="293"/> <source>Define Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="308"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296"/> <source>Bookmark the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298"/> <source>Move Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="313"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="301"/> <source>Move bookmark to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2058"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> @@ -33875,148 +33805,148 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/> <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="148"/> <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr>{4}<tr><td><b>Message</b></td><td>{5}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/> <source>Merge with Changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="263"/> <source>Merge the working directory with the selected changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="336"/> <source>Create Changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339"/> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="341"/> + <source><b>Create Changegroup</b> +<p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/> + <source>Apply Changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="353"/> - <source><b>Create Changegroup</b> -<p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2600"/> - <source>Apply Changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="358"/> <source>Sign Revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="361"/> <source>Add a signature for the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="375"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="363"/> <source>Verify Signatures</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366"/> <source>Verify all signatures there may be for the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="379"/> <source>Select All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="393"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/> <source>Deselect All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1369"/> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1380"/> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1521"/> <source>Pull Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1522"/> <source>Fetch Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2529"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2539"/> <source>Differences to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2555"/> <source>Diff to Parent {0}{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2837"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2580"/> <source>There is no difference.</source> <translation type="unfinished">没有差异。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/> <source>Save Diff</source> <translation type="unfinished">保存差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2690"/> <source>Patch Files (*.diff)</source> <translation type="unfinished">补丁文件 (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2964"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2707"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"><p>补丁文件 <b>{0}</b> 已经存在。是否覆盖?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"><p>补丁文件 <b>{0}</b> 无法保存。<br />原因:{1}</p></translation> </message> @@ -34026,22 +33956,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2785"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2528"/> <source>Generating differences ...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>Mercurial Full Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> <source>Close Heads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="283"/> <source>Close the selected heads</source> <translation type="unfinished"></translation> </message> @@ -36054,40 +35984,35 @@ <translation type="unfinished">移除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="110"/> <source>Unsaved Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="110"/> <source>The guards list has been changed. Shall the changes be applied?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="219"/> <source>Remove Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="219"/> <source>Do you really want to remove the selected guards?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="267"/> <source>Apply Guard Definitions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="267"/> <source><p>The defined guards could not be applied.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="293"/> - <source>The Mercurial process did not finish in time.</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>HgQueuesFoldDialog</name> @@ -36160,15 +36085,15 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="109"/> <source>Process Generation Error</source> - <translation type="unfinished">进程生成错误</translation> + <translation type="obsolete">进程生成错误</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="109"/> <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/HgQueuesHeaderDialog.py" line="197"/> + <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="122"/> <source>Error: </source> <translation type="unfinished"></translation> </message> @@ -36186,12 +36111,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="79"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="84"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> @@ -36238,80 +36163,70 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="101"/> <source>Input</source> - <translation type="unfinished">输入</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="123"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">输入</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="126"/> <source>&Send</source> - <translation type="unfinished">发送(&S)</translation> + <translation type="obsolete">发送(&S)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="129"/> <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="136"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="143"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">选择将输入区域转换成密码模式</translation> + <translation type="obsolete">选择将输入区域转换成密码模式</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="146"/> <source>&Password Mode</source> - <translation type="unfinished">密码模式(&P)</translation> + <translation type="obsolete">密码模式(&P)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="149"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="198"/> <source>Process Generation Error</source> - <translation type="unfinished">进程生成错误</translation> + <translation type="obsolete">进程生成错误</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="198"/> <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="233"/> + <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="155"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="58"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="46"/> <source>applied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="60"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="48"/> <source>guarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="61"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="49"/> <source>missing</source> <translation type="unfinished">遗漏</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="210"/> <source>unknown</source> <translation type="unfinished">未知</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="59"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="47"/> <source>not applied</source> <translation type="unfinished"></translation> </message> @@ -36349,7 +36264,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="102"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> @@ -36465,12 +36380,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="70"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="69"/> <source>Refresh</source> <translation type="unfinished">刷新</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="71"/> <source>Press to refresh the queues list</source> <translation type="unfinished"></translation> </message> @@ -37191,94 +37106,84 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="178"/> <source>Input</source> - <translation type="unfinished">输入</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="200"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">输入</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="203"/> <source>&Send</source> - <translation type="unfinished">发送(&S)</translation> + <translation type="obsolete">发送(&S)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="206"/> <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="213"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="220"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">选择将输入区域转换成密码模式</translation> + <translation type="obsolete">选择将输入区域转换成密码模式</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="223"/> <source>&Password Mode</source> - <translation type="unfinished">密码模式(&P)</translation> + <translation type="obsolete">密码模式(&P)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="226"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="55"/> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="50"/> <source>&Refresh</source> <translation type="unfinished">刷新(&R)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="57"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="52"/> <source>Press to refresh the list of shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="61"/> <source>Restore selected shelve</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="63"/> <source>Delete selected shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="78"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="65"/> <source>Delete all shelves</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="188"/> <source>Process Generation Error</source> - <translation type="unfinished">进程生成错误</translation> + <translation type="obsolete">进程生成错误</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="188"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="282"/> <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="378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="284"/> <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="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="286"/> <source>%n line(s) deleted</source> <translation type="unfinished"> <numerusform></numerusform> @@ -37359,7 +37264,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="311"/> <source>Mercurial Status</source> <translation type="unfinished"></translation> </message> @@ -37387,140 +37292,130 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="180"/> <source>Input</source> - <translation type="unfinished">输入</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="202"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">输入</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="205"/> <source>&Send</source> - <translation type="unfinished">发送(&S)</translation> + <translation type="obsolete">发送(&S)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="208"/> <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="215"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="222"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">选择将输入区域转换成密码模式</translation> + <translation type="obsolete">选择将输入区域转换成密码模式</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="225"/> <source>&Password Mode</source> - <translation type="unfinished">密码模式(&P)</translation> + <translation type="obsolete">密码模式(&P)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="228"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="52"/> + <source>Refresh</source> + <translation type="unfinished">刷新</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="54"/> - <source>Refresh</source> - <translation type="unfinished">刷新</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="56"/> <source>Press to refresh the status display</source> <translation type="unfinished">点击刷新状态显示</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="125"/> <source>Commit the selected changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="191"/> <source>Adjust column sizes</source> <translation type="unfinished">调整列宽</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> <source>added</source> <translation type="unfinished">已添加</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="107"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="98"/> <source>modified</source> <translation type="unfinished">已修改</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="99"/> <source>removed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="109"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> <source>not tracked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="96"/> <source>normal</source> <translation type="unfinished">标准</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="97"/> <source>ignored</source> <translation type="unfinished">已忽略</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> <source>missing</source> <translation type="unfinished">遗漏</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="381"/> <source>Process Generation Error</source> - <translation type="unfinished">进程生成错误</translation> + <translation type="obsolete">进程生成错误</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="381"/> <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/HgStatusDialog.py" line="655"/> + <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="506"/> <source>Commit</source> <translation type="unfinished">提交</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="821"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="672"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished">没有未提交的更改可用或被选择。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="719"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="570"/> <source>Add</source> <translation type="unfinished">添加</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="719"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="570"/> <source>There are no unversioned entries available/selected.</source> <translation type="unfinished">没有未版本化的条目可用或被选择。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="634"/> <source>Revert</source> <translation type="unfinished">还原</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="593"/> <source>Remove</source> <translation type="unfinished">移除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="634"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> @@ -37535,102 +37430,102 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="173"/> <source>Restore missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="577"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="428"/> <source>all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="652"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="506"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="126"/> + <source>Select all for commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="308"/> + <source>Mercurial Queue Repository Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="679"/> + <source>Side-by-Side Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="679"/> + <source>Only one file with uncommitted changes must be selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="136"/> + <source>Add as Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="141"/> + <source>Add as Normal Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="169"/> + <source>Forget missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="128"/> + <source>Unselect all from commit</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="135"/> - <source>Select all for commit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="326"/> - <source>Mercurial Queue Repository Status</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="828"/> - <source>Side-by-Side Diff</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="828"/> - <source>Only one file with uncommitted changes must be selected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="145"/> - <source>Add as Large Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="150"/> - <source>Add as Normal Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="178"/> - <source>Forget missing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="137"/> - <source>Unselect all from commit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="144"/> <source>Add the selected files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="138"/> <source>Add the selected files as a large files using the 'Large Files' extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="143"/> <source>Add the selected files as a normal files using the 'Large Files' extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="151"/> <source>Shows the differences of the selected entry in a separate dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="154"/> <source>Differences Side-By-Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="156"/> <source>Shows the differences of the selected entry side-by-side in a separate dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="164"/> <source>Reverts the changes of the selected files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="171"/> <source>Forgets about the selected missing files</source> <translation type="unfinished"></translation> </message> @@ -37640,37 +37535,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="175"/> <source>Restores the selected missing files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="202"/> - <source>Adjusts the width of all columns to their contents</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="189"/> - <source>Commit Merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="191"/> - <source>Commit all the merged changes.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="193"/> + <source>Adjusts the width of all columns to their contents</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <source>Commit Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="182"/> + <source>Commit all the merged changes.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="184"/> <source>Abort Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="195"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="186"/> <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="922"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="773"/> <source>Merge</source> <translation type="unfinished">合并</translation> </message> @@ -37678,17 +37573,12 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="103"/> <source>Mercurial status checked successfully</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="182"/> - <source>Could not start the Mercurial process.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="136"/> <source>{0} / {1}:{2}</source> <comment>branch, local id, global id</comment> <translation type="unfinished"></translation> @@ -38133,120 +38023,110 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="101"/> <source>Input</source> - <translation type="unfinished">输入</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="123"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">输入</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="126"/> <source>&Send</source> - <translation type="unfinished">发送(&S)</translation> + <translation type="obsolete">发送(&S)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="129"/> <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="136"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="143"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">选择将输入区域转换成密码模式</translation> + <translation type="obsolete">选择将输入区域转换成密码模式</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="146"/> <source>&Password Mode</source> - <translation type="unfinished">密码模式(&P)</translation> + <translation type="obsolete">密码模式(&P)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="149"/> <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="91"/> <source>Mercurial Branches List</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="92"/> <source>Status</source> <translation>状态</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="160"/> <source>Process Generation Error</source> - <translation type="unfinished">进程生成错误</translation> + <translation type="obsolete">进程生成错误</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="160"/> <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="292"/> + <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="212"/> <source>active</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="217"/> <source>yes</source> <translation type="unfinished">是</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="48"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="44"/> <source>&Refresh</source> <translation type="unfinished">刷新(&R)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="50"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="46"/> <source>Press to refresh the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="291"/> <source>Switch to</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="346"/> <source>Close Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="465"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="320"/> <source>Switch</source> <translation type="unfinished">转换</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="465"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="320"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="484"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="339"/> <source>The branch "default" cannot be closed. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="346"/> <source><p>Shall the branch <b>{0}</b> really be closed?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="379"/> <source>Close Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="379"/> <source>Do you really want to close all listed branches?</source> <translation type="unfinished"></translation> </message> @@ -39002,7 +38882,7 @@ <translation>点击移除选中的条目</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="120"/> + <location filename="../WebBrowser/History/HistoryDialog.py" line="123"/> <source>&Remove</source> <translation>移除(&R)</translation> </message> @@ -39017,32 +38897,32 @@ <translation>移除全部(&A)</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="103"/> + <location filename="../WebBrowser/History/HistoryDialog.py" line="106"/> <source>&Open</source> <translation>打开(&O)</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="106"/> - <source>Open in New &Tab</source> - <translation>在新选项卡中打开(&T)</translation> - </message> - <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="119"/> - <source>&Copy</source> - <translation>复制(&C)</translation> - </message> - <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="109"/> - <source>Open in New &Background Tab</source> - <translation type="unfinished"></translation> + <source>Open in New &Tab</source> + <translation>在新选项卡中打开(&T)</translation> + </message> + <message> + <location filename="../WebBrowser/History/HistoryDialog.py" line="122"/> + <source>&Copy</source> + <translation>复制(&C)</translation> </message> <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="112"/> - <source>Open in New &Window</source> - <translation>在新窗口中打开(&W)</translation> + <source>Open in New &Background Tab</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="115"/> + <source>Open in New &Window</source> + <translation>在新窗口中打开(&W)</translation> + </message> + <message> + <location filename="../WebBrowser/History/HistoryDialog.py" line="118"/> <source>Open in New Pri&vate Window</source> <translation type="unfinished"></translation> </message> @@ -39108,12 +38988,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/History/HistoryMenu.py" line="444"/> + <location filename="../WebBrowser/History/HistoryMenu.py" line="447"/> <source>Restore All Closed Tabs</source> <translation type="unfinished">恢复所有已关闭的选项卡</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryMenu.py" line="447"/> + <location filename="../WebBrowser/History/HistoryMenu.py" line="450"/> <source>Clear List</source> <translation type="unfinished">清空列表</translation> </message> @@ -50471,7 +50351,7 @@ <context> <name>PasswordsDialog</name> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="90"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="102"/> <source>Saved Passwords</source> <translation type="unfinished"></translation> </message> @@ -50516,7 +50396,7 @@ <translation>隐藏密码</translation> </message> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="90"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="102"/> <source>Do you really want to show passwords?</source> <translation>确认要显示密码?</translation> </message> @@ -52926,17 +52806,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1619"/> + <location filename="../Preferences/__init__.py" line="1621"/> <source>Export Preferences</source> <translation>导出首选项</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1647"/> + <location filename="../Preferences/__init__.py" line="1649"/> <source>Import Preferences</source> <translation>导入首选项</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1647"/> + <location filename="../Preferences/__init__.py" line="1649"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>属性文件 (*.ini);;所有文件 (*)</translation> </message> @@ -56853,22 +56733,22 @@ <context> <name>Purge</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="78"/> <source>Purge All Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="93"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="79"/> <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="83"/> <source>Purge Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="84"/> <source>Do really want to delete files not tracked by Mercurial?</source> <translation type="unfinished"></translation> </message> @@ -62140,182 +62020,182 @@ <context> <name>Queues</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="210"/> <source>New Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="260"/> <source>Update Current Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="315"/> <source>Pop Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="319"/> <source>Push Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="323"/> <source>Go to Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="457"/> <source>Select Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="335"/> <source>Select the target patch name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="457"/> <source>No patches to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="387"/> <source>Finish Applied Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="421"/> <source>Rename Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="443"/> <source>Select the patch to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="501"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="452"/> <source>Delete Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="500"/> <source>Fold Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/> <source>No patches selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="500"/> <source>No patches available to be folded.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="527"/> <source>List Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="527"/> <source>No patches available to list guards for.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="565"/> <source>Define Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="602"/> <source>No patches available to define guards for.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="602"/> <source>Drop All Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="586"/> <source>Select the patch to drop guards for (leave empty for the current patch):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="639"/> <source>Set Active Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="639"/> <source>No guards available to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="661"/> <source>Deactivate Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="702"/> <source>Create New Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="704"/> <source>Rename Active Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="726"/> <source>Error while creating a new queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="729"/> <source>Error while renaming the active queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="760"/> <source>Purge Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="832"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="762"/> <source>Delete Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="764"/> <source>Activate Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="872"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="789"/> <source>Error while purging the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="791"/> <source>Error while deleting the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="876"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="793"/> <source>Error while setting the active queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="822"/> <source>Available Queues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="845"/> <source>Initializing new queue repository</source> <translation type="unfinished"></translation> </message> @@ -65435,47 +65315,47 @@ <context> <name>Shelve</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="110"/> <source>Shelve current changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="160"/> <source>Restore shelved changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="185"/> <source>Abort restore operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="212"/> <source>Continue restore operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="236"/> <source>Select the shelves to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="257"/> <source>Delete shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="247"/> <source>Do you really want to delete these shelves?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="283"/> <source>Delete all shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="275"/> <source>Do you really want to delete all shelved changes?</source> <translation type="unfinished"></translation> </message> @@ -66394,7 +66274,7 @@ <context> <name>SnapshotTimer</name> <message numerus="yes"> - <location filename="../Snapshot/SnapshotTimer.py" line="107"/> + <location filename="../Snapshot/SnapshotTimer.py" line="110"/> <source>Snapshot will be taken in %n seconds</source> <translation> <numerusform>快照将在 %n 秒后截取</numerusform> @@ -80563,7 +80443,7 @@ <context> <name>VariablesViewer</name> <message> - <location filename="../Debugger/VariablesViewer.py" line="955"/> + <location filename="../Debugger/VariablesViewer.py" line="958"/> <source>Global Variables</source> <translation>全局变量</translation> </message> @@ -80583,12 +80463,12 @@ <translation type="obsolete">类型</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="956"/> + <location filename="../Debugger/VariablesViewer.py" line="959"/> <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source> <translation><b>全局变量浏览器窗口</b><p>该窗口显示调试程序的全局变量。</p></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="962"/> + <location filename="../Debugger/VariablesViewer.py" line="965"/> <source>Local Variables</source> <translation>局部变量</translation> </message> @@ -80598,17 +80478,17 @@ <translation type="obsolete">局部</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="963"/> + <location filename="../Debugger/VariablesViewer.py" line="966"/> <source><b>The Local Variables Viewer Window</b><p>This window displays the local variables of the debugged program.</p></source> <translation><b>局部变量浏览器窗口</b><p>该窗口显示高度程序的局部变量。</p></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1080"/> + <location filename="../Debugger/VariablesViewer.py" line="1083"/> <source>Show Details...</source> <translation>显示细节…</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1095"/> + <location filename="../Debugger/VariablesViewer.py" line="1098"/> <source>Configure...</source> <translation>配置…</translation> </message> @@ -80618,7 +80498,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1093"/> + <location filename="../Debugger/VariablesViewer.py" line="1096"/> <source>Refresh</source> <translation type="unfinished">刷新</translation> </message> @@ -80628,22 +80508,22 @@ <translation type="obsolete">折叠所有</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1082"/> + <location filename="../Debugger/VariablesViewer.py" line="1085"/> <source>Expand</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1083"/> + <location filename="../Debugger/VariablesViewer.py" line="1086"/> <source>Collapse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1084"/> + <location filename="../Debugger/VariablesViewer.py" line="1087"/> <source>Collapse All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1096"/> + <location filename="../Debugger/VariablesViewer.py" line="1099"/> <source>Variables Type Filter...</source> <translation type="unfinished"></translation> </message> @@ -86922,12 +86802,12 @@ <translation type="unfinished"> 秒</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="161"/> + <location filename="../WebBrowser/WebBrowserPage.py" line="170"/> <source>Suspicuous URL detected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="161"/> + <location filename="../WebBrowser/WebBrowserPage.py" line="170"/> <source><p>The URL <b>{0}</b> was found in the Safe Browsing database.</p>{1}</source> <translation type="unfinished"></translation> </message> @@ -87336,12 +87216,12 @@ <translation type="unfinished">关闭当前选项卡(&C)</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1149"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1152"/> <source>Restore All Closed Tabs</source> <translation type="unfinished">恢复所有已关闭的选项卡</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1151"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/> <source>Clear List</source> <translation type="unfinished">清空列表</translation> </message> @@ -87781,7 +87661,7 @@ <context> <name>WebBrowserWindow</name> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3641"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3646"/> <source>eric6 Web Browser</source> <translation type="unfinished"></translation> </message> @@ -87858,7 +87738,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <source>New Private Window</source> <translation type="unfinished"></translation> </message> @@ -87884,7 +87764,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2565"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2570"/> <source>Open File</source> <translation type="unfinished">打开文件</translation> </message> @@ -88098,7 +87978,7 @@ <translation type="unfinished">退出</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2916"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2921"/> <source>&Quit</source> <translation type="unfinished">退出(&Q)</translation> </message> @@ -89390,27 +89270,27 @@ <translation type="unfinished">过滤器</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2364"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2369"/> <source>Filtered by: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2372"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2377"/> <source>Settings</source> <translation type="unfinished">设置</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2385"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2390"/> <source>Tools</source> <translation type="unfinished">工具</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2394"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2399"/> <source>Help</source> <translation type="unfinished">帮助</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2401"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2406"/> <source>VirusTotal</source> <translation type="unfinished">VirusTotal</translation> </message> @@ -89420,113 +89300,113 @@ <translation type="unfinished">扫描当前站点</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4705"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4710"/> <source>IP Address Report</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4715"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4720"/> <source>Domain Report</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <source><p>Could not start the process.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"><p>无法启动进程。<br>请确保它作为 <b>{0}</b> 可用。</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <source>OK</source> <translation type="unfinished">确定</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2606"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2611"/> <source><b>eric6 Web Browser - {0}</b><p>The eric6 Web Browser is a combined help file and HTML browser. It is part of the eric6 development toolset.</p><p>It is based on QtWebEngine {1} and Chrome {2}.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2729"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2734"/> <source>Saved Tabs</source> <translation type="unfinished">已保存的选项卡</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3462"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3467"/> <source>Could not find an associated content.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3557"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3562"/> <source>Updating search index</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3631"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3636"/> <source>Looking for Documentation...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3661"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3666"/> <source>Unfiltered</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3678"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3683"/> <source>Help Engine</source> <translation type="unfinished">帮助引擎</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4236"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4241"/> <source>ISO</source> <translation type="unfinished">ISO</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4240"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4245"/> <source>Windows</source> <translation type="unfinished">Windows</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4242"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4247"/> <source>ISCII</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4238"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4243"/> <source>Unicode</source> <translation type="unfinished">Unicode</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4246"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4251"/> <source>Other</source> <translation type="unfinished">其它</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4244"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4249"/> <source>IBM</source> <translation type="unfinished">IBM</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4670"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4675"/> <source>VirusTotal Scan</source> <translation type="unfinished">VirusTotal 扫描</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4670"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4675"/> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4696"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4701"/> <source>Enter a valid IPv4 address in dotted quad notation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4705"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4710"/> <source>The given IP address is not in dotted quad notation.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4715"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4720"/> <source>Enter a valid domain name:</source> <translation type="unfinished"></translation> </message> @@ -89598,7 +89478,7 @@ <translation type="unfinished">Alt+Ctrl+A</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2565"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2570"/> <source>HTML Files (*.html *.htm *.mhtml *.mht);;PDF Files (*.pdf);;CHM Files (*.chm);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -89638,27 +89518,27 @@ <translation type="unfinished">显示所有历史记录…</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4271"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4276"/> <source>Menu Bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4276"/> - <source>Bookmarks</source> - <translation type="unfinished">书签</translation> - </message> - <message> <location filename="../WebBrowser/WebBrowserWindow.py" line="4281"/> + <source>Bookmarks</source> + <translation type="unfinished">书签</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4286"/> <source>Status Bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4295"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4300"/> <source>&Show all</source> <translation type="unfinished">全部显示(&S)</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4297"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4302"/> <source>&Hide all</source> <translation type="unfinished">全部隐藏(&H)</translation> </message> @@ -89703,12 +89583,12 @@ <translation type="unfinished">会话</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2907"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2912"/> <source>Are you sure you want to close the web browser?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2907"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2912"/> <source>Are you sure you want to close the web browser? You have {0} windows with {1} tabs open.</source> <translation type="unfinished"></translation> @@ -89759,7 +89639,7 @@ <translation type="unfinished"><b>键盘快捷键</b><p>将程序的键盘快捷键设置成你喜欢的按键。</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5075"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5080"/> <source>Export Keyboard Shortcuts</source> <translation type="unfinished">导出键盘快捷键</translation> </message> @@ -89779,7 +89659,7 @@ <translation type="unfinished"><b>导出键盘快捷键</b><p>导出程序的键盘快捷键。</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5099"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5104"/> <source>Import Keyboard Shortcuts</source> <translation type="unfinished">导入键盘快捷键</translation> </message> @@ -89799,7 +89679,7 @@ <translation type="unfinished"><b>导入键盘快捷键</b><p>导入程序的键盘快捷键。</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5099"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5104"/> <source>Keyboard shortcut file (*.e4k)</source> <translation type="unfinished">键盘快捷键文件 (*.e4k)</translation> </message> @@ -90229,46 +90109,46 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1355"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2083"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1915"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2093"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1375"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2078"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1910"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2098"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1934"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -90276,12 +90156,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1920"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -90292,13 +90172,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1897"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2070"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>