--- 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>