Mercurial Repositories > eric / changeset
changeset
Updated translations and source docu.
Tue, 25 Mar 2014 19:40:41 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Tue, 25 Mar 2014 19:40:41 +0100
- branch
- 5_4_x
- changeset 3437
- 478c6fa42557
- parent 3436
- 5f64b3d02ebf
- child 3453
- c8627d94e789
Updated translations and source docu.
--- a/APIs/Python3/eric5.api Tue Mar 25 19:34:15 2014 +0100 +++ b/APIs/Python3/eric5.api Tue Mar 25 19:40:41 2014 +0100 @@ -4884,7 +4884,6 @@ eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGraft?4(path, revs=None) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGraftContinue?4(path) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgIdentify?4(name) -eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgIdentifyBundle?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgImport?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgIncoming?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgInfo?4(ppath, mode="heads")
--- a/Documentation/Help/source.qhp Tue Mar 25 19:34:15 2014 +0100 +++ b/Documentation/Help/source.qhp Tue Mar 25 19:40:41 2014 +0100 @@ -5721,7 +5721,6 @@ <keyword name="Hg.hgGraft" id="Hg.hgGraft" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgGraft" /> <keyword name="Hg.hgGraftContinue" id="Hg.hgGraftContinue" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgGraftContinue" /> <keyword name="Hg.hgIdentify" id="Hg.hgIdentify" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgIdentify" /> - <keyword name="Hg.hgIdentifyBundle" id="Hg.hgIdentifyBundle" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgIdentifyBundle" /> <keyword name="Hg.hgImport" id="Hg.hgImport" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgImport" /> <keyword name="Hg.hgIncoming" id="Hg.hgIncoming" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgIncoming" /> <keyword name="Hg.hgInfo" id="Hg.hgInfo" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgInfo" /> @@ -6224,7 +6223,6 @@ <keyword name="HgProjectHelper.__hgGraftContinue" id="HgProjectHelper.__hgGraftContinue" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgGraftContinue" /> <keyword name="HgProjectHelper.__hgHeads" id="HgProjectHelper.__hgHeads" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgHeads" /> <keyword name="HgProjectHelper.__hgIdentify" id="HgProjectHelper.__hgIdentify" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgIdentify" /> - <keyword name="HgProjectHelper.__hgIdentifyBundle" id="HgProjectHelper.__hgIdentifyBundle" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgIdentifyBundle" /> <keyword name="HgProjectHelper.__hgImport" id="HgProjectHelper.__hgImport" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgImport" /> <keyword name="HgProjectHelper.__hgIncoming" id="HgProjectHelper.__hgIncoming" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgIncoming" /> <keyword name="HgProjectHelper.__hgLogBrowser" id="HgProjectHelper.__hgLogBrowser" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgLogBrowser" />
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Tue Mar 25 19:34:15 2014 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Tue Mar 25 19:40:41 2014 +0100 @@ -123,9 +123,6 @@ <td><a href="#HgProjectHelper.__hgIdentify">__hgIdentify</a></td> <td>Private slot used to identify the project directory.</td> </tr><tr> -<td><a href="#HgProjectHelper.__hgIdentifyBundle">__hgIdentifyBundle</a></td> -<td>Private slot used to identify a changegroup file.</td> -</tr><tr> <td><a href="#HgProjectHelper.__hgImport">__hgImport</a></td> <td>Private slot used to import a patch file.</td> </tr><tr> @@ -352,11 +349,6 @@ <b>__hgIdentify</b>(<i></i>) <p> Private slot used to identify the project directory. -</p><a NAME="HgProjectHelper.__hgIdentifyBundle" ID="HgProjectHelper.__hgIdentifyBundle"></a> -<h4>HgProjectHelper.__hgIdentifyBundle</h4> -<b>__hgIdentifyBundle</b>(<i></i>) -<p> - Private slot used to identify a changegroup file. </p><a NAME="HgProjectHelper.__hgImport" ID="HgProjectHelper.__hgImport"></a> <h4>HgProjectHelper.__hgImport</h4> <b>__hgImport</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Tue Mar 25 19:34:15 2014 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Tue Mar 25 19:40:41 2014 +0100 @@ -166,9 +166,6 @@ <td><a href="#Hg.hgIdentify">hgIdentify</a></td> <td>Public method to identify the current working directory.</td> </tr><tr> -<td><a href="#Hg.hgIdentifyBundle">hgIdentifyBundle</a></td> -<td>Public method used to identify a changegroup file.</td> -</tr><tr> <td><a href="#Hg.hgImport">hgImport</a></td> <td>Public method to import a patch file.</td> </tr><tr> @@ -743,16 +740,6 @@ <dd> file/directory name (string) </dd> -</dl><a NAME="Hg.hgIdentifyBundle" ID="Hg.hgIdentifyBundle"></a> -<h4>Hg.hgIdentifyBundle</h4> -<b>hgIdentifyBundle</b>(<i>name</i>) -<p> - Public method used to identify a changegroup file. -</p><dl> -<dt><i>name</i></dt> -<dd> -directory name on which to base the changegroup (string) -</dd> </dl><a NAME="Hg.hgImport" ID="Hg.hgImport"></a> <h4>Hg.hgImport</h4> <b>hgImport</b>(<i>name</i>)
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Tue Mar 25 19:34:15 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Tue Mar 25 19:40:41 2014 +0100 @@ -2483,7 +2483,6 @@ self.log.show() self.log.start(name) - def hgUnbundle(self, name): """ Public method to apply changegroup files.
--- a/i18n/eric5_cs.ts Tue Mar 25 19:34:15 2014 +0100 +++ b/i18n/eric5_cs.ts Tue Mar 25 19:40:41 2014 +0100 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.1" language="cs_CZ"> +<!DOCTYPE TS><TS version="2.0" language="cs_CZ" sourcelanguage=""> <context> <name>AboutDialog</name> <message> @@ -2064,8 +2063,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="142"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>Otevřít nový &Tab </translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Otevřít nový &Tab<byte value="x9"/></translation> </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="148"/> @@ -2306,8 +2305,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="90"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>Otevřít nový &Tab </translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Otevřít nový &Tab<byte value="x9"/><byte value="x9"/></translation> </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="101"/> @@ -16187,8 +16186,8 @@ <name>HelpBrowser</name> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1083"/> - <source>Open Link in New Tab Ctrl+LMB</source> - <translation>Otevřít odkaz v novém tab okně Ctrl+LMB</translation> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Otevřít odkaz v novém tab okně<byte value="x9"/>Ctrl+LMB</translation> </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="655"/> @@ -19907,7 +19906,7 @@ <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2530"/> <source>Shall the working directory be updated?</source> <translation>Má být pracovní adresář aktualizován?</translation> </message> @@ -19922,22 +19921,22 @@ <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> @@ -19957,7 +19956,7 @@ <translation><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2633"/> <source>Removing files from the Mercurial repository only</source> <translation>Odebrat soubory jen z Mercurial úložiště</translation> </message> @@ -19972,22 +19971,22 @@ <translation type="obsolete"><p>Soubor Mercurial skupiny změn<b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2522"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Soubory Mercurial skupiny změn (*.hg);;Všechny soubory (*)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2531"/> <source>Identifying changegroup file</source> - <translation>Rozpoznat soubor skupiny změn</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2726"/> + <translation type="obsolete">Rozpoznat soubor skupiny změn</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2673"/> <source>No revision given. Aborting...</source> <translation>Nebyla dána žádná revize. Ruším...</translation> </message> @@ -19997,12 +19996,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2721"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2746"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2714"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -20012,72 +20011,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3308"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3166"/> <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="3340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3308"/> <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="2822"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2790"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2870"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2838"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2918"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2886"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2999"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3085"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/> <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="3098"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3066"/> <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="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3137"/> <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="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3137"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3106"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -20107,7 +20106,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3035"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -23718,7 +23717,7 @@ <translation><b>Zotavit</b><p>Obnoví integritu repozitáře narušenou přerušenou transakcí.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> <source>Repository Administration</source> <translation>Administrace repozitáře</translation> </message> @@ -23753,22 +23752,22 @@ <translation>Vytvořit soubor s skupinou změn obsahující množinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1385"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Apply changegroups...</source> <translation>Použít skupinu změn...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> <source>Apply one or several changegroup files</source> <translation>Použít soubory s jednou nebo více skupinami změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1038"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1023"/> <source>Changegroup Management</source> <translation>Správa skupin změn</translation> </message> @@ -23778,7 +23777,7 @@ <translation><b>Vytvořit skupin změn</b><p>Vytvoří soubor se skupinou změn obsahující vybrané množiny změn (hg bundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Použít skupinu změn</b><p>Použije se soubor vygenerovaný příkazem 'Vytvořit skupinu změn', s jednou nebo více skupinami změn (hg unbundle)</p></translation> </message> @@ -23798,37 +23797,37 @@ <translation><b>Zobrazit aktuální větev</b><p>Zobrazí se aktuální větev projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> <source>Mark as "good"</source> <translation>Označit jako "v pořádku"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="767"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> <source>Mark a selectable changeset as good</source> <translation>Označit volitelnou množinu změn, že je v pořádku</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation><b>Označit jako "v pořádku"</b><p>Označí se volitelná množina změn, že je v pořádku.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Mark as "bad"</source> <translation>Označit jako "špatná"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="766"/> <source>Mark a selectable changeset as bad</source> <translation>Označit volitelnou množinu změn jako špatnou</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="784"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Označit jako "špatná"</b><p>Označí se volitelná množina změn, že je špatná.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> <source>Skip</source> <translation>Přeskočit</translation> </message> @@ -23843,32 +23842,32 @@ <translation type="obsolete"><b>Přeskočit</b><p>Aktuální množina změn se přeskočí.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> <source>Reset</source> <translation>Reset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source>Reset the bisect search data</source> <translation>Reset vyhledávání bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Reset</b><p>Zresetuje bisect vyhledávání v datech.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> <source>Mark as "good"...</source> <translation>Označit jako "v pořádku"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Mark as "bad"...</source> <translation>Označit jako "špatná"...</translation> </message> @@ -23915,35 +23914,35 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Identify changegroup</source> - <translation>Identifikovat skupinu změn</translation> + <translation type="obsolete">Identifikovat skupinu změn</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Identify changegroup...</source> - <translation>Identifikovat skupinu změn...</translation> + <translation type="obsolete">Identifikovat skupinu změn...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> <source>Identify a changegroup file containing a collection of changesets</source> - <translation>Identifikuje soubor se skupinou změn obsahující množinu změn</translation> + <translation type="obsolete">Identifikuje soubor se skupinou změn obsahující množinu změn</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> - <translation><b>Identifikovat skupinu změn</b><p>Identifikuje soubor se skupinou změn obsahující množinu změn.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <translation type="obsolete"><b>Identifikovat skupinu změn</b><p>Identifikuje soubor se skupinou změn obsahující množinu změn.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> <source>Back out changeset</source> <translation>Vycouvat z množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/> <source>Back out changes of an earlier changeset</source> <translation>Vrátit změny z předchozí množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Vycouvat z množiny změn</b><p>Vrátit změny z předchozí množiny změn.</p></translation> </message> @@ -23963,37 +23962,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1206"/> <source>Pull</source> <translation type="unfinished">Stáhnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> </message> @@ -24013,17 +24012,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -24088,127 +24087,127 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="780"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1441"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1419"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <source>Import Patch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="863"/> + <source>Import a patch from a patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1030"/> + <source>Patch Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1439"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> - <source>Import Patch...</source> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> - <source>Import a patch from a patch file</source> + <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> - <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1046"/> - <source>Patch Management</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1461"/> - <source>Revert Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> - <source>Export Patches</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> - <source>Export Patches...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> - <source>Export revisions to patch files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1459"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> - <source>Change the phase of revisions</source> + <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> - <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1481"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="922"/> - <source>Copies changesets from another branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="925"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="938"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="926"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> <source>Graft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -24233,47 +24232,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Add</source> <translation type="unfinished">Přidat</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> + <source>Add...</source> + <translation type="unfinished">Přidat...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="939"/> + <source>Add a sub-repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> + <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> - <source>Add...</source> - <translation type="unfinished">Přidat...</translation> + <source>Remove</source> + <translation type="unfinished">Odebrat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> + <source>Remove...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="954"/> - <source>Add a sub-repository</source> + <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957"/> - <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> - <source>Remove</source> - <translation type="unfinished">Odebrat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> - <source>Remove...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> - <source>Remove sub-repositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> @@ -24303,27 +24302,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="985"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="988"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_de.ts Tue Mar 25 19:34:15 2014 +0100 +++ b/i18n/eric5_de.ts Tue Mar 25 19:40:41 2014 +0100 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.1" language="de"> +<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage=""> <context> <name>AboutDialog</name> <message> @@ -1949,8 +1948,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="142"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>In neuem &Register öffnen Strg+LMK</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> </message> </context> <context> @@ -2186,8 +2185,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="90"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>In neuem &Register öffnen Strg+LMK</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> </message> </context> <context> @@ -15946,8 +15945,8 @@ </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1083"/> - <source>Open Link in New Tab Ctrl+LMB</source> - <translation>Link in neuem Fenster öffnen Strg+LMK</translation> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Link in neuem Fenster öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1156"/> @@ -19186,7 +19185,7 @@ <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2530"/> <source>Shall the working directory be updated?</source> <translation>Soll das Arbeitsverzeichnis aktualisiert werden?</translation> </message> @@ -19201,22 +19200,22 @@ <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial-Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> @@ -19236,7 +19235,7 @@ <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2633"/> <source>Removing files from the Mercurial repository only</source> <translation>Lösche Dateien nur aus dem Mercurial-Repository</translation> </message> @@ -19246,22 +19245,17 @@ <translation>Mercurial-Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2522"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial-Änderungsgruppendateien (*.hg);;Alle Dateien (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2531"/> - <source>Identifying changegroup file</source> - <translation>Identifiziere Änderungsgruppendatei</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2673"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> @@ -19271,12 +19265,12 @@ <translation><p>Die Mercurial-Änderungsgruppendatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2721"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2746"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2714"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Wollen Sie die letzte Transaktion wirklich zurücksetzen?</translation> </message> @@ -19286,72 +19280,72 @@ <translation>Pflege Änderungen in das Mercurial-Repository ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3308"/> <source>Mercurial Command Server</source> <translation>Mercurial-Befehlsserver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3166"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>Der Mercurial-Befehlsserver konnte nicht wiedergestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3308"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>Der Mercurial-Befehlsserver konnte nicht gestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2822"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2790"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2870"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2838"/> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2918"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2886"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2999"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3085"/> <source>Add Sub-repository</source> <translation>Unterrepository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation><p>Die Unterrepositorydatei .hgsub konnte nicht gelesen werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3098"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3066"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>Die Unterrepositorydatei .hgsub enthält bereits einen Eintrag <b>{0}</b>. Abbruch...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3137"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>Die Unterrepositorydatei .hgsub konnte nicht gespeichert werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3137"/> <source>Remove Sub-repositories</source> <translation>Unterrepositorys löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3106"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>Die Unterrepositorydatei .hgsub existiert nicht. Abbruch...</p></translation> </message> @@ -19381,7 +19375,7 @@ <translation>Wollen Sie wirklich alle Änderungen des Projektes rückgängig machen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3035"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/> <source>Create Unversioned Archive</source> <translation>Erzeuge nicht versioniertes Archiv</translation> </message> @@ -22813,7 +22807,7 @@ <translation><b>Transaktion zurücksetzen</b><p>Dies setzt eine abgebrochene Transaktion zurück.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> <source>Repository Administration</source> <translation>Repository Administration</translation> </message> @@ -22848,22 +22842,22 @@ <translation>Erzeuge eine Änderungsgruppendatei für Änderungssätze</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1385"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Apply changegroups...</source> <translation>Änderungsgruppen anwenden...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> <source>Apply one or several changegroup files</source> <translation>Wende eine oder mehrere Änderungsgruppendateien an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1038"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1023"/> <source>Changegroup Management</source> <translation>Verwaltung von Änderungsgruppen</translation> </message> @@ -22873,7 +22867,7 @@ <translation><b>Änderungsgruppe erzeugen</b><p>Dies erzeuge eine Änderungsgruppendatei für ausgewählte Änderungssätze (hg bundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Änderungsgruppen anwenden</b><p>Dies wendet eine oder mehrere mit „Änderungsgruppe erzeugen“ erstellte Änderungsgruppendateien an (hg unbundle).</p></translation> </message> @@ -22893,67 +22887,67 @@ <translation><b>Zeige aktuellen Zweig</b><p>Dies zeigt den aktuellen Zweig des Projektes.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> <source>Mark as "good"</source> <translation>Als „gut“ markieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="767"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> <source>Mark a selectable changeset as good</source> <translation>Markiere einen auswählbaren Änderungssatz als gut</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation><b>Als gut markieren</b><p>Dies markiert einen auswählbaren Änderungssatz als gut.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Mark as "bad"</source> <translation>Als „schlecht“ markieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="766"/> <source>Mark a selectable changeset as bad</source> <translation>Markiere einen auswählbaren Änderungssatz als schlecht</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="784"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Als schlecht markieren</b><p>Dies markiert einen auswählbaren Änderungssatz als schlecht.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> <source>Skip</source> <translation>Überspringen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> <source>Reset</source> <translation>Zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source>Reset the bisect search data</source> <translation>Setzt die Bisect Suchdaten zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Zurücksetzen</b><p>Dies setzt die Bisect Suchdaten zurück.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> <source>Mark as "good"...</source> <translation>Als „gut“ markieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Mark as "bad"...</source> <translation>Als „schlecht“ markieren...</translation> </message> @@ -22998,37 +22992,17 @@ <translation><b>Änderungsgruppe ansehen</b><p>Dies zeigt den Inhalt einer Änderungsgruppendatei für Änderungssätze an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> - <source>Identify changegroup</source> - <translation>Änderungsgruppe identifizieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> - <source>Identify changegroup...</source> - <translation>Änderungsgruppe identifizieren...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> - <source>Identify a changegroup file containing a collection of changesets</source> - <translation>Eine Änderungsgruppendatei für Änderungssätze identifizieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> - <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> - <translation><b>Änderungsgruppe ansehen</b><p>Dies identifiziert eine Änderungsgruppendatei für Änderungssätze.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> <source>Back out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/> <source>Back out changes of an earlier changeset</source> <translation>Änderungen eines früheren Änderungssatzes umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Änderungssatz umkehren</b><p>Dies kehrt die Änderungen eines früheren Änderungssatzes um.</p></translation> </message> @@ -23048,37 +23022,37 @@ <translation><b>Änderungen hochladen (force)</b><p>Dies lädt Änderungen vom lokalen Repository an ein entferntes Repository mit der Option „force“ hoch.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> <source>Specials</source> <translation>Spezialfunktionen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> <source>Serve project repository</source> <translation>Server für Projektrepository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> <source>Serve project repository...</source> <translation>Server für Projektrepository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> <source>Serve the project repository</source> <translation>Server für das Projektrepository bereitstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation><b>Server für Projektrepository<b><p>Dies stellt einen Server für das Projektrepository zur Verfügung.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1206"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> @@ -23098,17 +23072,17 @@ <translation><b>Neuen Zweig hochladen</b><p>Dies lädt den aktuellen Zweig als neuen benannten Zweig hoch.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> <source>Rollback the last transaction</source> <translation>Die letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source>Extensions</source> <translation>Erweiterungen</translation> </message> @@ -23173,127 +23147,127 @@ <translation><b>Zeige kombinierte Einstellungen</b><p>Dies zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> <source>Skip...</source> <translation>Überspringen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="780"/> <source>Skip a selectable changeset</source> <translation>Überspringe einen auswählbaren Änderungssatz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation><b>Überspringen</b><p>Dies überspringt einen auswählbaren Änderungssatz.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1441"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1419"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <source>Import Patch...</source> + <translation>Patch importieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="863"/> + <source>Import a patch from a patch file</source> + <translation>Einen Patch aus einer Patchdatei importieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> + <translation><b>Patch importieren</b><p>Dies importiert einen Patch aus einer Patchdatei in das Projekt.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1030"/> + <source>Patch Management</source> + <translation>Verwaltung von Patches</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1439"/> + <source>Revert Changes</source> + <translation>Änderungen rückgängig machen</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> - <source>Import Patch...</source> - <translation>Patch importieren...</translation> + <source>Export Patches</source> + <translation>Patches exportieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <source>Export Patches...</source> + <translation>Patches exportieren...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> - <source>Import a patch from a patch file</source> - <translation>Einen Patch aus einer Patchdatei importieren</translation> + <source>Export revisions to patch files</source> + <translation>Änderungssätze in Patchdateien exportieren</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> - <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> - <translation><b>Patch importieren</b><p>Dies importiert einen Patch aus einer Patchdatei in das Projekt.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1046"/> - <source>Patch Management</source> - <translation>Verwaltung von Patches</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1461"/> - <source>Revert Changes</source> - <translation>Änderungen rückgängig machen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> - <source>Export Patches</source> - <translation>Patches exportieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> - <source>Export Patches...</source> - <translation>Patches exportieren...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> - <source>Export revisions to patch files</source> - <translation>Änderungssätze in Patchdateien exportieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation><b>Patches exportieren</b><p>Dies exportiert Änderungssätze des projektes in Patchdateien.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> <source>Change Phase...</source> <translation>Phase ändern...</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> + <source>Change the phase of revisions</source> + <translation>Ändert die Phase von Revisionen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> + <translation><b>Phase ändern</b><p>Dies ändert die Phase von Revisionen.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1459"/> + <source>Copy Changesets</source> + <translation>Änderungssätze kopieren</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> - <source>Change the phase of revisions</source> - <translation>Ändert die Phase von Revisionen</translation> + <source>Copies changesets from another branch</source> + <translation>Änderungssätze aus einem anderen Zweig kopieren</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> - <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> - <translation><b>Phase ändern</b><p>Dies ändert die Phase von Revisionen.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1481"/> - <source>Copy Changesets</source> - <translation>Änderungssätze kopieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="922"/> - <source>Copies changesets from another branch</source> - <translation>Änderungssätze aus einem anderen Zweig kopieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="925"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation><b>Änderungssätze kopieren</b><p>Dies kopiert Änderungssätze aus einem anderen Zweig mit dem Nutzernamen, der Datums und der Änderungsmeldung des Originaländerungssatzes in das Arbeitsverzeichnis.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <source>Continue Copying Session</source> <translation>Kopiersitzung fortsetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="938"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> <source>Continue the last copying session after conflicts were resolved</source> <translation>Setzt die letzte Kopiersitzung nach Lösung von Konflikten fort</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="926"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation><b>Kopiersitzung fortsetzen</b><p>Dies setzt die letzte Kopiersitzung nach Lösung von Konflikten fort.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> <source>Graft</source> <translation>Graft</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> @@ -23318,47 +23292,47 @@ <translation><b>Konflikte gelöst</b><p>Dies markiert alle Konflikte des lokalen Projektes als gelöst.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Add</source> <translation>Hinzufügen</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> + <source>Add...</source> + <translation>Hinzufügen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="939"/> + <source>Add a sub-repository</source> + <translation>Ein Unterrepository hinzufügen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> + <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> + <translation><b>Hinzufügen...</b><p>Ein Unterrepository zum Projekt hinzufügen.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> - <source>Add...</source> - <translation>Hinzufügen...</translation> + <source>Remove</source> + <translation>Entfernen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> + <source>Remove...</source> + <translation>Entfernen...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="954"/> - <source>Add a sub-repository</source> - <translation>Ein Unterrepository hinzufügen</translation> + <source>Remove sub-repositories</source> + <translation>Unterrepositorys löschen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957"/> - <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> - <translation><b>Hinzufügen...</b><p>Ein Unterrepository zum Projekt hinzufügen.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> - <source>Remove</source> - <translation>Entfernen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> - <source>Remove...</source> - <translation>Entfernen...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> - <source>Remove sub-repositories</source> - <translation>Unterrepositorys löschen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation><b>Entfernen...</b><p>Unterrepositorys aus dem Projekt löschen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> <source>Sub-Repository</source> <translation>Unterrepository</translation> </message> @@ -23388,27 +23362,27 @@ <translation><b>Übersichtsinformationen anzeigen</b><p>Dies zeigt Übersichtsinformationen zum Status des Arbeitsverzeichnisses.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> <source>Create unversioned archive</source> <translation>Erzeuge nicht versioniertes Archiv</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> <source>Create unversioned archive...</source> <translation>Erzeuge nicht versioniertes Archiv...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="985"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/> <source>Create an unversioned archive from the repository</source> <translation>Erzeuge ein unversioniertes Archive des Repositories</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="988"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation><b>Erzeuge nicht versioniertes Archiv...</b><p>Dies erzeugt ein unversioniertes Archive des Repositories.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation><b>Letzte Transaktion zurücksetzen</b><p>Dies setzt die letzte Transaktion zurück. Transaktionen werden verwendet, um die Effekte aller Befehle, die neue Änderungssätze erzeugen oder vorhandene Änderungssätze in das Repository propagieren, zu kapseln. So arbeiten z.B. die folgenden Befehle transaktional und ihre Effekte können zurückgesetzt werden:<ul><li>commit</li><li>import</li><li>pull</li><li>push (mit diesem repository als Ziel)</li><li>unbundle</li></ul></p><p><strong>Dieser Befehl kann gefährlich sein. Bitte mit Vorsicht verwenden.</strong></p></translation> </message>
--- a/i18n/eric5_en.ts Tue Mar 25 19:34:15 2014 +0100 +++ b/i18n/eric5_en.ts Tue Mar 25 19:40:41 2014 +0100 @@ -19116,62 +19116,57 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2522"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2531"/> - <source>Identifying changegroup file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2530"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2633"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2673"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2721"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2746"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2714"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -19181,72 +19176,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3308"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3166"/> <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="3340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3308"/> <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="2822"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2790"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2870"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2838"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2918"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2886"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2999"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3085"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/> <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="3098"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3066"/> <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="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3137"/> <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="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3137"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3106"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -19276,7 +19271,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3035"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -22772,167 +22767,147 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> - <source>Identify changegroup</source> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> + <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> - <source>Identify changegroup...</source> + <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> - <source>Identify a changegroup file containing a collection of changesets</source> + <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> - <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1385"/> - <source>Apply changegroups</source> + <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> - <source>Apply changegroups...</source> + <source>Mark as "good"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> + <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> - <source>Apply one or several changegroup files</source> + <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> - <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> - <source>Mark as "good"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> - <source>Mark as "good"...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="767"/> - <source>Mark a selectable changeset as good</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="766"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="784"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> <source>Reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1038"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1023"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1206"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -22952,17 +22927,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -23027,127 +23002,127 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="780"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1441"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1419"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <source>Import Patch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="863"/> + <source>Import a patch from a patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1030"/> + <source>Patch Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1439"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> - <source>Import Patch...</source> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> - <source>Import a patch from a patch file</source> + <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> - <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1046"/> - <source>Patch Management</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1461"/> - <source>Revert Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> - <source>Export Patches</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> - <source>Export Patches...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> - <source>Export revisions to patch files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1459"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> - <source>Change the phase of revisions</source> + <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> - <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1481"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="922"/> - <source>Copies changesets from another branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="925"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="938"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="926"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> <source>Graft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -23172,47 +23147,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Add</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> + <source>Add...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="939"/> + <source>Add a sub-repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> + <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> - <source>Add...</source> + <source>Remove</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> + <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="954"/> - <source>Add a sub-repository</source> + <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957"/> - <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> - <source>Remove</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> - <source>Remove...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> - <source>Remove sub-repositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> @@ -23242,27 +23217,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="985"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="988"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_es.ts Tue Mar 25 19:34:15 2014 +0100 +++ b/i18n/eric5_es.ts Tue Mar 25 19:40:41 2014 +0100 @@ -19185,7 +19185,7 @@ <translation>Recuperando de transacción interrumpida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2530"/> <source>Shall the working directory be updated?</source> <translation>¿Debe ser actualizado el directorio de trabajo?</translation> </message> @@ -19200,22 +19200,22 @@ <translation>Crear changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> @@ -19235,7 +19235,7 @@ <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2633"/> <source>Removing files from the Mercurial repository only</source> <translation>Eliminando archivos unicamente del repositorio Mercurial</translation> </message> @@ -19245,22 +19245,22 @@ <translation>Archivos Changegroup de Mercurial (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2522"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Archivos Changegroup de Mercurial (*.hg);;Todos los Archivos (*)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2531"/> <source>Identifying changegroup file</source> - <translation>Identificando archivo de changegroup</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2726"/> + <translation type="obsolete">Identificando archivo de changegroup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/> <source>Backing out changeset</source> <translation>Haciendo respaldo de changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2673"/> <source>No revision given. Aborting...</source> <translation>No se ha proporcionado revisión. Abortando...</translation> </message> @@ -19270,12 +19270,12 @@ <translation><p>El archivo changegroup de Mercurial <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2721"/> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2746"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2714"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>¿Está seguro de que quiere aplicar un rollback a la última transacción?</translation> </message> @@ -19285,72 +19285,72 @@ <translation>Haciendo commit de cambios al repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3308"/> <source>Mercurial Command Server</source> <translation>Servidor de Comandos de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3166"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido reiniciarse.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3308"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido iniciarse.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2822"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2790"/> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2870"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2838"/> <source>Export Patches</source> <translation>Exportar Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2918"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2886"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2999"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3085"/> <source>Add Sub-repository</source> <translation>Añadir Sub-repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation><p>No se ha podido leer el archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3098"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3066"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>El archivo .hgsub de sub-repositorios ya contiene una entrada.</p><p>Abortando...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3137"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>No se ha podido escribir al archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3137"/> <source>Remove Sub-repositories</source> <translation>Eliminar Sub-repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3106"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>El archivo de subrepositorios .hgsub no existe. Abortando...</p></translation> </message> @@ -19380,7 +19380,7 @@ <translation>¿Realmente desea revertir todos los cambios del proyecto?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3035"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/> <source>Create Unversioned Archive</source> <translation>Crear Archivo Sin Versionar</translation> </message> @@ -22829,7 +22829,7 @@ <translation><b>Crear .hgignore</b><p>Crea un archivo .hgignore con valores por defecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> <source>Repository Administration</source> <translation>Administración del Repositorio</translation> </message> @@ -22849,22 +22849,22 @@ <translation>Crea un archivo de changegroup recogiendo changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1385"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Apply changegroups...</source> <translation>Aplicar changegroups...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> <source>Apply one or several changegroup files</source> <translation>Aplicar uno o varios archivos de changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1038"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1023"/> <source>Changegroup Management</source> <translation>Gestión de Chagegroup</translation> </message> @@ -22874,7 +22874,7 @@ <translation><b>Crear changegroup</b><p>Crea un archivo de changegroup recogiendo los changeset seleccionados (hg bundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Aplicar changegroups</b><p>Aplica uno o varios archivos de changegroup generados por la acción 'Crear changegroup' (hg unbundle).</p></translation> </message> @@ -22894,67 +22894,67 @@ <translation><b>Mostrar branch actual</b><p>Muestra la branch actual del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> <source>Mark as "good"</source> <translation>Marcar como "bueno"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="767"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> <source>Mark a selectable changeset as good</source> <translation>Marcar un changeset seleccionable como bueno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation><b>Marcar como bueno</b><p>Marca un changeset seleccionable como bueno.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Mark as "bad"</source> <translation>Marcar como "malo"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="766"/> <source>Mark a selectable changeset as bad</source> <translation>Marcar un changeset seleccionable como malo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="784"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Marcar como malo</b><p>Marca un changeset seleccionable como malo.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> <source>Skip</source> <translation>Saltar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> <source>Reset</source> <translation>Reiniciar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source>Reset the bisect search data</source> <translation>Reiniciar los datos de búsqueda de bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Reiniciar</b><p>Reinicia los datos de búsqueda de bisect.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> <source>Mark as "good"...</source> <translation>Marcar como "bueno"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Mark as "bad"...</source> <translation>Marcar como "malo"...</translation> </message> @@ -23001,35 +23001,35 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Identify changegroup</source> - <translation>Identificar changegroup</translation> + <translation type="obsolete">Identificar changegroup</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Identify changegroup...</source> - <translation>Identificar changegroup...</translation> + <translation type="obsolete">Identificar changegroup...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> <source>Identify a changegroup file containing a collection of changesets</source> - <translation>Identificar un archivo de changegroup conteniendo una colección de changesets</translation> + <translation type="obsolete">Identificar un archivo de changegroup conteniendo una colección de changesets</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> - <translation><b>Identificar changegroup</b><p>Identifica un archivo de changegroup conteniendo una colección de changesets.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <translation type="obsolete"><b>Identificar changegroup</b><p>Identifica un archivo de changegroup conteniendo una colección de changesets.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> <source>Back out changeset</source> <translation>Hacer respaldo de changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/> <source>Back out changes of an earlier changeset</source> <translation>Hacer respaldo de cambios de un changeset anterior</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Hacer respaldo de changeset</b><p>Hace un respaldo de cambios de un changeset anterior.</p></translation> </message> @@ -23049,37 +23049,37 @@ <translation><b>Hacer push de cambios (force)</b><p>Se hace un push de los cambios desde el repositorio local a un repositorio remoto utilizando la opción 'force'.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> <source>Specials</source> <translation>Especial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> <source>Serve project repository</source> <translation>Servir repositorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> <source>Serve project repository...</source> <translation>Servir repositorio de proyecto...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> <source>Serve the project repository</source> <translation>Servir el repositorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation><b>Servir repositorio de proyecto</b><p>Esto sirve el repositorio de proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1206"/> <source>Pull</source> <translation>Hacer Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> @@ -23099,17 +23099,17 @@ <translation><b>Hacer push de nueva rama</b><p>Hace un push de la rama actual del proyecto local como una nueva rama con nombre.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> <source>Rollback last transaction</source> <translation>Rollback de última transacción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> <source>Rollback the last transaction</source> <translation>Rollback de la última transacción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source>Extensions</source> <translation>Extensiones</translation> </message> @@ -23174,127 +23174,127 @@ <translation><b>Mostrar ajustes de configuración combinados</b><p>Muestra los ajustes de configuración combinados de todos los archivos de configuración.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> <source>Skip...</source> <translation>Ignorar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="780"/> <source>Skip a selectable changeset</source> <translation>Ignorar un changeset seleccionable</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation><b>Ignorar</b><p>Ignora un changeset seleccionable.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1441"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1419"/> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <source>Import Patch...</source> + <translation>Importar Patch...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="863"/> + <source>Import a patch from a patch file</source> + <translation>Importar un patch desde un archivo de patch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> + <translation><b>Importar Patch</b><p>Importa un patch desde un archivo de patch al proyecto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1030"/> + <source>Patch Management</source> + <translation>Gestión de Patch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1439"/> + <source>Revert Changes</source> + <translation>Revertir cambios</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> - <source>Import Patch...</source> - <translation>Importar Patch...</translation> + <source>Export Patches</source> + <translation>Exportar Patches</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <source>Export Patches...</source> + <translation>Exportar Patches...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> - <source>Import a patch from a patch file</source> - <translation>Importar un patch desde un archivo de patch</translation> + <source>Export revisions to patch files</source> + <translation>Exportar revisiones a archivos de patch</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> - <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> - <translation><b>Importar Patch</b><p>Importa un patch desde un archivo de patch al proyecto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1046"/> - <source>Patch Management</source> - <translation>Gestión de Patch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1461"/> - <source>Revert Changes</source> - <translation>Revertir cambios</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> - <source>Export Patches</source> - <translation>Exportar Patches</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> - <source>Export Patches...</source> - <translation>Exportar Patches...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> - <source>Export revisions to patch files</source> - <translation>Exportar revisiones a archivos de patch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation><b>Exportar Patches</b><p>Exporta revisiones del proyecto a archivos de patch.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> <source>Change Phase...</source> <translation>Cambiar Fase...</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> + <source>Change the phase of revisions</source> + <translation>Cambiar la fase de revisiones</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> + <translation><b>Cambiar Fase</b><p>Cambia la fase de revisiones.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1459"/> + <source>Copy Changesets</source> + <translation>Copiar Changesets</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> - <source>Change the phase of revisions</source> - <translation>Cambiar la fase de revisiones</translation> + <source>Copies changesets from another branch</source> + <translation>Copiar changesets de otra branch</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> - <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> - <translation><b>Cambiar Fase</b><p>Cambia la fase de revisiones.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1481"/> - <source>Copy Changesets</source> - <translation>Copiar Changesets</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="922"/> - <source>Copies changesets from another branch</source> - <translation>Copiar changesets de otra branch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="925"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation><b>Copiar Changesets</b><p>Copia changesets de otra branch encima del directorio de trabajo actual con el usuario, fecha y descripción del changeset original.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <source>Continue Copying Session</source> <translation>Continuar Sesión de Copia</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="938"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> <source>Continue the last copying session after conflicts were resolved</source> <translation>Continuar la última sesión de copia despues de resolver los conflictos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="926"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation><b>Continuar Sesión de C opia</b><p>Continua la última sesión de copia despues de resolver los conflictos.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> <source>Graft</source> <translation>Graft</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> @@ -23319,47 +23319,47 @@ <translation><b>Conflictos resueltos</b><p>Marca todos los conflictos del proyecto local como resueltos.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Add</source> <translation>Añadir</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> + <source>Add...</source> + <translation>Añadir...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="939"/> + <source>Add a sub-repository</source> + <translation>Añadir un sub-repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> + <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> + <translation><b>Añadir...</b><p>Añadir un sub-repositorio al proyecto.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> - <source>Add...</source> - <translation>Añadir...</translation> + <source>Remove</source> + <translation>Eliminar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> + <source>Remove...</source> + <translation>Eliminar...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="954"/> - <source>Add a sub-repository</source> - <translation>Añadir un sub-repositorio</translation> + <source>Remove sub-repositories</source> + <translation>Eliminar sub-repositorios</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957"/> - <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> - <translation><b>Añadir...</b><p>Añadir un sub-repositorio al proyecto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> - <source>Remove</source> - <translation>Eliminar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> - <source>Remove...</source> - <translation>Eliminar...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> - <source>Remove sub-repositories</source> - <translation>Eliminar sub-repositorios</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation><b>Eliminar...</b><p>Eliminar sub-repositorios del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> <source>Sub-Repository</source> <translation>Sub-repositorio</translation> </message> @@ -23389,27 +23389,27 @@ <translation><b>Mostrar sumario</b><p>Muestra información sumarial del estado del directorio de trabajo.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> <source>Create unversioned archive</source> <translation>Crear archivo sin versionar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> <source>Create unversioned archive...</source> <translation>Crear archivo sin versionar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="985"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/> <source>Create an unversioned archive from the repository</source> <translation>Crear un archivo sin versionar a partir del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="988"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation><b>Crear archivo sin versionar...</b><p>Crea un archivo sin versionar a partir del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation><b>Rollback de última transacción</b><p>Lleva a cabo un rollback de la última transacción. Las transactiones se utilizan para encapsular los efectos de todos los comandos que crean nuevos changesets or propagan changesets existentes hacia un repository. Por ejemplo, los siguientes comandos son transaccionales, y sus efectos pueden ser revertidos (rollback):<ul><li>commit</li><li>import</li><li>pull</li><li>push (con este repositorio como destino)</li><li>unbundle</li></ul></p><p><strong>Este comando es peligroso. Utiliícelo por favor con cuidado.</strong></p></translation> </message>
--- a/i18n/eric5_fr.ts Tue Mar 25 19:34:15 2014 +0100 +++ b/i18n/eric5_fr.ts Tue Mar 25 19:40:41 2014 +0100 @@ -20912,7 +20912,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2530"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> @@ -20927,22 +20927,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> @@ -20962,7 +20962,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2633"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> @@ -20972,22 +20972,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2522"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2531"/> - <source>Identifying changegroup file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2673"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> @@ -20997,12 +20992,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2721"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2746"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2714"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -21012,72 +21007,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3308"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3166"/> <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="3340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3308"/> <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="2822"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2790"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2870"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2838"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2918"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2886"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2999"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3085"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/> <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="3098"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3066"/> <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="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3137"/> <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="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3137"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3106"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -21107,7 +21102,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3035"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -24639,7 +24634,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> @@ -24674,22 +24669,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1385"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1038"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1023"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> @@ -24699,7 +24694,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> @@ -24719,67 +24714,67 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="767"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="766"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="784"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> <source>Skip</source> <translation type="unfinished">Passer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> <source>Reset</source> <translation type="unfinished">Réinitialiser</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> @@ -24824,37 +24819,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> - <source>Identify changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> - <source>Identify changegroup...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> - <source>Identify a changegroup file containing a collection of changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> - <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> @@ -24874,37 +24849,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1206"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -24924,17 +24899,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -24999,127 +24974,127 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="780"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1441"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1419"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <source>Import Patch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="863"/> + <source>Import a patch from a patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1030"/> + <source>Patch Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1439"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> - <source>Import Patch...</source> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> - <source>Import a patch from a patch file</source> + <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> - <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1046"/> - <source>Patch Management</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1461"/> - <source>Revert Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> - <source>Export Patches</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> - <source>Export Patches...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> - <source>Export revisions to patch files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1459"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> - <source>Change the phase of revisions</source> + <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> - <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1481"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="922"/> - <source>Copies changesets from another branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="925"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="938"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="926"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> <source>Graft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -25144,47 +25119,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Add</source> <translation type="unfinished">Ajouter</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> + <source>Add...</source> + <translation type="unfinished">Ajouter...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="939"/> + <source>Add a sub-repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> + <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> - <source>Add...</source> - <translation type="unfinished">Ajouter...</translation> + <source>Remove</source> + <translation type="unfinished">Supprimer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> + <source>Remove...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="954"/> - <source>Add a sub-repository</source> + <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957"/> - <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> - <source>Remove</source> - <translation type="unfinished">Supprimer</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> - <source>Remove...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> - <source>Remove sub-repositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> @@ -25214,27 +25189,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="985"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="988"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_it.ts Tue Mar 25 19:34:15 2014 +0100 +++ b/i18n/eric5_it.ts Tue Mar 25 19:40:41 2014 +0100 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.1" language="it_IT"> +<!DOCTYPE TS><TS version="2.0" language="it_IT" sourcelanguage=""> <context> <name>AboutDialog</name> <message> @@ -2065,8 +2064,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="142"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>Apri in una nuova linguetta &Tab Ctrl+LMB</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Apri in una nuova linguetta &Tab<byte value="x9"/>Ctrl+LMB</translation> </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="148"/> @@ -2307,8 +2306,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="90"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>Apri in una nuova linguetta &Tab Ctrl+LMB</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Apri in una nuova linguetta &Tab<byte value="x9"/>Ctrl+LMB</translation> </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="101"/> @@ -16125,8 +16124,8 @@ <name>HelpBrowser</name> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1083"/> - <source>Open Link in New Tab Ctrl+LMB</source> - <translation>Apri link in una Nuova Scheda Ctrl+LMB</translation> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Apri link in una Nuova Scheda<byte value="x9"/>Ctrl+LMB</translation> </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="655"/> @@ -19811,7 +19810,7 @@ <translation>Recupero da una transazione interrotta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2530"/> <source>Shall the working directory be updated?</source> <translation>Le directory di lavoro devono essere aggiornate ?</translation> </message> @@ -19826,22 +19825,22 @@ <translation>Crea changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/> <source>Apply changegroups</source> <translation>Applica changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Sottocomando Bisect ({0}) non valido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> @@ -19861,7 +19860,7 @@ <translation><p>Il file <b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2633"/> <source>Removing files from the Mercurial repository only</source> <translation>Rimozione di file dal solo repository Mercurial</translation> </message> @@ -19871,22 +19870,22 @@ <translation>Mercurial Changegroup Files (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2522"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Changegroup Files (*.hg);;All Files (*)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2531"/> <source>Identifying changegroup file</source> - <translation>Identifica i file changegroup</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2726"/> + <translation type="obsolete">Identifica i file changegroup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/> <source>Backing out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2673"/> <source>No revision given. Aborting...</source> <translation>Nessuna revisione fornita. Termino...</translation> </message> @@ -19896,12 +19895,12 @@ <translation><p>Il file changegroup di Mercurial<b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2721"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2746"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2714"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -19911,72 +19910,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3308"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3166"/> <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="3340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3308"/> <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="2822"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2790"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2870"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2838"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2918"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2886"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2999"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3085"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/> <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="3098"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3066"/> <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="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3137"/> <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="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3137"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3106"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -20006,7 +20005,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3035"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -23626,7 +23625,7 @@ <translation><b>Recover</b><p>Recupera da una transazione interrotta.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> <source>Repository Administration</source> <translation>Amministrazione repository</translation> </message> @@ -23661,22 +23660,22 @@ <translation>Crea un file changegroup che colleziona i changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1385"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> <source>Apply changegroups</source> <translation>Applica changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Apply changegroups...</source> <translation>Applica changegroups...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> <source>Apply one or several changegroup files</source> <translation>Applica una o più file changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1038"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1023"/> <source>Changegroup Management</source> <translation>Changegroup Management</translation> </message> @@ -23686,7 +23685,7 @@ <translation><b>Crea changegroup</b><p>Crea un file changegroup che colleziona i changeset (hg bundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Applica changegroups</b><p>Applica una o più file changegroups generati dall'azione Create changegroup' action (hg unbundle).</p></translation> </message> @@ -23706,37 +23705,37 @@ <translation><b>Mostra il branch corrente</b><p>Mostra il branch corrente del progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> <source>Mark as "good"</source> <translation>Segna come "good"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="767"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> <source>Mark a selectable changeset as good</source> <translation>Segna un chageset selezionabile come good</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation><b>Segna come "good"</b><p>Segna un chageset selezionabile come good.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Mark as "bad"</source> <translation>Segna come "bad"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="766"/> <source>Mark a selectable changeset as bad</source> <translation>Segna un chageset selezionabile come bad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="784"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Segna come bad</b><p>Segna un chageset selezionabile come bad.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> <source>Skip</source> <translation>Salta</translation> </message> @@ -23751,32 +23750,32 @@ <translation type="obsolete"><b>Skip</b><p>Salta il changest corrente.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> <source>Reset</source> <translation>Resetta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source>Reset the bisect search data</source> <translation>Reset dei dati di ricerca bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Reset</b><p>Reset dei dati di ricerca bisect.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> <source>Mark as "good"...</source> <translation>Segna come "good"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Mark as "bad"...</source> <translation>Segna come "bad"...</translation> </message> @@ -23823,35 +23822,35 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Identify changegroup</source> - <translation>Identifica changegroup</translation> + <translation type="obsolete">Identifica changegroup</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Identify changegroup...</source> - <translation>Identifica changegroup...</translation> + <translation type="obsolete">Identifica changegroup...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> <source>Identify a changegroup file containing a collection of changesets</source> - <translation>Identifica un changegroup contenente una collezione di changeset</translation> + <translation type="obsolete">Identifica un changegroup contenente una collezione di changeset</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> - <translation><b>Identifica changegroup</b><p>Identifica un changegroup contenente una collezione di changeset.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <translation type="obsolete"><b>Identifica changegroup</b><p>Identifica un changegroup contenente una collezione di changeset.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> <source>Back out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/> <source>Back out changes of an earlier changeset</source> <translation>Ritiro changeset di un changeset precedente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation></b>Ritiro changeset</b><p>Ritiro changeset di un changeset precedente.</p></translation> </message> @@ -23871,37 +23870,37 @@ <translation><b>Push modifiche (force)</b><p>Esegue il push delle modifche dal repository locale verso uno remoto usando l'opzione 'force'.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> <source>Serve project repository</source> <translation>Servi repository del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> <source>Serve project repository...</source> <translation>Servi repository del progetto...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> <source>Serve the project repository</source> <translation>Servi il repository del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation><b>Servi repository del progetto</b><p>Rende disponibile il repository del progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> <source>Specials</source> <translation>Speciali</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1206"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> <source>The project should be reread. Do this now?</source> <translation>Il progetto deve essere riletto. Farlo ora ?</translation> </message> @@ -23921,17 +23920,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -23996,127 +23995,127 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="780"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1441"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1419"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <source>Import Patch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="863"/> + <source>Import a patch from a patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1030"/> + <source>Patch Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1439"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> - <source>Import Patch...</source> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> - <source>Import a patch from a patch file</source> + <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> - <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1046"/> - <source>Patch Management</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1461"/> - <source>Revert Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> - <source>Export Patches</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> - <source>Export Patches...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> - <source>Export revisions to patch files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1459"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> - <source>Change the phase of revisions</source> + <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> - <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1481"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="922"/> - <source>Copies changesets from another branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="925"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="938"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="926"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> <source>Graft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -24141,47 +24140,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Add</source> <translation type="unfinished">Aggiungi</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> + <source>Add...</source> + <translation type="unfinished">Aggiungi...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="939"/> + <source>Add a sub-repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> + <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> - <source>Add...</source> - <translation type="unfinished">Aggiungi...</translation> + <source>Remove</source> + <translation type="unfinished">Rimuovi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> + <source>Remove...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="954"/> - <source>Add a sub-repository</source> + <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957"/> - <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> - <source>Remove</source> - <translation type="unfinished">Rimuovi</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> - <source>Remove...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> - <source>Remove sub-repositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> @@ -24211,27 +24210,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="985"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="988"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_ru.ts Tue Mar 25 19:34:15 2014 +0100 +++ b/i18n/eric5_ru.ts Tue Mar 25 19:40:41 2014 +0100 @@ -19950,7 +19950,7 @@ <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2530"/> <source>Shall the working directory be updated?</source> <translation>Обновить рабочий каталог?</translation> </message> @@ -19965,22 +19965,22 @@ <translation>Создать группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Неправильная подкоманда ({0}) для Bisect.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484"/> <source>Preview changegroup</source> <translation>Предпросмотр группы изменений</translation> </message> @@ -20000,7 +20000,7 @@ <translation><p>Файл <b>{0}</b> уже существует. Перезаписать?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2633"/> <source>Removing files from the Mercurial repository only</source> <translation>Удаление файлов только из репозитория</translation> </message> @@ -20010,22 +20010,22 @@ <translation>Mercurial файлы изменений (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2522"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2531"/> <source>Identifying changegroup file</source> - <translation>Файлы изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2726"/> + <translation type="obsolete">Файлы изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/> <source>Backing out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2673"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> @@ -20035,12 +20035,12 @@ <translation><p>Файл группы изменений<b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2721"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2746"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2714"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -20050,72 +20050,72 @@ <translation>Фиксировать изменения в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3308"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3166"/> <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="3340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3308"/> <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="2822"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2790"/> <source>Import Patch</source> <translation type="unfinished">Импортировать патч</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2870"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2838"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2918"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2886"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2999"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3085"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/> <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="3098"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3066"/> <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="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3137"/> <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="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3137"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3106"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -20145,7 +20145,7 @@ <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3035"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -23765,7 +23765,7 @@ <translation><b>Восстановить</b><p>Восстановить после прерванной транзакции.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> <source>Repository Administration</source> <translation>Администрирование репозитория</translation> </message> @@ -23800,22 +23800,22 @@ <translation>Создать файл коллекции изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1385"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Apply changegroups...</source> <translation>Применить группу изменений...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> <source>Apply one or several changegroup files</source> <translation>Применить файл(ы) группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1038"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1023"/> <source>Changegroup Management</source> <translation>Менеджмент группы изменений</translation> </message> @@ -23825,7 +23825,7 @@ <translation><b>Создать группу изменений</b><p>Создать группу изменений собрав выбранные изменения (hg bundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Применить группы изменений</b><p>Применить одну или несколько групп изменений созданную командой 'Создать группу изменений' (hg unbundle).</p></translation> </message> @@ -23845,37 +23845,37 @@ <translation><b>Показать текущую ветвь</b><p>Показать текущую ветвь проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> <source>Mark as "good"</source> <translation>Пометить как "хороший"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="767"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> <source>Mark a selectable changeset as good</source> <translation>Пометить выбранные изменения как "хорошие"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation><b>Пометить как "хорошие"</b><p>Пометить выбранные изменения как "хорошие".</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Mark as "bad"</source> <translation>Пометить как "плохой"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="766"/> <source>Mark a selectable changeset as bad</source> <translation>Пометить выбранные изменения как "плохие"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="784"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Пометить как "плохие"</b><p>Пометить выбранные изменения как "плохие".</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> <source>Skip</source> <translation>Пропустить</translation> </message> @@ -23890,32 +23890,32 @@ <translation type="obsolete"><b>Пропустить</b><p>Пропустить текущие изменения.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> <source>Reset</source> <translation>Сбросить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source>Reset the bisect search data</source> <translation>Сбросить данные двоичного поиска</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Сбросить</b><p>Сбросить данные двоичного поиска.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Bisect</source> <translation>Двоичный поиск</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> <source>Mark as "good"...</source> <translation>Пометить как "хороший"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Mark as "bad"...</source> <translation>Пометить как "плохой"...</translation> </message> @@ -23962,35 +23962,35 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Identify changegroup</source> - <translation>Выбрать группу изменений</translation> + <translation type="obsolete">Выбрать группу изменений</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Identify changegroup...</source> - <translation>Выбрать группу изменений...</translation> + <translation type="obsolete">Выбрать группу изменений...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> <source>Identify a changegroup file containing a collection of changesets</source> - <translation>Выбрать файл содержащий коллекцию групп изменений</translation> + <translation type="obsolete">Выбрать файл содержащий коллекцию групп изменений</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> - <translation><b>Выбрать изменения</b><p>Выбрать файл содержащий коллекцию групп изменений.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <translation type="obsolete"><b>Выбрать изменения</b><p>Выбрать файл содержащий коллекцию групп изменений.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> <source>Back out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/> <source>Back out changes of an earlier changeset</source> <translation>Отмена предыдущих изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Отмена изменений</b><p>Отмена предыдущих изменений.</p></translation> </message> @@ -24010,37 +24010,37 @@ <translation><b>Послать изменения (принудительно)</b><p>Послать изменения в удалённый репозиторий (принудительно).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> <source>Specials</source> <translation>Специфический</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> <source>Serve project repository</source> <translation>Запустить сервер для репозитория проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> <source>Serve project repository...</source> <translation>Запустить сервер для репозитория проекта...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> <source>Serve the project repository</source> <translation>Запустить сервер для репозитория проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation><b>Запустить сервер для репозитория проекта</b><p>Запустить сервер для репозитория проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1206"/> <source>Pull</source> <translation>Загрузить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> <source>The project should be reread. Do this now?</source> <translation>Необходимо перезагрузить проект. Сделать это?</translation> </message> @@ -24060,17 +24060,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -24135,127 +24135,127 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="780"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1441"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1419"/> <source>Import Patch</source> <translation type="unfinished">Импортировать патч</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <source>Import Patch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="863"/> + <source>Import a patch from a patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1030"/> + <source>Patch Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1439"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> - <source>Import Patch...</source> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> - <source>Import a patch from a patch file</source> + <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> - <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1046"/> - <source>Patch Management</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1461"/> - <source>Revert Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> - <source>Export Patches</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> - <source>Export Patches...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> - <source>Export revisions to patch files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1459"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> - <source>Change the phase of revisions</source> + <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> - <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1481"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="922"/> - <source>Copies changesets from another branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="925"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="938"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="926"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> <source>Graft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -24280,47 +24280,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Add</source> <translation>Добавить</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> + <source>Add...</source> + <translation>Добавить...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="939"/> + <source>Add a sub-repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> + <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> - <source>Add...</source> - <translation>Добавить...</translation> + <source>Remove</source> + <translation>Удалить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> + <source>Remove...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="954"/> - <source>Add a sub-repository</source> + <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957"/> - <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> - <source>Remove</source> - <translation>Удалить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> - <source>Remove...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> - <source>Remove sub-repositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> @@ -24350,27 +24350,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="985"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="988"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_tr.ts Tue Mar 25 19:34:15 2014 +0100 +++ b/i18n/eric5_tr.ts Tue Mar 25 19:40:41 2014 +0100 @@ -19911,52 +19911,47 @@ <translation>Mercurial Değiştirme grubu Dosyaları (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2522"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Değişimgrubu Dosyaları (*.hg);;Tüm Dosyalar (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2531"/> - <source>Identifying changegroup file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2530"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2633"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2673"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> @@ -19966,12 +19961,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2721"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2746"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2714"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -19981,72 +19976,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3308"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3166"/> <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="3340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3308"/> <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="2822"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2790"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2870"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2838"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2918"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2886"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2999"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3085"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/> <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="3098"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3066"/> <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="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3137"/> <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="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3137"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3106"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -20076,7 +20071,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3035"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -23678,132 +23673,112 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> - <source>Identify changegroup</source> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> + <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> - <source>Identify changegroup...</source> + <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> - <source>Identify a changegroup file containing a collection of changesets</source> + <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> - <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1385"/> - <source>Apply changegroups</source> + <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> - <source>Apply changegroups...</source> + <source>Mark as "good"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> + <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> - <source>Apply one or several changegroup files</source> + <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> - <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> - <source>Mark as "good"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> - <source>Mark as "good"...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="767"/> - <source>Mark a selectable changeset as good</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="766"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="784"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> <source>Skip</source> <translation>Atla</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> <source>Reset</source> <translation>Başadön</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1038"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1023"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> @@ -23823,37 +23798,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1206"/> <source>Pull</source> <translation>Çekmek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> <source>The project should be reread. Do this now?</source> <translation>Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> @@ -23873,17 +23848,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -23948,127 +23923,127 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="780"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1441"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1419"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <source>Import Patch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="863"/> + <source>Import a patch from a patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1030"/> + <source>Patch Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1439"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> - <source>Import Patch...</source> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> - <source>Import a patch from a patch file</source> + <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> - <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1046"/> - <source>Patch Management</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1461"/> - <source>Revert Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> - <source>Export Patches</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> - <source>Export Patches...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> - <source>Export revisions to patch files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1459"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> - <source>Change the phase of revisions</source> + <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> - <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1481"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="922"/> - <source>Copies changesets from another branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="925"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="938"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="926"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> <source>Graft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -24093,47 +24068,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Add</source> <translation type="unfinished">Ekle</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> + <source>Add...</source> + <translation type="unfinished">Ekle...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="939"/> + <source>Add a sub-repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> + <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> - <source>Add...</source> - <translation type="unfinished">Ekle...</translation> + <source>Remove</source> + <translation type="unfinished">Kaldır</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> + <source>Remove...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="954"/> - <source>Add a sub-repository</source> + <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957"/> - <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> - <source>Remove</source> - <translation type="unfinished">Kaldır</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> - <source>Remove...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> - <source>Remove sub-repositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> @@ -24163,27 +24138,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="985"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="988"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_zh_CN.GB2312.ts Tue Mar 25 19:34:15 2014 +0100 +++ b/i18n/eric5_zh_CN.GB2312.ts Tue Mar 25 19:40:41 2014 +0100 @@ -20829,7 +20829,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2530"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> @@ -20844,22 +20844,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> @@ -20879,7 +20879,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2633"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> @@ -20889,22 +20889,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2522"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2531"/> - <source>Identifying changegroup file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2673"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> @@ -20914,12 +20909,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2721"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2746"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2714"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -20929,72 +20924,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3308"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3166"/> <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="3340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3308"/> <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="2822"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2790"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2870"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2838"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2918"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2886"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2999"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3085"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/> <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="3098"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3066"/> <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="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3137"/> <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="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3137"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3106"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -21024,7 +21019,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3035"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -24561,7 +24556,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> @@ -24596,22 +24591,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1385"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1038"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1023"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> @@ -24621,7 +24616,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> @@ -24641,67 +24636,67 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="767"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="766"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="784"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> <source>Skip</source> <translation type="unfinished">跳过</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> <source>Reset</source> <translation type="unfinished">重置</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> @@ -24746,37 +24741,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> - <source>Identify changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> - <source>Identify changegroup...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> - <source>Identify a changegroup file containing a collection of changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> - <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> @@ -24796,37 +24771,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1206"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -24846,17 +24821,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -24921,127 +24896,127 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="780"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1441"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1419"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <source>Import Patch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="863"/> + <source>Import a patch from a patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1030"/> + <source>Patch Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1439"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> - <source>Import Patch...</source> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> - <source>Import a patch from a patch file</source> + <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> - <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1046"/> - <source>Patch Management</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1461"/> - <source>Revert Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> - <source>Export Patches</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> - <source>Export Patches...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> - <source>Export revisions to patch files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1459"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> - <source>Change the phase of revisions</source> + <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> - <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1481"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="922"/> - <source>Copies changesets from another branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="925"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="938"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="926"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> <source>Graft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -25066,47 +25041,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Add</source> <translation type="unfinished">添加</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> + <source>Add...</source> + <translation type="unfinished">添加……</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="939"/> + <source>Add a sub-repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> + <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> - <source>Add...</source> - <translation type="unfinished">添加……</translation> + <source>Remove</source> + <translation type="unfinished">移除</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> + <source>Remove...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="954"/> - <source>Add a sub-repository</source> + <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957"/> - <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> - <source>Remove</source> - <translation type="unfinished">移除</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> - <source>Remove...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> - <source>Remove sub-repositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> @@ -25136,27 +25111,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="985"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="988"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message>
