Sat, 04 Aug 2018 15:38:32 +0200
Updated translations.
| Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui | file | annotate | diff | comparison | revisions | |
| i18n/eric6_cs.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_de.qm | file | annotate | diff | comparison | revisions | |
| i18n/eric6_de.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_empty.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_en.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_es.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_fr.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_it.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_pt.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_ru.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_tr.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_zh_CN.ts | file | annotate | diff | comparison | revisions |
--- a/Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui Sat Aug 04 15:38:09 2018 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui Sat Aug 04 15:38:32 2018 +0200 @@ -115,7 +115,7 @@ </sizepolicy> </property> <property name="toolTip"> - <string>Enter a bookmark name</string> + <string>Select a bookmark name</string> </property> </widget> </item>
--- a/i18n/eric6_cs.ts Sat Aug 04 15:38:09 2018 +0200 +++ b/i18n/eric6_cs.ts Sat Aug 04 15:38:32 2018 +0200 @@ -30659,17 +30659,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3401"/> <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="3495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -30679,52 +30679,52 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2960"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3007"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3055"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3063"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3112"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3303"/> <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="3200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/> <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="3271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> <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="3271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -30754,7 +30754,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3167"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -30789,62 +30789,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3647"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3698"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3731"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3773"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3880"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3873"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3924"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -30879,12 +30879,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> @@ -30893,6 +30893,16 @@ <source>Canceling uncommitted merge</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3124"/> + <source>Copy Changesets (Stop)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3137"/> + <source>Copy Changesets (Abort)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -32481,22 +32491,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="130"/> <source>Compare Against Second Parent</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="140"/> <source>Treat all Files as Text</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="147"/> <source>Omit Dates</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="154"/> <source>Use Git extended Diff-Format</source> <translation type="unfinished"></translation> </message> @@ -32511,6 +32521,16 @@ <p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="105"/> + <source>Bookmark:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="118"/> + <source>Enter a bookmark name</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgFetchDialog</name> @@ -32893,6 +32913,16 @@ <source>Perform Dry-Run</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="171"/> + <source>Select to not commit the copied changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="174"/> + <source>Don't Commit</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgHisteditCommitEditor</name> @@ -35102,7 +35132,7 @@ <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="1793"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1823"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> @@ -35117,7 +35147,7 @@ <translation>Použít soubory s jednou nebo více skupinami změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1339"/> <source>Changegroup Management</source> <translation>Správa skupin změn</translation> </message> @@ -35197,7 +35227,7 @@ <translation><b>Reset</b><p>Zresetuje bisect vyhledávání v datech.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352"/> <source>Bisect</source> <translation>Bisect</translation> </message> @@ -35302,17 +35332,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1610"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1640"/> <source>Pull</source> <translation type="unfinished">Stáhnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1963"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> </message> @@ -35342,7 +35372,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1397"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -35422,7 +35452,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1849"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1879"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -35442,12 +35472,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1869"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1899"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> @@ -35492,7 +35522,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1919"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> @@ -35522,12 +35552,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1934"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -35552,47 +35577,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Add</source> <translation type="unfinished">Přidat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Add...</source> <translation type="unfinished">Přidat...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <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="1021"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/> <source>Remove</source> <translation type="unfinished">Odebrat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1059"/> <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="1384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1417"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> @@ -35622,22 +35647,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1075"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> @@ -35647,7 +35672,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1305"/> <source>Administration</source> <translation type="unfinished"></translation> </message> @@ -35687,177 +35712,177 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> <source>List bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> - <source>List bookmarks...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> - <source>List bookmarks of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>Define bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>Define bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> - <source>Define a bookmark for the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Delete bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Delete bookmark...</source> + <source>List bookmarks...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> - <source>Delete a bookmark of the project</source> + <source>List bookmarks of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Rename bookmark</source> + <source>Define bookmark</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Rename bookmark...</source> + <source>Define bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> - <source>Rename a bookmark of the project</source> + <source>Define a bookmark for the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Move bookmark</source> + <source>Delete bookmark</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Move bookmark...</source> + <source>Delete bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> - <source>Move a bookmark of the project</source> + <source>Delete a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> - <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/> - <source>Show incoming bookmarks</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> - <source>Show a list of incoming bookmarks</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1137"/> - <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> - <source>Pull bookmark</source> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> + <source>Rename bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> + <source>Rename bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <source>Rename a bookmark of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1143"/> + <source>Move bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1143"/> + <source>Move bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1148"/> + <source>Move a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> + <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1159"/> + <source>Show incoming bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> + <source>Show a list of incoming bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> + <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1176"/> + <source>Pull bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1181"/> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1184"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1208"/> <source>Show outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1195"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1225"/> <source>Push bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1230"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1376"/> <source>Bookmarks</source> <translation type="unfinished">Záložky</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1360"/> <source>Tags</source> <translation type="unfinished">Tagy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> <source>Branches</source> <translation type="unfinished"></translation> </message> @@ -35907,65 +35932,100 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1389"/> - <source>Manage Changes</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1504"/> <source>Mercurial</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1192"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1200"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1241"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1246"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1249"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1258"/> <source>Delete all backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1263"/> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1007"/> + <source>Stop Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <source>Stop the interrupted copying session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> + <source>Abort Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025"/> + <source>Abort the interrupted copying session and rollback</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1028"/> + <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1422"/> + <source>Merge Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1948"/> + <source>Copy Changesets (Stop)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1963"/> + <source>Copy Changesets (Abort)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -36689,6 +36749,41 @@ <source>Current branch tip</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="428"/> + <source>Dry-Run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="434"/> + <source>Select to not do a dry-run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="437"/> + <source>No</source> + <translation type="unfinished">Ne</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="447"/> + <source>Select to just do a dry-run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="450"/> + <source>Dry-Run Only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="457"/> + <source>Select to do a dry-run first, than ask the user for confirmation to perform the rebase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="460"/> + <source>Dry-Run First, than Confirm</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRemoveSubrepositoriesDialog</name> @@ -61285,17 +61380,17 @@ <context> <name>Rebase</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="75"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="80"/> <source>Rebase Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="106"/> <source>Rebase Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="132"/> <source>Rebase Changesets (Abort)</source> <translation type="unfinished"></translation> </message> @@ -85269,22 +85364,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserView.py" line="2249"/> + <location filename="../WebBrowser/WebBrowserView.py" line="2250"/> <source>Quota Request</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserView.py" line="2249"/> + <location filename="../WebBrowser/WebBrowserView.py" line="2250"/> <source><p> Allow the website at <b>{0}</b> to use <b>{1}</b> of persistent storage?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserView.py" line="2281"/> + <location filename="../WebBrowser/WebBrowserView.py" line="2282"/> <source>Protocol Handler Request</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserView.py" line="2281"/> + <location filename="../WebBrowser/WebBrowserView.py" line="2282"/> <source><p> Allow the website at <b>{0}</b> to open all <b>{1}</b> links?</p></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric6_de.ts Sat Aug 04 15:38:09 2018 +0200 +++ b/i18n/eric6_de.ts Sat Aug 04 15:38:32 2018 +0200 @@ -29920,17 +29920,17 @@ <translation>Pflege Änderungen in das Mercurial-Repository ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Mercurial Command Server</source> <translation>Mercurial-Befehlsserver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3401"/> <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="3495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <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> @@ -29940,52 +29940,52 @@ <translation>Patch importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2960"/> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3007"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3055"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3063"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3112"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <source>Add Sub-repository</source> <translation>Unterrepository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3303"/> <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="3200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/> <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="3271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> <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="3271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> <source>Remove Sub-repositories</source> <translation>Unterrepositorys löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>Die Unterrepositorydatei .hgsub existiert nicht. Abbruch...</p></translation> </message> @@ -30015,7 +30015,7 @@ <translation>Wollen Sie wirklich alle Änderungen des Projektes rückgängig machen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3167"/> <source>Create Unversioned Archive</source> <translation>Erzeuge nicht versioniertes Archiv</translation> </message> @@ -30050,62 +30050,62 @@ <translation>Spitze des aktuellen Zweigs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665"/> <source>Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> <source>Delete Bookmark</source> <translation>Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> <source>Select the bookmark to be deleted:</source> <translation>Wähle das zu löschende Lesezeichen aus:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3647"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3698"/> <source>Delete Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3731"/> <source>Rename Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen umbenennen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3773"/> <source>Move Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> <source>Pull Bookmark</source> <translation>Lesezeichen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> <source>Select the bookmark to be pulled:</source> <translation>Wähle das herunterzuladende Lesezeichen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3880"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Lade Lesezeichen von einem entfernten Mercurial-Repository herunter</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> <source>Push Bookmark</source> <translation>Lesezeichen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> <source>Select the bookmark to be push:</source> <translation>Wähle das hochzuladende Lesezeichen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3873"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3924"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Lade Lesezeichen zu einem entfernten Mercurial-Repository hoch</translation> </message> @@ -30140,12 +30140,12 @@ <translation>Markiere als 'aufgelöst'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> <source>Delete All Backups</source> <translation>Alle Backups löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation><p>Sollen wirklich alle Backupdateien des Backupbereiches <b>{0}</b> gelöscht werden?</p></translation> </message> @@ -30154,6 +30154,16 @@ <source>Canceling uncommitted merge</source> <translation>Breche Zusammenführung ab</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3124"/> + <source>Copy Changesets (Stop)</source> + <translation>Änderungssätze kopieren (Stopp)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3137"/> + <source>Copy Changesets (Abort)</source> + <translation>Änderungssätze kopieren (Abbruch)</translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -31718,22 +31728,22 @@ <translation>Gib Änderungssätze mittels Nummer, ID, Bereich oder Revset Ausdruck je einen pro Zeile ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="130"/> <source>Compare Against Second Parent</source> <translation>Gegen zweiten Vorgänger vergleichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="140"/> <source>Treat all Files as Text</source> <translation>Alle Dateien als Text betrachten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="147"/> <source>Omit Dates</source> <translation>Datum auslassen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="154"/> <source>Use Git extended Diff-Format</source> <translation>Git erweitertes Diff-Format verwenden</translation> </message> @@ -31749,6 +31759,16 @@ <translation><b>Zielname</b> <p>Gib den Zielnamen in dieses Feld ein. Der Zielname muss der neue Name oder ein absoluter Pfad sein.</p></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="105"/> + <source>Bookmark:</source> + <translation>Lesezeichen:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="118"/> + <source>Select a bookmark name</source> + <translation>Wähle ein Lesezeichen aus</translation> + </message> </context> <context> <name>HgFetchDialog</name> @@ -32131,6 +32151,16 @@ <source>Perform Dry-Run</source> <translation>Testlauf durchführen</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="171"/> + <source>Select to not commit the copied changesets</source> + <translation>Auswählen, um die kopierten Änderungssätze nicht einzupflegen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="174"/> + <source>Don't Commit</source> + <translation>Nicht einpflegen</translation> + </message> </context> <context> <name>HgHisteditCommitEditor</name> @@ -34118,7 +34148,7 @@ <translation>Erzeuge eine Änderungsgruppendatei für Änderungssätze</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1793"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1823"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> @@ -34133,7 +34163,7 @@ <translation>Wende eine oder mehrere Änderungsgruppendateien an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1339"/> <source>Changegroup Management</source> <translation>Verwaltung von Änderungsgruppen</translation> </message> @@ -34213,7 +34243,7 @@ <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="1322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352"/> <source>Bisect</source> <translation>Bisect</translation> </message> @@ -34298,7 +34328,7 @@ <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="1300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> <source>Specials</source> <translation>Spezialfunktionen</translation> </message> @@ -34323,12 +34353,12 @@ <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="1610"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1640"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1963"/> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> @@ -34358,7 +34388,7 @@ <translation>Die letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1397"/> <source>Extensions</source> <translation>Erweiterungen</translation> </message> @@ -34438,7 +34468,7 @@ <translation><b>Überspringen</b><p>Dies überspringt einen auswählbaren Änderungssatz.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1849"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1879"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> @@ -34458,12 +34488,12 @@ <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="1316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> <source>Patch Management</source> <translation>Verwaltung von Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1869"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1899"/> <source>Revert Changes</source> <translation>Änderungen rückgängig machen</translation> </message> @@ -34508,7 +34538,7 @@ <translation><b>Phase ändern</b><p>Dies ändert die Phase von Revisionen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1919"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> @@ -34538,12 +34568,7 @@ <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="1378"/> - <source>Graft</source> - <translation>Graft</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1934"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> @@ -34568,47 +34593,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="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Add</source> <translation>Hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Add...</source> <translation>Hinzufügen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> <source>Add a sub-repository</source> <translation>Ein Unterrepository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <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="1021"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/> <source>Remove</source> <translation>Entfernen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/> <source>Remove...</source> <translation>Entfernen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> <source>Remove sub-repositories</source> <translation>Unterrepositorys löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1059"/> <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="1384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1417"/> <source>Sub-Repository</source> <translation>Unterrepository</translation> </message> @@ -34638,22 +34663,22 @@ <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="1037"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067"/> <source>Create unversioned archive</source> <translation>Erzeuge nicht versioniertes Archiv</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067"/> <source>Create unversioned archive...</source> <translation>Erzeuge nicht versioniertes Archiv...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> <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="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1075"/> <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> @@ -34663,7 +34688,7 @@ <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> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1305"/> <source>Administration</source> <translation>Verwaltung</translation> </message> @@ -34703,177 +34728,177 @@ <translation><b>Zusammenführung abbrechen</b><p>Dies bricht eine nicht eingepflegte Zusammenführung unter Verlust aller Änderungen ab.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> <source>List bookmarks</source> <translation>Lesezeichen listen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> - <source>List bookmarks...</source> - <translation>Lesezeichen listen …</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> - <source>List bookmarks of the project</source> - <translation>Listet Lesezeichen des Projektes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> - <translation><b>Lesezeichen listen</b><p>Dies listet die Lesezeichen des Projektes.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>Define bookmark</source> - <translation>Lesezeichen hinzufügen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>Define bookmark...</source> - <translation>Lesezeichen hinzufügen …</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> - <source>Define a bookmark for the project</source> - <translation>Fügt dem Projekt ein Lesezeichen hinzu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> - <translation><b>Lesezeichen hinzufügen</b><p>Dies fügt dem Projekt ein Lesezeichen hinzu.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Delete bookmark</source> - <translation>Lesezeichen löschen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Delete bookmark...</source> - <translation>Lesezeichen löschen …</translation> + <source>List bookmarks...</source> + <translation>Lesezeichen listen …</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> - <source>Delete a bookmark of the project</source> - <translation>Löscht ein Lesezeichen aus dem Projekt</translation> + <source>List bookmarks of the project</source> + <translation>Listet Lesezeichen des Projektes</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> - <translation><b>Lesezeichen löschen</b><p>Dies löscht ein Lesezeichen aus dem Projekt.</p></translation> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <translation><b>Lesezeichen listen</b><p>Dies listet die Lesezeichen des Projektes.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Rename bookmark</source> - <translation>Lesezeichen umbenennen</translation> + <source>Define bookmark</source> + <translation>Lesezeichen hinzufügen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Rename bookmark...</source> - <translation>Lesezeichen umbenennen …</translation> + <source>Define bookmark...</source> + <translation>Lesezeichen hinzufügen …</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> - <source>Rename a bookmark of the project</source> - <translation>Benennt ein Lesezeichen des Projektes um</translation> + <source>Define a bookmark for the project</source> + <translation>Fügt dem Projekt ein Lesezeichen hinzu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> - <translation><b>Lesezeichen umbenennen</b><p>Dies benennt ein Lesezeichen des Projektes um</p></translation> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> + <translation><b>Lesezeichen hinzufügen</b><p>Dies fügt dem Projekt ein Lesezeichen hinzu.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Move bookmark</source> - <translation>Lesezeichen verschieben</translation> + <source>Delete bookmark</source> + <translation>Lesezeichen löschen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Move bookmark...</source> - <translation>Lesezeichen verschieben …</translation> + <source>Delete bookmark...</source> + <translation>Lesezeichen löschen …</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> - <source>Move a bookmark of the project</source> - <translation>Verschiebt ein Lesezeichen des Projektes</translation> + <source>Delete a bookmark of the project</source> + <translation>Löscht ein Lesezeichen aus dem Projekt</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> - <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> - <translation><b>Lesezeichen verschieben</b><p>Dies verschiebt ein Lesezeichen des Projektes.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/> - <source>Show incoming bookmarks</source> - <translation>Zeige eingehende Lesezeichen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> - <source>Show a list of incoming bookmarks</source> - <translation>Zeigt eine Liste eingehender Lesezeichen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1137"/> - <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> - <translation><b>Zeige eingehende Lesezeichen</b><p>Dies zeigt eine Liste neuer Lesezeichen, die in einem entfernten Repository verfügbar sind, an.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> - <source>Pull bookmark</source> - <translation>Lesezeichen herunterladen</translation> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <translation><b>Lesezeichen löschen</b><p>Dies löscht ein Lesezeichen aus dem Projekt.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> + <source>Rename bookmark</source> + <translation>Lesezeichen umbenennen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> + <source>Rename bookmark...</source> + <translation>Lesezeichen umbenennen …</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <source>Rename a bookmark of the project</source> + <translation>Benennt ein Lesezeichen des Projektes um</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <translation><b>Lesezeichen umbenennen</b><p>Dies benennt ein Lesezeichen des Projektes um</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1143"/> + <source>Move bookmark</source> + <translation>Lesezeichen verschieben</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1143"/> + <source>Move bookmark...</source> + <translation>Lesezeichen verschieben …</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1148"/> + <source>Move a bookmark of the project</source> + <translation>Verschiebt ein Lesezeichen des Projektes</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> + <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> + <translation><b>Lesezeichen verschieben</b><p>Dies verschiebt ein Lesezeichen des Projektes.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1159"/> + <source>Show incoming bookmarks</source> + <translation>Zeige eingehende Lesezeichen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> + <source>Show a list of incoming bookmarks</source> + <translation>Zeigt eine Liste eingehender Lesezeichen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> + <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> + <translation><b>Zeige eingehende Lesezeichen</b><p>Dies zeigt eine Liste neuer Lesezeichen, die in einem entfernten Repository verfügbar sind, an.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1176"/> + <source>Pull bookmark</source> + <translation>Lesezeichen herunterladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1181"/> <source>Pull a bookmark from a remote repository</source> <translation>Ein Lesezeichen von einem entfernten Repository herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1184"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation><b>Lesezeichen herunterladen</b><p>Dies lädt ein Lesezeichen von einem entfernten Repository in das lokale Repository herunter.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1208"/> <source>Show outgoing bookmarks</source> <translation>Zeige ausgehende Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213"/> <source>Show a list of outgoing bookmarks</source> <translation>Zeigt eine Liste ausgehender Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation><b>Zeige ausgehende Lesezeichen</b><p>Dies zeigt eine Liste neuer Lesezeichen, die im lokalen Repository verfügbar sind, an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1195"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1225"/> <source>Push bookmark</source> <translation>Lesezeichen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1230"/> <source>Push a bookmark to a remote repository</source> <translation>Ein Lesezeichen an ein entferntes Repository hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation><b>Lesezeichen hochladen</b><p>Dies lädt ein Lesezeichen vom lokalen Repository an ein entferntes Repository hoch.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1376"/> <source>Bookmarks</source> <translation>Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1360"/> <source>Tags</source> <translation>Marken</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> <source>Branches</source> <translation>Zweige</translation> </message> @@ -34923,65 +34948,105 @@ <translation><b>Konflikte ungelöst</b><p>Dies markiert alle Konflikte des lokalen Projektes als ungelöst.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1389"/> - <source>Manage Changes</source> - <translation>Änderungen verwalten</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation><b>Neu zusammenführen</b><p>Dies führt alle Dateien des Projektes mit nicht aufgelösten Konflikten unter Verlust sämtlicher vorangegangener Versuche erneut zusammen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1504"/> <source>Mercurial</source> <translation>Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1192"/> <source>Pull current bookmark</source> <translation>Aktuelles Lesezeichen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> <source>Pull the current bookmark from a remote repository</source> <translation>Das aktuelle Lesezeichen von einem entfernten Repository herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1200"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation><b>Aktuelles Lesezeichen herunterladen</b><p>Dies lädt das aktuelle Lesezeichen von einem entfernten Repository in das lokale Repository herunter.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1241"/> <source>Push current bookmark</source> <translation>Aktuelles Lesezeichen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1246"/> <source>Push the current bookmark to a remote repository</source> <translation>Das aktuelle Lesezeichen an ein entferntes Repository hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1249"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation><b>Aktuelles Lesezeichen hochladen</b><p>Dies lädt das aktuelle Lesezeichen vom lokalen Repository an ein entferntes Repository hoch.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1258"/> <source>Delete all backups</source> <translation>Alle Backups löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1263"/> <source>Delete all backup bundles stored in the backup area</source> <translation>Löscht alle Backupdateien im Backupbereich</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation><b>Alle Backups löschen</b><p>Dies löscht alle Backupdateien im Backupbereich des Repository.</p></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1007"/> + <source>Stop Copying Session</source> + <translation>Kopiersitzung anhalten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <source>Stop the interrupted copying session</source> + <translation>Hält die unterbrochene Kopiersitzung an</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> + <source>Abort Copying Session</source> + <translation>Kopiersitzung abbrechen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025"/> + <source>Abort the interrupted copying session and rollback</source> + <translation>Bricht die unterbrochene Kopiersitzung ab und rollt sie zurück</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1028"/> + <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> + <translation><b>Kopiersitzung abbrechen</b><p>Dies bricht die unterbrochene Kopiersitzung ab und rollt sie auf den Zustand vor dem Kopieren zurück.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1422"/> + <source>Merge Changesets</source> + <translation>Änderungen zusammenführen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1948"/> + <source>Copy Changesets (Stop)</source> + <translation>Änderungssätze kopieren (Stopp)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1963"/> + <source>Copy Changesets (Abort)</source> + <translation>Änderungssätze kopieren (Abbruch)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> + <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> + <translation><b>Kopiersitzung anhalten</b><p>Dies hält die unterbrochene Kopiersitzung an.</p></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -35707,6 +35772,41 @@ <source>Current branch tip</source> <translation>Spitze des aktuellen Zweigs</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="428"/> + <source>Dry-Run</source> + <translation>Testlauf</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="434"/> + <source>Select to not do a dry-run</source> + <translation>Auswählen, um keinen Testlauf durchzuführen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="437"/> + <source>No</source> + <translation>Keiner</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="447"/> + <source>Select to just do a dry-run</source> + <translation>Auswählen, um nur einen Testlauf auszuführen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="450"/> + <source>Dry-Run Only</source> + <translation>nur Testlauf</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="457"/> + <source>Select to do a dry-run first, than ask the user for confirmation to perform the rebase</source> + <translation>Auswählen, um zuerst einen Testlauf auszuführen und dann den Nutzer nach einer Bestätigung für die Ausführung zu fragen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="460"/> + <source>Dry-Run First, than Confirm</source> + <translation>zuerst Testlauf, dann Bestätigung</translation> + </message> </context> <context> <name>HgRemoveSubrepositoriesDialog</name> @@ -60078,17 +60178,17 @@ <context> <name>Rebase</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="75"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="80"/> <source>Rebase Changesets</source> <translation>Änderungssätze umgruppieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="106"/> <source>Rebase Changesets (Continue)</source> <translation>Änderungssätze umgruppieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="132"/> <source>Rebase Changesets (Abort)</source> <translation>Änderungssätze umgruppieren (Abbruch)</translation> </message> @@ -83777,22 +83877,22 @@ <translation>Leere Seite</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserView.py" line="2249"/> + <location filename="../WebBrowser/WebBrowserView.py" line="2250"/> <source>Quota Request</source> <translation>Speicherplatzanfrage</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserView.py" line="2249"/> + <location filename="../WebBrowser/WebBrowserView.py" line="2250"/> <source><p> Allow the website at <b>{0}</b> to use <b>{1}</b> of persistent storage?</p></source> <translation><p>Der Website <b>{0}</b> gestatten, <b>{1}</b> permanenten Speicherplatz zu verwenden?</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserView.py" line="2281"/> + <location filename="../WebBrowser/WebBrowserView.py" line="2282"/> <source>Protocol Handler Request</source> <translation>Protokollhandleranfrage</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserView.py" line="2281"/> + <location filename="../WebBrowser/WebBrowserView.py" line="2282"/> <source><p> Allow the website at <b>{0}</b> to open all <b>{1}</b> links?</p></source> <translation><p>Der Website <b>{0}</b> erlauben, alle <b>{1}</b> Links zu öffnen?</p></translation> </message>
--- a/i18n/eric6_empty.ts Sat Aug 04 15:38:09 2018 +0200 +++ b/i18n/eric6_empty.ts Sat Aug 04 15:38:32 2018 +0200 @@ -29829,142 +29829,142 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2960"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3007"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3055"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3063"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3112"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3167"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3303"/> <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="3200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/> <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="3271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> <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="3271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3401"/> <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="3495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <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="3614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3647"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3698"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3731"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3773"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3880"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3873"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3924"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> @@ -29973,6 +29973,16 @@ <source>Canceling uncommitted merge</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3124"/> + <source>Copy Changesets (Stop)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3137"/> + <source>Copy Changesets (Abort)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -31525,25 +31535,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="130"/> <source>Compare Against Second Parent</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="140"/> <source>Treat all Files as Text</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="147"/> <source>Omit Dates</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="154"/> <source>Use Git extended Diff-Format</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="105"/> + <source>Bookmark:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="118"/> + <source>Enter a bookmark name</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgFetchDialog</name> @@ -31926,6 +31946,16 @@ <source>Perform Dry-Run</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="171"/> + <source>Select to not commit the copied changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="174"/> + <source>Don't Commit</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgHisteditCommitEditor</name> @@ -34186,7 +34216,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1793"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1823"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> @@ -34331,7 +34361,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1849"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1879"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -34391,7 +34421,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1919"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> @@ -34421,355 +34451,385 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Add</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Add...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <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="1021"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/> <source>Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1059"/> <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="1037"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1075"/> <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="1053"/> - <source>List bookmarks</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> - <source>List bookmarks...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> - <source>List bookmarks of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>Define bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>Define bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> - <source>Define a bookmark for the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Delete bookmark</source> + <source>List bookmarks</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Delete bookmark...</source> + <source>List bookmarks...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> - <source>Delete a bookmark of the project</source> + <source>List bookmarks of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Rename bookmark</source> + <source>Define bookmark</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Rename bookmark...</source> + <source>Define bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> - <source>Rename a bookmark of the project</source> + <source>Define a bookmark for the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Move bookmark</source> + <source>Delete bookmark</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Move bookmark...</source> + <source>Delete bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> - <source>Move a bookmark of the project</source> + <source>Delete a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> - <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/> - <source>Show incoming bookmarks</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> - <source>Show a list of incoming bookmarks</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1137"/> - <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> - <source>Pull bookmark</source> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> + <source>Rename bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> + <source>Rename bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <source>Rename a bookmark of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1143"/> + <source>Move bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1143"/> + <source>Move bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1148"/> + <source>Move a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> - <source>Pull a bookmark from a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> - <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/> - <source>Pull current bookmark</source> + <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1159"/> + <source>Show incoming bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> + <source>Show a list of incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> + <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1176"/> + <source>Pull bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1181"/> + <source>Pull a bookmark from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1184"/> + <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1192"/> + <source>Pull current bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1170"/> - <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> - <source>Show outgoing bookmarks</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> - <source>Show a list of outgoing bookmarks</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186"/> - <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1195"/> - <source>Push bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1200"/> - <source>Push a bookmark to a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203"/> - <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> - <source>Push current bookmark</source> + <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1208"/> + <source>Show outgoing bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213"/> + <source>Show a list of outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> + <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1225"/> + <source>Push bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1230"/> + <source>Push a bookmark to a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> + <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1241"/> + <source>Push current bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1246"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1249"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1305"/> <source>Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1300"/> - <source>Specials</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309"/> - <source>Changegroup Management</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1316"/> - <source>Patch Management</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322"/> - <source>Bisect</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> - <source>Tags</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> - <source>Branches</source> + <source>Specials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1339"/> + <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> - <source>Bookmarks</source> + <source>Patch Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352"/> + <source>Bisect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1360"/> + <source>Tags</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> + <source>Branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1376"/> + <source>Bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1397"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1417"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1389"/> - <source>Manage Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1504"/> <source>Mercurial</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1610"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1640"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1963"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1869"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1899"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1934"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1258"/> <source>Delete all backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1263"/> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1007"/> + <source>Stop Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <source>Stop the interrupted copying session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> + <source>Abort Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025"/> + <source>Abort the interrupted copying session and rollback</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1028"/> + <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1422"/> + <source>Merge Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1948"/> + <source>Copy Changesets (Stop)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1963"/> + <source>Copy Changesets (Abort)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -35493,6 +35553,41 @@ <source>Detach Source</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="428"/> + <source>Dry-Run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="434"/> + <source>Select to not do a dry-run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="437"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="447"/> + <source>Select to just do a dry-run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="450"/> + <source>Dry-Run Only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="457"/> + <source>Select to do a dry-run first, than ask the user for confirmation to perform the rebase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="460"/> + <source>Dry-Run First, than Confirm</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRemoveSubrepositoriesDialog</name> @@ -59629,17 +59724,17 @@ <context> <name>Rebase</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="75"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="80"/> <source>Rebase Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="106"/> <source>Rebase Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="132"/> <source>Rebase Changesets (Abort)</source> <translation type="unfinished"></translation> </message> @@ -83088,22 +83183,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserView.py" line="2249"/> + <location filename="../WebBrowser/WebBrowserView.py" line="2250"/> <source>Quota Request</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserView.py" line="2249"/> + <location filename="../WebBrowser/WebBrowserView.py" line="2250"/> <source><p> Allow the website at <b>{0}</b> to use <b>{1}</b> of persistent storage?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserView.py" line="2281"/> + <location filename="../WebBrowser/WebBrowserView.py" line="2282"/> <source>Protocol Handler Request</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserView.py" line="2281"/> + <location filename="../WebBrowser/WebBrowserView.py" line="2282"/> <source><p> Allow the website at <b>{0}</b> to open all <b>{1}</b> links?</p></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric6_en.ts Sat Aug 04 15:38:09 2018 +0200 +++ b/i18n/eric6_en.ts Sat Aug 04 15:38:32 2018 +0200 @@ -29766,17 +29766,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3401"/> <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="3495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -29786,52 +29786,52 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2960"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3007"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3055"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3063"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3112"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3303"/> <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="3200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/> <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="3271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> <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="3271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -29861,7 +29861,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3167"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -29896,62 +29896,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3647"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3698"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3731"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3773"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3880"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3873"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3924"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -29986,12 +29986,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> @@ -30000,6 +30000,16 @@ <source>Canceling uncommitted merge</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3124"/> + <source>Copy Changesets (Stop)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3137"/> + <source>Copy Changesets (Abort)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -31541,22 +31551,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="130"/> <source>Compare Against Second Parent</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="140"/> <source>Treat all Files as Text</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="147"/> <source>Omit Dates</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="154"/> <source>Use Git extended Diff-Format</source> <translation type="unfinished"></translation> </message> @@ -31571,6 +31581,16 @@ <p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="105"/> + <source>Bookmark:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="118"/> + <source>Enter a bookmark name</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgFetchDialog</name> @@ -31953,6 +31973,16 @@ <source>Perform Dry-Run</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="171"/> + <source>Select to not commit the copied changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="174"/> + <source>Don't Commit</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgHisteditCommitEditor</name> @@ -34008,7 +34038,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1793"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1823"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> @@ -34123,27 +34153,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1339"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1610"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1640"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1963"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -34173,7 +34203,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1397"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -34253,7 +34283,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1849"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1879"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -34273,12 +34303,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1869"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1899"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> @@ -34323,7 +34353,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1919"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> @@ -34353,12 +34383,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1934"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -34383,47 +34408,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Add</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Add...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <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="1021"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/> <source>Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1059"/> <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="1384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1417"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> @@ -34453,22 +34478,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1075"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> @@ -34478,7 +34503,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1305"/> <source>Administration</source> <translation type="unfinished"></translation> </message> @@ -34518,177 +34543,177 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> <source>List bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> - <source>List bookmarks...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> - <source>List bookmarks of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>Define bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>Define bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> - <source>Define a bookmark for the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Delete bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Delete bookmark...</source> + <source>List bookmarks...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> - <source>Delete a bookmark of the project</source> + <source>List bookmarks of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Rename bookmark</source> + <source>Define bookmark</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Rename bookmark...</source> + <source>Define bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> - <source>Rename a bookmark of the project</source> + <source>Define a bookmark for the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Move bookmark</source> + <source>Delete bookmark</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Move bookmark...</source> + <source>Delete bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> - <source>Move a bookmark of the project</source> + <source>Delete a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> - <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/> - <source>Show incoming bookmarks</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> - <source>Show a list of incoming bookmarks</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1137"/> - <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> - <source>Pull bookmark</source> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> + <source>Rename bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> + <source>Rename bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <source>Rename a bookmark of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1143"/> + <source>Move bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1143"/> + <source>Move bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1148"/> + <source>Move a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> + <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1159"/> + <source>Show incoming bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> + <source>Show a list of incoming bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> + <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1176"/> + <source>Pull bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1181"/> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1184"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1208"/> <source>Show outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1195"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1225"/> <source>Push bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1230"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1376"/> <source>Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1360"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> <source>Branches</source> <translation type="unfinished"></translation> </message> @@ -34738,65 +34763,100 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1389"/> - <source>Manage Changes</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1504"/> <source>Mercurial</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1192"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1200"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1241"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1246"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1249"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1258"/> <source>Delete all backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1263"/> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1007"/> + <source>Stop Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <source>Stop the interrupted copying session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> + <source>Abort Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025"/> + <source>Abort the interrupted copying session and rollback</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1028"/> + <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1422"/> + <source>Merge Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1948"/> + <source>Copy Changesets (Stop)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1963"/> + <source>Copy Changesets (Abort)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -35520,6 +35580,41 @@ <source>Current branch tip</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="428"/> + <source>Dry-Run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="434"/> + <source>Select to not do a dry-run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="437"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="447"/> + <source>Select to just do a dry-run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="450"/> + <source>Dry-Run Only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="457"/> + <source>Select to do a dry-run first, than ask the user for confirmation to perform the rebase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="460"/> + <source>Dry-Run First, than Confirm</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRemoveSubrepositoriesDialog</name> @@ -59678,17 +59773,17 @@ <context> <name>Rebase</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="75"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="80"/> <source>Rebase Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="106"/> <source>Rebase Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="132"/> <source>Rebase Changesets (Abort)</source> <translation type="unfinished"></translation> </message> @@ -83141,22 +83236,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserView.py" line="2249"/> + <location filename="../WebBrowser/WebBrowserView.py" line="2250"/> <source>Quota Request</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserView.py" line="2249"/> + <location filename="../WebBrowser/WebBrowserView.py" line="2250"/> <source><p> Allow the website at <b>{0}</b> to use <b>{1}</b> of persistent storage?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserView.py" line="2281"/> + <location filename="../WebBrowser/WebBrowserView.py" line="2282"/> <source>Protocol Handler Request</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserView.py" line="2281"/> + <location filename="../WebBrowser/WebBrowserView.py" line="2282"/> <source><p> Allow the website at <b>{0}</b> to open all <b>{1}</b> links?</p></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric6_es.ts Sat Aug 04 15:38:09 2018 +0200 +++ b/i18n/eric6_es.ts Sat Aug 04 15:38:32 2018 +0200 @@ -29921,17 +29921,17 @@ <translation>Haciendo commit de cambios al repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Mercurial Command Server</source> <translation>Servidor de Comandos de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3401"/> <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="3495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <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> @@ -29941,52 +29941,52 @@ <translation>Importar Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2960"/> <source>Export Patches</source> <translation>Exportar Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3007"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3055"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3063"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3112"/> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <source>Add Sub-repository</source> <translation>Añadir Sub-repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3303"/> <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="3200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/> <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="3271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> <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="3271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> <source>Remove Sub-repositories</source> <translation>Eliminar Sub-repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291"/> <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> @@ -30016,7 +30016,7 @@ <translation>¿Realmente desea revertir todos los cambios del proyecto?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3167"/> <source>Create Unversioned Archive</source> <translation>Crear Archivo Sin Versionar</translation> </message> @@ -30051,62 +30051,62 @@ <translation>Tip branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665"/> <source>Mercurial Bookmark</source> <translation>Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> <source>Delete Bookmark</source> <translation>Borrar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> <source>Select the bookmark to be deleted:</source> <translation>Seleccionar el marcador a borrar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3647"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3698"/> <source>Delete Mercurial Bookmark</source> <translation>Borrar Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3731"/> <source>Rename Mercurial Bookmark</source> <translation>Renombrar Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3773"/> <source>Move Mercurial Bookmark</source> <translation>Mover Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> <source>Pull Bookmark</source> <translation>Pull de Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> <source>Select the bookmark to be pulled:</source> <translation>Seleccinar el marcador sobre el que hacer pull:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3880"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Haciendo pull de marcador desde un repositorio Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> <source>Push Bookmark</source> <translation>Push de Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> <source>Select the bookmark to be push:</source> <translation>Seleccinar el marcador sobre el que hacer push:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3873"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3924"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Haciendo push de marcador desde un repositorio Mercurial remoto</translation> </message> @@ -30141,12 +30141,12 @@ <translation>Marcando como 'resolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> <source>Delete All Backups</source> <translation>Borrar todas las Copias de Seguridad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation><p>¿Desea realmente borrar todos los bundles de copia de seguridad almacenados en el área de copias de seguridad <b>{0}</b>?</p></translation> </message> @@ -30155,6 +30155,16 @@ <source>Canceling uncommitted merge</source> <translation>Cancelando merge sin commit</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3124"/> + <source>Copy Changesets (Stop)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3137"/> + <source>Copy Changesets (Abort)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -31719,22 +31729,22 @@ <translation>Introducir changesets por número, id, rango o expresión de revset, uno por línea</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="130"/> <source>Compare Against Second Parent</source> <translation>Comparar Contra el Segundo Parent</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="140"/> <source>Treat all Files as Text</source> <translation>Tratar todos los Archivos como Texto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="147"/> <source>Omit Dates</source> <translation>Omitir Fechas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="154"/> <source>Use Git extended Diff-Format</source> <translation>Utilizar Formato de Diff extendido de Git</translation> </message> @@ -31750,6 +31760,16 @@ <translation><b>Nombre de destino</b> <p>Introducir el nuevo nombre en este campo. El destino será el nuevo nombre o una ruta absoluta.</p></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="105"/> + <source>Bookmark:</source> + <translation type="unfinished">Marcador:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="118"/> + <source>Enter a bookmark name</source> + <translation type="unfinished">Introduzca un nombre de marcador</translation> + </message> </context> <context> <name>HgFetchDialog</name> @@ -32132,6 +32152,16 @@ <source>Perform Dry-Run</source> <translation>Llevar a cabo Simulacro (Dry-Run)</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="171"/> + <source>Select to not commit the copied changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="174"/> + <source>Don't Commit</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgHisteditCommitEditor</name> @@ -34120,7 +34150,7 @@ <translation>Crea un archivo de changegroup recogiendo changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1793"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1823"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> @@ -34135,7 +34165,7 @@ <translation>Aplicar uno o varios archivos de changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1339"/> <source>Changegroup Management</source> <translation>Gestión de Chagegroup</translation> </message> @@ -34215,7 +34245,7 @@ <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="1322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352"/> <source>Bisect</source> <translation>Bisect</translation> </message> @@ -34300,7 +34330,7 @@ <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="1300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> <source>Specials</source> <translation>Especial</translation> </message> @@ -34325,12 +34355,12 @@ <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="1610"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1640"/> <source>Pull</source> <translation>Hacer Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1963"/> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> @@ -34360,7 +34390,7 @@ <translation>Rollback de la última transacción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1397"/> <source>Extensions</source> <translation>Extensiones</translation> </message> @@ -34440,7 +34470,7 @@ <translation><b>Ignorar</b><p>Ignora un changeset seleccionable.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1849"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1879"/> <source>Import Patch</source> <translation>Importar Patch</translation> </message> @@ -34460,12 +34490,12 @@ <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="1316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> <source>Patch Management</source> <translation>Gestión de Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1869"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1899"/> <source>Revert Changes</source> <translation>Revertir cambios</translation> </message> @@ -34510,7 +34540,7 @@ <translation><b>Cambiar Fase</b><p>Cambia la fase de revisiones.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1919"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> @@ -34542,10 +34572,10 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378"/> <source>Graft</source> - <translation>Graft</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <translation type="obsolete">Graft</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1934"/> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> @@ -34570,47 +34600,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="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Add</source> <translation>Añadir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Add...</source> <translation>Añadir...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> <source>Add a sub-repository</source> <translation>Añadir un sub-repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <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="1021"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/> <source>Remove...</source> <translation>Eliminar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> <source>Remove sub-repositories</source> <translation>Eliminar sub-repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1059"/> <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="1384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1417"/> <source>Sub-Repository</source> <translation>Sub-repositorio</translation> </message> @@ -34640,22 +34670,22 @@ <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="1037"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067"/> <source>Create unversioned archive</source> <translation>Crear archivo sin versionar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067"/> <source>Create unversioned archive...</source> <translation>Crear archivo sin versionar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> <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="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1075"/> <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> @@ -34665,7 +34695,7 @@ <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> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1305"/> <source>Administration</source> <translation>Administración</translation> </message> @@ -34705,177 +34735,177 @@ <translation><b>Cancelar merge sin commit</b><p>Esto cancela un merge sin commit causando que todos los cambios se pierdan.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> <source>List bookmarks</source> <translation>Listar marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> - <source>List bookmarks...</source> - <translation>Listar marcadores...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> - <source>List bookmarks of the project</source> - <translation>Lista marcadores del proyecto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> - <translation><b>Listar marcadores</b><p>Lista los marcadores del proyecto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>Define bookmark</source> - <translation>Definir marcador</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>Define bookmark...</source> - <translation>Definir marcador...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> - <source>Define a bookmark for the project</source> - <translation>Define un marcador para el proyecto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> - <translation><b>Definir marcador</b><p>Define un marcador para el proyecto.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Delete bookmark</source> - <translation>Borrar marcador</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Delete bookmark...</source> - <translation>Borrar marcador...</translation> + <source>List bookmarks...</source> + <translation>Listar marcadores...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> - <source>Delete a bookmark of the project</source> - <translation>Borrar un marcador del proyecto</translation> + <source>List bookmarks of the project</source> + <translation>Lista marcadores del proyecto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> - <translation><b>Borrar marcador</b><p>Borra un marcador del proyecto.</p></translation> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <translation><b>Listar marcadores</b><p>Lista los marcadores del proyecto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Rename bookmark</source> - <translation>Renombrar marcador</translation> + <source>Define bookmark</source> + <translation>Definir marcador</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Rename bookmark...</source> - <translation>Renombrar marcador...</translation> + <source>Define bookmark...</source> + <translation>Definir marcador...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> - <source>Rename a bookmark of the project</source> - <translation>Renombrar un marcador del proyecto</translation> + <source>Define a bookmark for the project</source> + <translation>Define un marcador para el proyecto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> - <translation><b>Renombrar marcador</b><p>Renombra un marcador del proyecto.</p></translation> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> + <translation><b>Definir marcador</b><p>Define un marcador para el proyecto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Move bookmark</source> - <translation>Mover marcador</translation> + <source>Delete bookmark</source> + <translation>Borrar marcador</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Move bookmark...</source> - <translation>Mover marcador...</translation> + <source>Delete bookmark...</source> + <translation>Borrar marcador...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> - <source>Move a bookmark of the project</source> - <translation>Mover un marcador del proyecto</translation> + <source>Delete a bookmark of the project</source> + <translation>Borrar un marcador del proyecto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> - <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> - <translation><b>Mover marcador</b><p>Mueve un marcador del proyecto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/> - <source>Show incoming bookmarks</source> - <translation>Mostrar marcadores entrantes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> - <source>Show a list of incoming bookmarks</source> - <translation>Muestra una lista de marcadores entrantes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1137"/> - <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> - <translation><b>Mostrar marcadores entrantes</b><p>Muestra una lista de nuevos marcadores disponibles en el repositorio remoto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> - <source>Pull bookmark</source> - <translation>Pull de marcador</translation> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <translation><b>Borrar marcador</b><p>Borra un marcador del proyecto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> + <source>Rename bookmark</source> + <translation>Renombrar marcador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> + <source>Rename bookmark...</source> + <translation>Renombrar marcador...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <source>Rename a bookmark of the project</source> + <translation>Renombrar un marcador del proyecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <translation><b>Renombrar marcador</b><p>Renombra un marcador del proyecto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1143"/> + <source>Move bookmark</source> + <translation>Mover marcador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1143"/> + <source>Move bookmark...</source> + <translation>Mover marcador...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1148"/> + <source>Move a bookmark of the project</source> + <translation>Mover un marcador del proyecto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> + <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> + <translation><b>Mover marcador</b><p>Mueve un marcador del proyecto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1159"/> + <source>Show incoming bookmarks</source> + <translation>Mostrar marcadores entrantes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> + <source>Show a list of incoming bookmarks</source> + <translation>Muestra una lista de marcadores entrantes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> + <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> + <translation><b>Mostrar marcadores entrantes</b><p>Muestra una lista de nuevos marcadores disponibles en el repositorio remoto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1176"/> + <source>Pull bookmark</source> + <translation>Pull de marcador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1181"/> <source>Pull a bookmark from a remote repository</source> <translation>Hacer pull de marcador desde un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1184"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation><b>Hacer pull de marcador</b><p>Hace pull de un marcador desde un repositorio remoto al repositorio local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1208"/> <source>Show outgoing bookmarks</source> <translation>Mostrar marcadores salientes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213"/> <source>Show a list of outgoing bookmarks</source> <translation>Muestra una lista de marcadores salientes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation><b>Mostrar marcadores salientes</b><p>Muestra una lista de nuevos marcadores disponibles en el repositorio local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1195"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1225"/> <source>Push bookmark</source> <translation>Push de marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1230"/> <source>Push a bookmark to a remote repository</source> <translation>Hacer push de marcador a un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation><b>Hacer push de marcador</b><p>Hace push de un marcador desde un repositorio local al repositorio remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1376"/> <source>Bookmarks</source> <translation>Marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1360"/> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> <source>Branches</source> <translation>Branches</translation> </message> @@ -34927,7 +34957,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1389"/> <source>Manage Changes</source> - <translation>Gestionar Cambios</translation> + <translation type="obsolete">Gestionar Cambios</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> @@ -34935,55 +34965,95 @@ <translation><b>Re-Merge</b><p>Aplica un re-merge a todos los archivos con conflictos sin resolver del proyecto, descartando cualquier intento anterior de merge.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1504"/> <source>Mercurial</source> <translation>Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1192"/> <source>Pull current bookmark</source> <translation>Pull del marcador actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> <source>Pull the current bookmark from a remote repository</source> <translation>Hacer pull del marcador actual desde repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1200"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation><b>Pull de marcador actual<p>Ejecuta un pull del marcador actual desde un repositorio remoto al repositorio local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1241"/> <source>Push current bookmark</source> <translation>Push de marcador actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1246"/> <source>Push the current bookmark to a remote repository</source> <translation>Hacer push del marcador actual hacia repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1249"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation><b>Push de marcador actual<p>Ejecuta un pshl del marcador actual desde 3l repositorio local hacia un repositorio remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1258"/> <source>Delete all backups</source> <translation>Borrar todas las Copias de Seguridad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1263"/> <source>Delete all backup bundles stored in the backup area</source> <translation>Borrar todos los bundles de copia de seguridad almacenados en el área de copias de seguridad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation><b>Borrar todas las copias de seguridad</b><p>Borra todos los bundles de copia de seguridad almacenados en el área de copias de seguridad del repositorio.</p></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1007"/> + <source>Stop Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <source>Stop the interrupted copying session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> + <source>Abort Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025"/> + <source>Abort the interrupted copying session and rollback</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1028"/> + <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1422"/> + <source>Merge Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1948"/> + <source>Copy Changesets (Stop)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1963"/> + <source>Copy Changesets (Abort)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -35709,6 +35779,41 @@ <source>Current branch tip</source> <translation>Tip branch actual</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="428"/> + <source>Dry-Run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="434"/> + <source>Select to not do a dry-run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="437"/> + <source>No</source> + <translation type="unfinished">No</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="447"/> + <source>Select to just do a dry-run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="450"/> + <source>Dry-Run Only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="457"/> + <source>Select to do a dry-run first, than ask the user for confirmation to perform the rebase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="460"/> + <source>Dry-Run First, than Confirm</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRemoveSubrepositoriesDialog</name> @@ -60043,17 +60148,17 @@ <context> <name>Rebase</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="75"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="80"/> <source>Rebase Changesets</source> <translation>Hacer Rebase de Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="106"/> <source>Rebase Changesets (Continue)</source> <translation>Hacer Rebase de Changesets (Continuar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="132"/> <source>Rebase Changesets (Abort)</source> <translation>Hacer Rebase de Changesets (Abortar)</translation> </message>
--- a/i18n/eric6_fr.ts Sat Aug 04 15:38:09 2018 +0200 +++ b/i18n/eric6_fr.ts Sat Aug 04 15:38:32 2018 +0200 @@ -30544,17 +30544,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3401"/> <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="3495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -30564,52 +30564,52 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2960"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3007"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3055"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3063"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3112"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3303"/> <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="3200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/> <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="3271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> <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="3271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -30639,7 +30639,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3167"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -30674,62 +30674,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665"/> <source>Mercurial Bookmark</source> <translation type="unfinished">Signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> <source>Delete Bookmark</source> <translation type="unfinished">Supprimer le signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished">Selectionner le signet à supprimer:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3647"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3698"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished">Supprimer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3731"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished">Renommer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3773"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished">Déplacer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> <source>Pull Bookmark</source> <translation type="unfinished">Récuperer le signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished">Sélectionner le signet à récuperer:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3880"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished">Récupérant le signet d'un dépôt Mercurial distant</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> <source>Push Bookmark</source> <translation type="unfinished">Envoyer signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> <source>Select the bookmark to be push:</source> <translation type="unfinished">Sélectionner le signet à envoyer:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3873"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3924"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished">À envoyer le signet à un dépôt Mercurial distant</translation> </message> @@ -30764,12 +30764,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> @@ -30778,6 +30778,16 @@ <source>Canceling uncommitted merge</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3124"/> + <source>Copy Changesets (Stop)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3137"/> + <source>Copy Changesets (Abort)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -32363,22 +32373,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="130"/> <source>Compare Against Second Parent</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="140"/> <source>Treat all Files as Text</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="147"/> <source>Omit Dates</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="154"/> <source>Use Git extended Diff-Format</source> <translation type="unfinished"></translation> </message> @@ -32393,6 +32403,16 @@ <p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="105"/> + <source>Bookmark:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="118"/> + <source>Enter a bookmark name</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgFetchDialog</name> @@ -32775,6 +32795,16 @@ <source>Perform Dry-Run</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="171"/> + <source>Select to not commit the copied changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="174"/> + <source>Don't Commit</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgHisteditCommitEditor</name> @@ -34871,7 +34901,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1793"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1823"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> @@ -34886,7 +34916,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1339"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> @@ -34966,7 +34996,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> @@ -35051,7 +35081,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> <source>Specials</source> <translation type="unfinished"></translation> </message> @@ -35076,12 +35106,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1610"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1640"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1963"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -35111,7 +35141,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1397"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -35191,7 +35221,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1849"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1879"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -35211,12 +35241,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1869"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1899"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> @@ -35261,7 +35291,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1919"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> @@ -35291,12 +35321,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1934"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -35321,47 +35346,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Add</source> <translation type="unfinished">Ajouter</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Add...</source> <translation type="unfinished">Ajouter...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <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="1021"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/> <source>Remove</source> <translation type="unfinished">Supprimer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1059"/> <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="1384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1417"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> @@ -35391,22 +35416,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1075"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> @@ -35416,7 +35441,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1305"/> <source>Administration</source> <translation type="unfinished"></translation> </message> @@ -35456,177 +35481,177 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> <source>List bookmarks</source> <translation type="unfinished">Lister les signets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> - <source>List bookmarks...</source> - <translation type="unfinished">Lister les signets ...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> - <source>List bookmarks of the project</source> - <translation type="unfinished">Lister les signets du projet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> - <translation type="unfinished"><b>Lister les signets</b><p>Ceci liste tous les signets du projet.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>Define bookmark</source> - <translation type="unfinished">Définir signet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>Define bookmark...</source> - <translation type="unfinished">Définir signet ...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> - <source>Define a bookmark for the project</source> - <translation type="unfinished">Définir un signet pour le projet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> - <translation type="unfinished"><b>Définir un signet</b><p>Ceci défini un signet pour le projet.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Delete bookmark</source> - <translation type="unfinished">Supprimer signet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Delete bookmark...</source> - <translation type="unfinished">Supprimer signet ...</translation> + <source>List bookmarks...</source> + <translation type="unfinished">Lister les signets ...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> - <source>Delete a bookmark of the project</source> - <translation type="unfinished">Supprimer un signet du projet</translation> + <source>List bookmarks of the project</source> + <translation type="unfinished">Lister les signets du projet</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> - <translation type="unfinished"><b>Supprimer signet</b><p>Ceci supprime un signet du projet.</p></translation> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <translation type="unfinished"><b>Lister les signets</b><p>Ceci liste tous les signets du projet.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Rename bookmark</source> - <translation type="unfinished">Renommer signet</translation> + <source>Define bookmark</source> + <translation type="unfinished">Définir signet</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Rename bookmark...</source> - <translation type="unfinished">Renommer signet ...</translation> + <source>Define bookmark...</source> + <translation type="unfinished">Définir signet ...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> - <source>Rename a bookmark of the project</source> - <translation type="unfinished">Renommer un signet du projet</translation> + <source>Define a bookmark for the project</source> + <translation type="unfinished">Définir un signet pour le projet</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> - <translation type="unfinished"><b>Renommer signet</b><p>Ceci renome un signet du projet.</p></translation> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> + <translation type="unfinished"><b>Définir un signet</b><p>Ceci défini un signet pour le projet.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Move bookmark</source> - <translation type="unfinished">Déplacer signet</translation> + <source>Delete bookmark</source> + <translation type="unfinished">Supprimer signet</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Move bookmark...</source> - <translation type="unfinished">Déplacer signet ...</translation> + <source>Delete bookmark...</source> + <translation type="unfinished">Supprimer signet ...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> - <source>Move a bookmark of the project</source> - <translation type="unfinished">Déplacer un signet du projet</translation> + <source>Delete a bookmark of the project</source> + <translation type="unfinished">Supprimer un signet du projet</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> - <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> - <translation type="unfinished"><b>Déplacer signet</b><p>Ceci déplace un signet du projet dans un autre ensemble.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/> - <source>Show incoming bookmarks</source> - <translation type="unfinished">Montrer nouveaux signets</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> - <source>Show a list of incoming bookmarks</source> - <translation type="unfinished">Montrer la liste des nouveaux signets</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1137"/> - <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> - <translation type="unfinished"><b>Montrer les nouveaux signets</b><p>Cedi montre la liste des nouveaux signets disponibles dans le dépôt distant. </p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> - <source>Pull bookmark</source> - <translation type="unfinished">Télécharger signet</translation> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <translation type="unfinished"><b>Supprimer signet</b><p>Ceci supprime un signet du projet.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> + <source>Rename bookmark</source> + <translation type="unfinished">Renommer signet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> + <source>Rename bookmark...</source> + <translation type="unfinished">Renommer signet ...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <source>Rename a bookmark of the project</source> + <translation type="unfinished">Renommer un signet du projet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <translation type="unfinished"><b>Renommer signet</b><p>Ceci renome un signet du projet.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1143"/> + <source>Move bookmark</source> + <translation type="unfinished">Déplacer signet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1143"/> + <source>Move bookmark...</source> + <translation type="unfinished">Déplacer signet ...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1148"/> + <source>Move a bookmark of the project</source> + <translation type="unfinished">Déplacer un signet du projet</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> + <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> + <translation type="unfinished"><b>Déplacer signet</b><p>Ceci déplace un signet du projet dans un autre ensemble.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1159"/> + <source>Show incoming bookmarks</source> + <translation type="unfinished">Montrer nouveaux signets</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> + <source>Show a list of incoming bookmarks</source> + <translation type="unfinished">Montrer la liste des nouveaux signets</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> + <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> + <translation type="unfinished"><b>Montrer les nouveaux signets</b><p>Cedi montre la liste des nouveaux signets disponibles dans le dépôt distant. </p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1176"/> + <source>Pull bookmark</source> + <translation type="unfinished">Télécharger signet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1181"/> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished">Télecharger un sginet d'un répertoire distant</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1184"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"><b>Télécharger signet</b><p>Ceci télécharge un signe d'un répertoire distant dans le répertoire local. </p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1208"/> <source>Show outgoing bookmarks</source> <translation type="unfinished">Montrer signets sortants</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished">Montrer la list des signets sortants</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation type="unfinished"><b>Montrer les signets sortants</b><p>Ceci montre la liste des signets disponibles dans le répertoire local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1195"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1225"/> <source>Push bookmark</source> <translation type="unfinished">Envoyer signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1230"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished">Envoyer un signet dans un répertoire distant</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"><b>Envoyer signet</b><p>Ceci envoie un signet depuis un répertoire local dans un répertoire distant. </p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1376"/> <source>Bookmarks</source> <translation type="unfinished">Signets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1360"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> <source>Branches</source> <translation type="unfinished"></translation> </message> @@ -35676,65 +35701,100 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1389"/> - <source>Manage Changes</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1504"/> <source>Mercurial</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1192"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1200"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1241"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1246"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1249"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1258"/> <source>Delete all backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1263"/> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1007"/> + <source>Stop Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <source>Stop the interrupted copying session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> + <source>Abort Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025"/> + <source>Abort the interrupted copying session and rollback</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1028"/> + <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1422"/> + <source>Merge Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1948"/> + <source>Copy Changesets (Stop)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1963"/> + <source>Copy Changesets (Abort)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -36458,6 +36518,41 @@ <source>Current branch tip</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="428"/> + <source>Dry-Run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="434"/> + <source>Select to not do a dry-run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="437"/> + <source>No</source> + <translation type="unfinished">Non</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="447"/> + <source>Select to just do a dry-run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="450"/> + <source>Dry-Run Only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="457"/> + <source>Select to do a dry-run first, than ask the user for confirmation to perform the rebase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="460"/> + <source>Dry-Run First, than Confirm</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRemoveSubrepositoriesDialog</name> @@ -60983,17 +61078,17 @@ <context> <name>Rebase</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="75"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="80"/> <source>Rebase Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="106"/> <source>Rebase Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="132"/> <source>Rebase Changesets (Abort)</source> <translation type="unfinished"></translation> </message> @@ -84979,22 +85074,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserView.py" line="2249"/> + <location filename="../WebBrowser/WebBrowserView.py" line="2250"/> <source>Quota Request</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserView.py" line="2249"/> + <location filename="../WebBrowser/WebBrowserView.py" line="2250"/> <source><p> Allow the website at <b>{0}</b> to use <b>{1}</b> of persistent storage?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserView.py" line="2281"/> + <location filename="../WebBrowser/WebBrowserView.py" line="2282"/> <source>Protocol Handler Request</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserView.py" line="2281"/> + <location filename="../WebBrowser/WebBrowserView.py" line="2282"/> <source><p> Allow the website at <b>{0}</b> to open all <b>{1}</b> links?</p></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric6_it.ts Sat Aug 04 15:38:09 2018 +0200 +++ b/i18n/eric6_it.ts Sat Aug 04 15:38:32 2018 +0200 @@ -30053,17 +30053,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3401"/> <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="3495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -30073,52 +30073,52 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2960"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3007"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3055"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3063"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3112"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3303"/> <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="3200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/> <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="3271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> <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="3271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> <source>Remove Sub-repositories</source> <translation type="unfinished">Rimuovi sotto-archivi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -30148,7 +30148,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3167"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -30183,62 +30183,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665"/> <source>Mercurial Bookmark</source> <translation type="unfinished">Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> <source>Delete Bookmark</source> <translation type="unfinished">Cancella segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished">Seleziona il segnalibro da cancellare:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3647"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3698"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished">Cancella Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3731"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished">Rinomina Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3773"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished">Sposta Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> <source>Pull Bookmark</source> <translation type="unfinished">Estrai Segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished">Seleziona il segnalibro da estrarre:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3880"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished">Etrae segnalibro da un repository Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> <source>Push Bookmark</source> <translation type="unfinished">Inserisce Segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> <source>Select the bookmark to be push:</source> <translation type="unfinished">Seleziona il segnalibro da inserire:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3873"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3924"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished">Inserisce segnalibro in un repository Mercurial remoto</translation> </message> @@ -30273,12 +30273,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> @@ -30287,6 +30287,16 @@ <source>Canceling uncommitted merge</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3124"/> + <source>Copy Changesets (Stop)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3137"/> + <source>Copy Changesets (Abort)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -31833,22 +31843,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="130"/> <source>Compare Against Second Parent</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="140"/> <source>Treat all Files as Text</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="147"/> <source>Omit Dates</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="154"/> <source>Use Git extended Diff-Format</source> <translation type="unfinished"></translation> </message> @@ -31863,6 +31873,16 @@ <p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="105"/> + <source>Bookmark:</source> + <translation type="unfinished">Segnalibro:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="118"/> + <source>Enter a bookmark name</source> + <translation type="unfinished">Digita un nome per il segnalibro</translation> + </message> </context> <context> <name>HgFetchDialog</name> @@ -32245,6 +32265,16 @@ <source>Perform Dry-Run</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="171"/> + <source>Select to not commit the copied changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="174"/> + <source>Don't Commit</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgHisteditCommitEditor</name> @@ -34230,7 +34260,7 @@ <translation>Crea un file changegroup che colleziona i changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1793"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1823"/> <source>Apply changegroups</source> <translation>Applica changegroups</translation> </message> @@ -34245,7 +34275,7 @@ <translation>Applica una o più file changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1339"/> <source>Changegroup Management</source> <translation>Changegroup Management</translation> </message> @@ -34325,7 +34355,7 @@ <translation><b>Reset</b><p>Reset dei dati di ricerca bisect.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352"/> <source>Bisect</source> <translation>Bisect</translation> </message> @@ -34430,17 +34460,17 @@ <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="1300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> <source>Specials</source> <translation>Speciali</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1610"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1640"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1963"/> <source>The project should be reread. Do this now?</source> <translation>Il progetto deve essere riletto. Farlo ora ?</translation> </message> @@ -34470,7 +34500,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1397"/> <source>Extensions</source> <translation type="unfinished">Estensioni</translation> </message> @@ -34550,7 +34580,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1849"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1879"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -34570,12 +34600,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1869"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1899"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> @@ -34620,7 +34650,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1919"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> @@ -34650,12 +34680,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1934"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -34680,47 +34705,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Add</source> <translation type="unfinished">Aggiungi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Add...</source> <translation type="unfinished">Aggiungi...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <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="1021"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/> <source>Remove</source> <translation type="unfinished">Rimuovi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1059"/> <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="1384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1417"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> @@ -34750,22 +34775,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1075"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> @@ -34775,7 +34800,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1305"/> <source>Administration</source> <translation type="unfinished"></translation> </message> @@ -34815,177 +34840,177 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> <source>List bookmarks</source> <translation type="unfinished">Lista i segnalibri</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> - <source>List bookmarks...</source> - <translation type="unfinished">Lista i segnalibri...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> - <source>List bookmarks of the project</source> - <translation type="unfinished">Lista i segnalibri del progetto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> - <translation type="unfinished"><b>Lista i segnalibri</b><p>Lista i segnalibri del progetto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>Define bookmark</source> - <translation type="unfinished">Definisci un segnalibro</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>Define bookmark...</source> - <translation type="unfinished">Definisci un segnalibro...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> - <source>Define a bookmark for the project</source> - <translation type="unfinished">Definisci un segnalibro per il progetto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> - <translation type="unfinished"><b>Definisci un segnalibro</b><p>Definisci un segnalibro per il progetto.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Delete bookmark</source> - <translation type="unfinished">Cancella segnalibro</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Delete bookmark...</source> - <translation type="unfinished">Cancella segnalibro...</translation> + <source>List bookmarks...</source> + <translation type="unfinished">Lista i segnalibri...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> - <source>Delete a bookmark of the project</source> - <translation type="unfinished">Cancella un segnalibro del progetto</translation> + <source>List bookmarks of the project</source> + <translation type="unfinished">Lista i segnalibri del progetto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> - <translation type="unfinished"><b>Cancella segnalibro</b><p>Cancella un segnalibro del progetto.</p></translation> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <translation type="unfinished"><b>Lista i segnalibri</b><p>Lista i segnalibri del progetto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Rename bookmark</source> - <translation type="unfinished">Rinomina segnalibro</translation> + <source>Define bookmark</source> + <translation type="unfinished">Definisci un segnalibro</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Rename bookmark...</source> - <translation type="unfinished">Rinomina segnalibro...</translation> + <source>Define bookmark...</source> + <translation type="unfinished">Definisci un segnalibro...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> - <source>Rename a bookmark of the project</source> - <translation type="unfinished">Rinomina un segnalibro del progetto</translation> + <source>Define a bookmark for the project</source> + <translation type="unfinished">Definisci un segnalibro per il progetto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> - <translation type="unfinished"><b>Rinomina segnalibro</b><p>Rinomina un segnalibro del progetto.</p></translation> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> + <translation type="unfinished"><b>Definisci un segnalibro</b><p>Definisci un segnalibro per il progetto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Move bookmark</source> - <translation type="unfinished">Sposta segnalibro</translation> + <source>Delete bookmark</source> + <translation type="unfinished">Cancella segnalibro</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Move bookmark...</source> - <translation type="unfinished">Sposta segnalibro...</translation> + <source>Delete bookmark...</source> + <translation type="unfinished">Cancella segnalibro...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> - <source>Move a bookmark of the project</source> - <translation type="unfinished">Sposta un segnalibro del progetto</translation> + <source>Delete a bookmark of the project</source> + <translation type="unfinished">Cancella un segnalibro del progetto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> - <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> - <translation type="unfinished"><b>Sposta segnalibro</b><p>Sposta un segnalibro del progetto ad un altro insieme di modifiche.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/> - <source>Show incoming bookmarks</source> - <translation type="unfinished">Mostra i segnalibri entranti</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> - <source>Show a list of incoming bookmarks</source> - <translation type="unfinished">Mostra una lista dei segnalibri entranti</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1137"/> - <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> - <translation type="unfinished"><b>Mostra segnalibri entranti</b><p>Mostra una lista di nuovi segnalibri disponibili nel repository remoto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> - <source>Pull bookmark</source> - <translation type="unfinished">Estrae segnalibro</translation> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <translation type="unfinished"><b>Cancella segnalibro</b><p>Cancella un segnalibro del progetto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> + <source>Rename bookmark</source> + <translation type="unfinished">Rinomina segnalibro</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> + <source>Rename bookmark...</source> + <translation type="unfinished">Rinomina segnalibro...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <source>Rename a bookmark of the project</source> + <translation type="unfinished">Rinomina un segnalibro del progetto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <translation type="unfinished"><b>Rinomina segnalibro</b><p>Rinomina un segnalibro del progetto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1143"/> + <source>Move bookmark</source> + <translation type="unfinished">Sposta segnalibro</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1143"/> + <source>Move bookmark...</source> + <translation type="unfinished">Sposta segnalibro...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1148"/> + <source>Move a bookmark of the project</source> + <translation type="unfinished">Sposta un segnalibro del progetto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> + <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> + <translation type="unfinished"><b>Sposta segnalibro</b><p>Sposta un segnalibro del progetto ad un altro insieme di modifiche.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1159"/> + <source>Show incoming bookmarks</source> + <translation type="unfinished">Mostra i segnalibri entranti</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> + <source>Show a list of incoming bookmarks</source> + <translation type="unfinished">Mostra una lista dei segnalibri entranti</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> + <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> + <translation type="unfinished"><b>Mostra segnalibri entranti</b><p>Mostra una lista di nuovi segnalibri disponibili nel repository remoto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1176"/> + <source>Pull bookmark</source> + <translation type="unfinished">Estrae segnalibro</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1181"/> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished">Estrae un segnalibro da un repository remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1184"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"><b>Estrae segnalibri</b><p>Estrae un segnalibro da un repository remoto a quello locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1208"/> <source>Show outgoing bookmarks</source> <translation type="unfinished">Mostra segnalibri uscenti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished">Mostra una lista di segnalibri uscenti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation type="unfinished"><b>Mostra segnalibri in uscita</b><p>Mostra una lista di nuovi segnalibri disponibili nel repository locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1195"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1225"/> <source>Push bookmark</source> <translation type="unfinished">Inserisci segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1230"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished">Inserisce segnalibro in repository remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"><b>Inserimento segnalibro</b><p>Inserisce un segnalibro dal repository locale a quello remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1376"/> <source>Bookmarks</source> <translation type="unfinished">Segnalibri</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1360"/> <source>Tags</source> <translation type="unfinished">Tags</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> <source>Branches</source> <translation type="unfinished"></translation> </message> @@ -35035,65 +35060,100 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1389"/> - <source>Manage Changes</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1504"/> <source>Mercurial</source> <translation type="unfinished">Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1192"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1200"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1241"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1246"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1249"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1258"/> <source>Delete all backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1263"/> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1007"/> + <source>Stop Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <source>Stop the interrupted copying session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> + <source>Abort Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025"/> + <source>Abort the interrupted copying session and rollback</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1028"/> + <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1422"/> + <source>Merge Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1948"/> + <source>Copy Changesets (Stop)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1963"/> + <source>Copy Changesets (Abort)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -35817,6 +35877,41 @@ <source>Current branch tip</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="428"/> + <source>Dry-Run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="434"/> + <source>Select to not do a dry-run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="437"/> + <source>No</source> + <translation type="unfinished">No</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="447"/> + <source>Select to just do a dry-run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="450"/> + <source>Dry-Run Only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="457"/> + <source>Select to do a dry-run first, than ask the user for confirmation to perform the rebase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="460"/> + <source>Dry-Run First, than Confirm</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRemoveSubrepositoriesDialog</name> @@ -60235,17 +60330,17 @@ <context> <name>Rebase</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="75"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="80"/> <source>Rebase Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="106"/> <source>Rebase Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="132"/> <source>Rebase Changesets (Abort)</source> <translation type="unfinished"></translation> </message> @@ -83852,22 +83947,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserView.py" line="2249"/> + <location filename="../WebBrowser/WebBrowserView.py" line="2250"/> <source>Quota Request</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserView.py" line="2249"/> + <location filename="../WebBrowser/WebBrowserView.py" line="2250"/> <source><p> Allow the website at <b>{0}</b> to use <b>{1}</b> of persistent storage?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserView.py" line="2281"/> + <location filename="../WebBrowser/WebBrowserView.py" line="2282"/> <source>Protocol Handler Request</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserView.py" line="2281"/> + <location filename="../WebBrowser/WebBrowserView.py" line="2282"/> <source><p> Allow the website at <b>{0}</b> to open all <b>{1}</b> links?</p></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric6_pt.ts Sat Aug 04 15:38:09 2018 +0200 +++ b/i18n/eric6_pt.ts Sat Aug 04 15:38:32 2018 +0200 @@ -30875,17 +30875,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3401"/> <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="3495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -30895,52 +30895,52 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2960"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3007"/> <source>Change Phase</source> <translation>Mudar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3055"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3063"/> <source>Copy Changesets</source> <translation type="unfinished">Copiar Conjuntos de Alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3112"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3303"/> <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="3200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/> <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="3271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> <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="3271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> <source>Remove Sub-repositories</source> <translation>Retirar Sub Repositórios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -30970,7 +30970,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3167"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -31035,72 +31035,72 @@ <translation>Criado o novo ramo <{0}>.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665"/> <source>Mercurial Bookmark</source> <translation>Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> <source>Delete Bookmark</source> <translation>Apagar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> <source>Select the bookmark to be deleted:</source> <translation>Selecionar o marcador a apagar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3647"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3698"/> <source>Delete Mercurial Bookmark</source> <translation>Apagar o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3731"/> <source>Rename Mercurial Bookmark</source> <translation>Renomear o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3773"/> <source>Move Mercurial Bookmark</source> <translation>Mover o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> <source>Pull Bookmark</source> <translation>Puxar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> <source>Select the bookmark to be pulled:</source> <translation>Selecionar o marcador a puxar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3880"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>A puxar marcador desde o repositório remoto de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> <source>Push Bookmark</source> <translation>Empurrar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> <source>Select the bookmark to be push:</source> <translation>Selecione o marcador a empurrar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3873"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3924"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>A empurrar marcador a um repositório remoto de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> @@ -31109,6 +31109,16 @@ <source>Canceling uncommitted merge</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3124"/> + <source>Copy Changesets (Stop)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3137"/> + <source>Copy Changesets (Abort)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -32736,22 +32746,22 @@ <translation>Introduzir conjunto de alterações por número, id, rango ou expressão revset - uma por linha</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="130"/> <source>Compare Against Second Parent</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="140"/> <source>Treat all Files as Text</source> <translation>Tratar todos os Ficheiros como Texto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="147"/> <source>Omit Dates</source> <translation>Omitir Datas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="154"/> <source>Use Git extended Diff-Format</source> <translation type="unfinished"></translation> </message> @@ -32767,6 +32777,16 @@ <translation type="unfinished"><b>Nome de Destino</b> <p>Introduzir o novo nome neste campo. O destino deve ser o novo nome ou uma rota absoluta.</p></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="105"/> + <source>Bookmark:</source> + <translation type="unfinished">Marcador:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="118"/> + <source>Enter a bookmark name</source> + <translation type="unfinished">Introduzir um nome de marcador</translation> + </message> </context> <context> <name>HgFetchDialog</name> @@ -33149,6 +33169,16 @@ <source>Perform Dry-Run</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="171"/> + <source>Select to not commit the copied changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="174"/> + <source>Don't Commit</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgHisteditCommitEditor</name> @@ -35461,7 +35491,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1793"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1823"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> @@ -35576,27 +35606,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1339"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1610"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1640"/> <source>Pull</source> <translation>Puxar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1963"/> <source>The project should be reread. Do this now?</source> <translation>O projecto deve ser recarregado. Fazer-lo agora?</translation> </message> @@ -35626,7 +35656,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1397"/> <source>Extensions</source> <translation>Extensões</translation> </message> @@ -35706,7 +35736,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1849"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1879"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -35726,12 +35756,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1869"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1899"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> @@ -35776,7 +35806,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1919"/> <source>Copy Changesets</source> <translation type="unfinished">Copiar Conjuntos de Alterações</translation> </message> @@ -35806,12 +35836,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1934"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -35836,47 +35861,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Add</source> <translation>Adicionar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Add...</source> <translation>Adicionar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <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="1021"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/> <source>Remove</source> <translation>Retirar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/> <source>Remove...</source> <translation>Retirar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> <source>Remove sub-repositories</source> <translation>Retirar sub repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1059"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation><b>Retirar...</b><p>Retira sub repositorios do projeto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1417"/> <source>Sub-Repository</source> <translation></translation> </message> @@ -35906,22 +35931,22 @@ <translation><b>Mostrar sumário</b><p>Mostra alguma informação sumária do estado do diretorio de trabalho.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1075"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> @@ -36016,240 +36041,280 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> <source>List bookmarks</source> <translation>Listar marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> - <source>List bookmarks...</source> - <translation>Listar marcadores...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> - <source>List bookmarks of the project</source> - <translation>Listar marcadores do projeto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> - <translation><b>Listar marcadores</b><p>Lista os marcadores do projeto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>Define bookmark</source> - <translation>Definir marcador</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>Define bookmark...</source> - <translation>Definir marcador...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> - <source>Define a bookmark for the project</source> - <translation>Definir um marcador para o projeto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> - <translation><b>Definir marcador</b><p>Define um marcador para o projeto.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Delete bookmark</source> - <translation>Apagar marcador</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Delete bookmark...</source> - <translation>Apagar Marcador...</translation> + <source>List bookmarks...</source> + <translation>Listar marcadores...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> - <source>Delete a bookmark of the project</source> - <translation>Apagar um marcador do projeto </translation> + <source>List bookmarks of the project</source> + <translation>Listar marcadores do projeto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> - <translation><b>Apagar marcador</b><p>Apaga um marcador do projeto.</p></translation> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <translation><b>Listar marcadores</b><p>Lista os marcadores do projeto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Rename bookmark</source> - <translation>Renomear marcador</translation> + <source>Define bookmark</source> + <translation>Definir marcador</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Rename bookmark...</source> - <translation>Renomear marcador...</translation> + <source>Define bookmark...</source> + <translation>Definir marcador...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> - <source>Rename a bookmark of the project</source> - <translation>Renomear um marcador do projeto</translation> + <source>Define a bookmark for the project</source> + <translation>Definir um marcador para o projeto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> - <translation><b>Renomear marcador</b><p>Renomeia um marcador do projeto</p></translation> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> + <translation><b>Definir marcador</b><p>Define um marcador para o projeto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Move bookmark</source> - <translation>Mover marcador</translation> + <source>Delete bookmark</source> + <translation>Apagar marcador</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Move bookmark...</source> - <translation>Mover marcador...</translation> + <source>Delete bookmark...</source> + <translation>Apagar Marcador...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> - <source>Move a bookmark of the project</source> - <translation>Mover um marcador do projeto</translation> + <source>Delete a bookmark of the project</source> + <translation>Apagar um marcador do projeto </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> - <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/> - <source>Show incoming bookmarks</source> - <translation>Mostrar marcadores entrantes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> - <source>Show a list of incoming bookmarks</source> - <translation>Mostrar uma lista de marcadores entrantes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1137"/> - <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> - <translation><b>Mostrar marcadores entrantes</b><p>Mostra uma lista de marcadores novos disponíveis no repositório remoto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> - <source>Pull bookmark</source> - <translation>Puxar marcador</translation> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <translation><b>Apagar marcador</b><p>Apaga um marcador do projeto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> + <source>Rename bookmark</source> + <translation>Renomear marcador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> + <source>Rename bookmark...</source> + <translation>Renomear marcador...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <source>Rename a bookmark of the project</source> + <translation>Renomear um marcador do projeto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <translation><b>Renomear marcador</b><p>Renomeia um marcador do projeto</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1143"/> + <source>Move bookmark</source> + <translation>Mover marcador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1143"/> + <source>Move bookmark...</source> + <translation>Mover marcador...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1148"/> + <source>Move a bookmark of the project</source> + <translation>Mover um marcador do projeto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> + <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1159"/> + <source>Show incoming bookmarks</source> + <translation>Mostrar marcadores entrantes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> + <source>Show a list of incoming bookmarks</source> + <translation>Mostrar uma lista de marcadores entrantes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> + <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> + <translation><b>Mostrar marcadores entrantes</b><p>Mostra uma lista de marcadores novos disponíveis no repositório remoto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1176"/> + <source>Pull bookmark</source> + <translation>Puxar marcador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1181"/> <source>Pull a bookmark from a remote repository</source> <translation>Puxa um marcador desde um repositório remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1184"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation><b>Puxar marcador</b><p>Puxa (pull) um marcador desde um repositório remoto para o repositório local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1208"/> <source>Show outgoing bookmarks</source> <translation>Mostrar marcadores saintes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213"/> <source>Show a list of outgoing bookmarks</source> <translation>Mostrar a lista de marcadores saintes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation><b>Mostrar marcadores saintes</b><p>Mostra a lista dos marcadores novos disponíveis no repositório local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1195"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1225"/> <source>Push bookmark</source> <translation>Empurrar marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1230"/> <source>Push a bookmark to a remote repository</source> <translation>Empurrar um marcador a um repositório remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation><b>Empurrar marcador</b><p>Empurra (push) um marcador do repositório local para o repositório remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1305"/> <source>Administration</source> <translation>Administração</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1360"/> <source>Tags</source> <translation type="unfinished">Etiquetas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> <source>Branches</source> <translation>Ramos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1376"/> <source>Bookmarks</source> <translation>Marcadores</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1389"/> <source>Manage Changes</source> - <translation>Gerir Alterações</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> + <translation type="obsolete">Gerir Alterações</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1504"/> <source>Mercurial</source> <translation>Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1192"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1200"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1241"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1246"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1249"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1258"/> <source>Delete all backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1263"/> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1007"/> + <source>Stop Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <source>Stop the interrupted copying session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> + <source>Abort Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025"/> + <source>Abort the interrupted copying session and rollback</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1028"/> + <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1422"/> + <source>Merge Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1948"/> + <source>Copy Changesets (Stop)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1963"/> + <source>Copy Changesets (Abort)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -36973,6 +37038,41 @@ <source>Current branch tip</source> <translation>Dica de ramo atual</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="428"/> + <source>Dry-Run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="434"/> + <source>Select to not do a dry-run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="437"/> + <source>No</source> + <translation type="unfinished">Não</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="447"/> + <source>Select to just do a dry-run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="450"/> + <source>Dry-Run Only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="457"/> + <source>Select to do a dry-run first, than ask the user for confirmation to perform the rebase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="460"/> + <source>Dry-Run First, than Confirm</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRemoveSubrepositoriesDialog</name> @@ -61555,17 +61655,17 @@ <context> <name>Rebase</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="75"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="80"/> <source>Rebase Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="106"/> <source>Rebase Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="132"/> <source>Rebase Changesets (Abort)</source> <translation type="unfinished"></translation> </message> @@ -85460,22 +85560,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserView.py" line="2249"/> + <location filename="../WebBrowser/WebBrowserView.py" line="2250"/> <source>Quota Request</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserView.py" line="2249"/> + <location filename="../WebBrowser/WebBrowserView.py" line="2250"/> <source><p> Allow the website at <b>{0}</b> to use <b>{1}</b> of persistent storage?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserView.py" line="2281"/> + <location filename="../WebBrowser/WebBrowserView.py" line="2282"/> <source>Protocol Handler Request</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserView.py" line="2281"/> + <location filename="../WebBrowser/WebBrowserView.py" line="2282"/> <source><p> Allow the website at <b>{0}</b> to open all <b>{1}</b> links?</p></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric6_ru.ts Sat Aug 04 15:38:09 2018 +0200 +++ b/i18n/eric6_ru.ts Sat Aug 04 15:38:32 2018 +0200 @@ -29978,17 +29978,17 @@ <translation>Mercurial: Фиксация изменений в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Mercurial Command Server</source> <translation>Mercurial: Сервер команд</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3401"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>Mercurial: Невозможно перезапустить сервер.<br>Причина: {0}.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>Mercurial: Невозможно запустить сервер.<br>Причина: {0}.</p></translation> </message> @@ -29998,52 +29998,52 @@ <translation>Импорт патча</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2960"/> <source>Export Patches</source> <translation>Экспорт патчей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3007"/> <source>Change Phase</source> <translation>Изменить фазу</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3055"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3063"/> <source>Copy Changesets</source> <translation>Копировать набор изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3112"/> <source>Copy Changesets (Continue)</source> <translation>Копировать набор изменений (продолжение)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <source>Add Sub-repository</source> <translation>Добавить субрепозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3303"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation><p>Невозможно прочитать файл субрепозиториев .hgsub.<b></b>Причина {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>Файл субрепозиториев .hgsub уже содержит запись <b>{0}</b>. Отмена...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>Невозможно записать файл субрепозиториев .hgsub.<p><p>Причина: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> <source>Remove Sub-repositories</source> <translation>Удалить субрепозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>Отсутствует файл субрепозиториев .hgsub. Отмена...</p></translation> </message> @@ -30073,7 +30073,7 @@ <translation>Вы действительно хотите откатить все изменения в проекте?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3167"/> <source>Create Unversioned Archive</source> <translation>Создать неверсированный архив</translation> </message> @@ -30108,62 +30108,62 @@ <translation>Вершина текущей ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665"/> <source>Mercurial Bookmark</source> <translation>Mercurial: Закладка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> <source>Delete Bookmark</source> <translation>Удалить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> <source>Select the bookmark to be deleted:</source> <translation>Выберите закладку для удаления:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3647"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3698"/> <source>Delete Mercurial Bookmark</source> <translation>Mercurial: Удалить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3731"/> <source>Rename Mercurial Bookmark</source> <translation>Mercurial: Переименовать закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3773"/> <source>Move Mercurial Bookmark</source> <translation>Mercurial: Переместить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> <source>Pull Bookmark</source> <translation>Загрузить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> <source>Select the bookmark to be pulled:</source> <translation>Выберите закладку для загрузки:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3880"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Загрузка закладки из удалённого Mercurial репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> <source>Push Bookmark</source> <translation>Протолкнуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> <source>Select the bookmark to be push:</source> <translation>Выберите закладку для проталкивания:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3873"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3924"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Mercurial: Проталкивание (передача) закладки в удалённый репозиторий</translation> </message> @@ -30198,12 +30198,12 @@ <translation>Пометить как 'разрешенный'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> <source>Delete All Backups</source> <translation>Удалить все резервные копии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation><p>Вы действительно хотите удалить все резервные bundles-пакеты, сохраненные в области резервного копирования <b>{0}</b>?</p></translation> </message> @@ -30212,6 +30212,16 @@ <source>Canceling uncommitted merge</source> <translation>Отмена незавершенного слияния</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3124"/> + <source>Copy Changesets (Stop)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3137"/> + <source>Copy Changesets (Abort)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -31774,22 +31784,22 @@ <translation>Задайте набор именений с помощью номера, id, выражения для диапазона или набора ревизий (по одному в строке)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="130"/> <source>Compare Against Second Parent</source> <translation>Сравнивать со вторым предком</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="140"/> <source>Treat all Files as Text</source> <translation>Считать все файлы текстовыми</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="147"/> <source>Omit Dates</source> <translation>Исключить дату</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="154"/> <source>Use Git extended Diff-Format</source> <translation>Генерировать патч в расширенном Git-формате</translation> </message> @@ -31805,6 +31815,16 @@ <translation><b>Имя приемника</b> <p>Введите новое имя в это поле. Имя приемника должно быть новым или абсолютныи путём.</p></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="105"/> + <source>Bookmark:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="118"/> + <source>Enter a bookmark name</source> + <translation type="unfinished">Введите имя закладки</translation> + </message> </context> <context> <name>HgFetchDialog</name> @@ -32188,6 +32208,16 @@ <source>Perform Dry-Run</source> <translation>Выполнить пробный прогон</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="171"/> + <source>Select to not commit the copied changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="174"/> + <source>Don't Commit</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgHisteditCommitEditor</name> @@ -34250,7 +34280,7 @@ <translation><b>Просмотр групп изменений</b><p>Просмотр файла, содержащего коллекцию групп изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1793"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1823"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> @@ -34365,27 +34395,27 @@ <translation><b>Автономный сервер репозитория проекта</b><p>Запуск автономного сервера для репозитория проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> <source>Specials</source> <translation>Специальные</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1339"/> <source>Changegroup Management</source> <translation>Управление группами изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352"/> <source>Bisect</source> <translation>Двоичный поиск (bisect)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1610"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1640"/> <source>Pull</source> <translation>Загрузить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1963"/> <source>The project should be reread. Do this now?</source> <translation>Проект должен быть перепрочитан. Сделать это сейчас?</translation> </message> @@ -34415,7 +34445,7 @@ <translation>Откатить последнюю транзакцию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1397"/> <source>Extensions</source> <translation>Плагины (расширения)</translation> </message> @@ -34495,7 +34525,7 @@ <translation><b>Пропустить</b><p>Пропустить выбранные изменения.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1849"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1879"/> <source>Import Patch</source> <translation>Импорт патча</translation> </message> @@ -34515,12 +34545,12 @@ <translation><b>Импорт патч</b><p>Импортирование патча из патч-файла в проект.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> <source>Patch Management</source> <translation>Управление патчами</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1869"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1899"/> <source>Revert Changes</source> <translation>Откатить изменения</translation> </message> @@ -34565,7 +34595,7 @@ <translation><b>Изменить фазу</b><p>Изменение фазы выбранных ревизий.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1919"/> <source>Copy Changesets</source> <translation>Копировать наборы изменений</translation> </message> @@ -34597,10 +34627,10 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378"/> <source>Graft</source> - <translation>Копировать в текущую ветвь (graft)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <translation type="obsolete">Копировать в текущую ветвь (graft)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1934"/> <source>Copy Changesets (Continue)</source> <translation>Копировать изменения (продолжение)</translation> </message> @@ -34625,47 +34655,47 @@ <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="1036"/> <source>Add</source> <translation>Добавить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Add...</source> <translation>Добавить...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> <source>Add a sub-repository</source> <translation>Добавить субрепозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation><b>Добавить...</b><p>Добавление субрепозитория в проект.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/> <source>Remove</source> <translation>Удалить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/> <source>Remove...</source> <translation>Удалить...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> <source>Remove sub-repositories</source> <translation>Удалить субрепозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1059"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation><b>Удалить...</b><p>Удаление субрепозиториев из проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1417"/> <source>Sub-Repository</source> <translation>Субрепозиторий</translation> </message> @@ -34695,22 +34725,22 @@ <translation><b>Показать сводку</b><p>Отображение суммарной информации о статусе рабочей директории.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067"/> <source>Create unversioned archive</source> <translation>Создать неверсированный архив</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067"/> <source>Create unversioned archive...</source> <translation>Создать неверсированный архив...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> <source>Create an unversioned archive from the repository</source> <translation>Создать из репозитория неверсированный архив</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1075"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation><b>Создать неверсированный архив...</b><p>Создание из репозитория неверсированного архива.</p></translation> </message> @@ -34720,7 +34750,7 @@ <translation><b>Отмена последней транзакции</b><p>Выполняет откат последней транзакции. Транзакции используются для инкапсуляции последствий всех команд, которые создают новые наборы изменений или перемещают существующие наборы изменений в хранилище. Например, следующие команды являются транзакционными, и их последствия могут быть отменены:<ul><li>commit</li><li>import</li><li>pull</li><li>push (текущее хранилище как место назначения)</li><li>unbundle</li></ul></p><p><strong>Эта команда опасна. Пожалуйста, используйте ее с осторожностью.</strong></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1305"/> <source>Administration</source> <translation>Администрирование</translation> </message> @@ -34760,177 +34790,177 @@ <translation><b>Отменить незавершённое слияние</b><p>Отмена незавершённого слияния с потерей всех изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> <source>List bookmarks</source> <translation>Список закладок</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> - <source>List bookmarks...</source> - <translation>Список закладок...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> - <source>List bookmarks of the project</source> - <translation>Список закладок проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> - <translation><b>Список закладок</b><p>Отображение списка закладок текущего проекта.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>Define bookmark</source> - <translation>Определить закладку</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>Define bookmark...</source> - <translation>Определить закладку...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> - <source>Define a bookmark for the project</source> - <translation>Определить закладку проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> - <translation><b>Определить закладку</b><p>Определение закладки текущего проекта.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Delete bookmark</source> - <translation>Удалить закладку</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Delete bookmark...</source> - <translation>Удалить закладку...</translation> + <source>List bookmarks...</source> + <translation>Список закладок...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> - <source>Delete a bookmark of the project</source> - <translation>Удалить закладку проекта</translation> + <source>List bookmarks of the project</source> + <translation>Список закладок проекта</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> - <translation><b>Удалить закладку</b><p>Удаление закладки проекта.</p></translation> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <translation><b>Список закладок</b><p>Отображение списка закладок текущего проекта.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Rename bookmark</source> - <translation>Переименовать закладку</translation> + <source>Define bookmark</source> + <translation>Определить закладку</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Rename bookmark...</source> - <translation>Переименовать закладку...</translation> + <source>Define bookmark...</source> + <translation>Определить закладку...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> - <source>Rename a bookmark of the project</source> - <translation>Переименовать закладку проекта</translation> + <source>Define a bookmark for the project</source> + <translation>Определить закладку проекта</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> - <translation><b>Переименовать закладку</b><p>Переименование закладки проекта.</p></translation> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> + <translation><b>Определить закладку</b><p>Определение закладки текущего проекта.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Move bookmark</source> - <translation>Переместить закладку</translation> + <source>Delete bookmark</source> + <translation>Удалить закладку</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Move bookmark...</source> - <translation>Переместить закладку...</translation> + <source>Delete bookmark...</source> + <translation>Удалить закладку...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> - <source>Move a bookmark of the project</source> - <translation>Переместить закладку проекта</translation> + <source>Delete a bookmark of the project</source> + <translation>Удалить закладку проекта</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> - <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> - <translation><b>Переместить закладку</b><p>Перемещение закладки проекта в другую набор изменений.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/> - <source>Show incoming bookmarks</source> - <translation>Показать входящие закладки</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> - <source>Show a list of incoming bookmarks</source> - <translation>Показать список входящих закладок</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1137"/> - <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> - <translation><b>Показать входящие закладки</b><p>Отображение списка новых закладок, доступных в удаленном репозитории.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> - <source>Pull bookmark</source> - <translation>Загруз