--- a/src/eric7/i18n/eric7_empty.ts Mon Dec 12 19:50:37 2022 +0100
+++ b/src/eric7/i18n/eric7_empty.ts Tue Dec 13 14:03:13 2022 +0100
@@ -2905,10 +2905,10 @@
<translation type="unfinished" />
</message>
<message>
- <location filename="../UI/Browser.py" line="609" />
- <location filename="../UI/Browser.py" line="601" />
- <location filename="../UI/Browser.py" line="591" />
- <location filename="../UI/Browser.py" line="582" />
+ <location filename="../UI/Browser.py" line="613" />
+ <location filename="../UI/Browser.py" line="605" />
+ <location filename="../UI/Browser.py" line="595" />
+ <location filename="../UI/Browser.py" line="586" />
<location filename="../UI/Browser.py" line="298" />
<location filename="../UI/Browser.py" line="259" />
<source>Show Mime-Type</source>
@@ -2992,122 +2992,122 @@
<translation type="unfinished" />
</message>
<message>
- <location filename="../UI/Browser.py" line="583" />
+ <location filename="../UI/Browser.py" line="587" />
<source>The mime type of the file could not be determined.</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../UI/Browser.py" line="602" />
- <location filename="../UI/Browser.py" line="592" />
+ <location filename="../UI/Browser.py" line="606" />
+ <location filename="../UI/Browser.py" line="596" />
<source>The file has the mime type <b>{0}</b>.</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../UI/Browser.py" line="610" />
+ <location filename="../UI/Browser.py" line="614" />
<source>The file has the mime type <b>{0}</b>.<br/> Shall it be added to the list of text mime types?</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../UI/Browser.py" line="708" />
+ <location filename="../UI/Browser.py" line="712" />
<source>New toplevel directory</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../UI/Browser.py" line="944" />
- <location filename="../UI/Browser.py" line="932" />
- <location filename="../UI/Browser.py" line="923" />
+ <location filename="../UI/Browser.py" line="948" />
+ <location filename="../UI/Browser.py" line="936" />
+ <location filename="../UI/Browser.py" line="927" />
<source>New Directory</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../UI/Browser.py" line="924" />
+ <location filename="../UI/Browser.py" line="928" />
<source>Name for new directory:</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../UI/Browser.py" line="971" />
- <location filename="../UI/Browser.py" line="933" />
+ <location filename="../UI/Browser.py" line="975" />
+ <location filename="../UI/Browser.py" line="937" />
<source>A file or directory named <b>{0}</b> exists already. Aborting...</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../UI/Browser.py" line="945" />
+ <location filename="../UI/Browser.py" line="949" />
<source><p>The directory <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../UI/Browser.py" line="983" />
- <location filename="../UI/Browser.py" line="970" />
- <location filename="../UI/Browser.py" line="961" />
+ <location filename="../UI/Browser.py" line="987" />
+ <location filename="../UI/Browser.py" line="974" />
+ <location filename="../UI/Browser.py" line="965" />
<source>New File</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../UI/Browser.py" line="962" />
+ <location filename="../UI/Browser.py" line="966" />
<source>Name for new file:</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../UI/Browser.py" line="984" />
+ <location filename="../UI/Browser.py" line="988" />
<source><p>The file <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../UI/Browser.py" line="1013" />
+ <location filename="../UI/Browser.py" line="1017" />
<source>Do you really want to move this file to the trash?</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../UI/Browser.py" line="1016" />
+ <location filename="../UI/Browser.py" line="1020" />
<source>Do you really want to delete this file?</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../UI/Browser.py" line="1101" />
- <location filename="../UI/Browser.py" line="1027" />
- <location filename="../UI/Browser.py" line="1019" />
+ <location filename="../UI/Browser.py" line="1105" />
+ <location filename="../UI/Browser.py" line="1031" />
+ <location filename="../UI/Browser.py" line="1023" />
<source>Delete File</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../UI/Browser.py" line="1102" />
- <location filename="../UI/Browser.py" line="1028" />
+ <location filename="../UI/Browser.py" line="1106" />
+ <location filename="../UI/Browser.py" line="1032" />
<source><p>The selected file <b>{0}</b> could not be deleted.</p><p>Reason: {1}</p></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../UI/Browser.py" line="1045" />
+ <location filename="../UI/Browser.py" line="1049" />
<source>Do you really want to move this directory to the trash?</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../UI/Browser.py" line="1050" />
+ <location filename="../UI/Browser.py" line="1054" />
<source>Do you really want to delete this directory?</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../UI/Browser.py" line="1064" />
- <location filename="../UI/Browser.py" line="1053" />
+ <location filename="../UI/Browser.py" line="1068" />
+ <location filename="../UI/Browser.py" line="1057" />
<source>Delete Directory</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../UI/Browser.py" line="1065" />
+ <location filename="../UI/Browser.py" line="1069" />
<source><p>The selected directory <b>{0}</b> could not be deleted.</p><p>Reason: {1}</p></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../UI/Browser.py" line="1086" />
+ <location filename="../UI/Browser.py" line="1090" />
<source>Do you really want to move these files to the trash?</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../UI/Browser.py" line="1089" />
+ <location filename="../UI/Browser.py" line="1093" />
<source>Do you really want to delete these files?</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../UI/Browser.py" line="1092" />
+ <location filename="../UI/Browser.py" line="1096" />
<source>Delete Files</source>
<translation type="unfinished" />
</message>
@@ -21300,7 +21300,7 @@
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1656" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1632" />
<location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="209" />
<source>The git process did not finish within 30s.</source>
<translation type="unfinished" />
@@ -21341,27 +21341,27 @@
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="418" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="422" />
<source>Commit Changes</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="419" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="423" />
<source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="477" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="479" />
<source>Committing changes to Git repository</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="538" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="540" />
<source>Switch</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="539" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="541" />
<source><p>Do you really want to switch to <b>{0}</b>?</p></source>
<translation type="unfinished" />
</message>
@@ -21371,108 +21371,108 @@
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="615" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="613" />
<source>Adding files/directories to the Git repository</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="687" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="683" />
<source>Removing files/directories from the Git repository</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="752" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="746" />
<source>Renaming {0}</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="876" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="868" />
<source>Unstage files/directories</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="931" />
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="920" />
- <source>Revert changes</source>
- <translation type="unfinished" />
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="921" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="910" />
+ <source>Revert changes</source>
+ <translation type="unfinished" />
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="911" />
<source>Do you really want to revert all changes to these files or directories?</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="932" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="922" />
<source>Do you really want to revert all changes of the project?</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="938" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="928" />
<source>Reverting changes</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="992" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="980" />
<source>Merging</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1022" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1008" />
<source>Master branch head</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1244" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1224" />
<source>Git Command</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1346" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1326" />
<source><tr><td><b>Commit</b></td><td>{0}</td></tr></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1350" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1330" />
<source><tr><td><b>Parents</b></td><td>{0}</td></tr></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1356" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1336" />
<source><tr><td><b>Tags</b></td><td>{0}</td></tr></source>
<translation type="unfinished" />
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1342" />
+ <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source>
+ <translation type="unfinished" />
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1347" />
+ <source><tr><td><b>Author</b></td><td>{0} &lt;{1}&gt;</td></tr></source>
+ <translation type="unfinished" />
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1352" />
+ <source><tr><td><b>Date</b></td><td>{0}</td></tr></source>
+ <translation type="unfinished" />
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1357" />
+ <source><tr><td><b>Committer</b></td><td>{0} &lt;{1}&gt;</td></tr></source>
+ <translation type="unfinished" />
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1362" />
- <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source>
+ <source><tr><td><b>Committed Date</b></td><td>{0}</td></tr></source>
<translation type="unfinished" />
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1367" />
- <source><tr><td><b>Author</b></td><td>{0} &lt;{1}&gt;</td></tr></source>
- <translation type="unfinished" />
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1372" />
- <source><tr><td><b>Date</b></td><td>{0}</td></tr></source>
- <translation type="unfinished" />
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1377" />
- <source><tr><td><b>Committer</b></td><td>{0} &lt;{1}&gt;</td></tr></source>
- <translation type="unfinished" />
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1382" />
- <source><tr><td><b>Committed Date</b></td><td>{0}</td></tr></source>
- <translation type="unfinished" />
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1387" />
<source><tr><td><b>Subject</b></td><td>{0}</td></tr></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1393" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1373" />
<source><h3>Repository information</h3>
<p><table>
<tr><td><b>Git V.</b></td><td>{0}</td></tr>
@@ -21482,459 +21482,459 @@
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1467" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1447" />
<source>Create {0} file</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1468" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1448" />
<source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1532" />
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1515" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1512" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1495" />
<source>Git Copy</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1516" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1496" />
<source><p>Copying the directory <b>{0}</b> failed.</p><p>Reason: {1}</p></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1533" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1513" />
<source><p>Copying the file <b>{0}</b> failed.</p><p>Reason: {1}</p></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2772" />
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1658" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2712" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1634" />
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1728" />
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1715" />
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1704" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1702" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1689" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1678" />
<source>Git Side-by-Side Difference</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1729" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1703" />
<source><p>The file <b>{0}</b> could not be read.</p></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1783" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1755" />
<source>Fetching from a remote Git repository</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1821" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1791" />
<source>Pulling from a remote Git repository</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1862" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1830" />
<source>Pushing to a remote Git repository</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1888" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1854" />
<source>Committing failed merge</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1915" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1879" />
<source>Aborting uncommitted/failed merge</source>
<translation type="unfinished" />
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1909" />
+ <source>Applying patch</source>
+ <translation type="unfinished" />
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1942" />
+ <source>Check patch files</source>
+ <translation type="unfinished" />
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1945" />
- <source>Applying patch</source>
- <translation type="unfinished" />
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1980" />
- <source>Check patch files</source>
- <translation type="unfinished" />
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1983" />
<source>Apply patch files</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2065" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2025" />
<source>Tagging in the Git repository</source>
<translation type="unfinished" />
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2270" />
+ <source>Branching in the Git repository</source>
+ <translation type="unfinished" />
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2312" />
- <source>Branching in the Git repository</source>
- <translation type="unfinished" />
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2356" />
<source>Delete Remote Branch</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2379" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2333" />
<source>Current Branch</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2380" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2334" />
<source><p>The current branch is <b>{0}</b>.</p></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2446" />
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2428" />
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2410" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2398" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2380" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2362" />
<source>Create Bundle</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2412" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2364" />
<source>Git Bundle Files (*.bundle)</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2429" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2381" />
<source><p>The Git bundle file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2477" />
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2466" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2427" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2416" />
<source>Verify Bundle</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2616" />
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2567" />
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2499" />
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2468" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2560" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2513" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2447" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2418" />
<source>Git Bundle Files (*.bundle);;All Files (*)</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2508" />
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2497" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2456" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2445" />
<source>List Bundle Heads</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2614" />
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2565" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2558" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2511" />
<source>Apply Bundle</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2635" />
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2586" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2579" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2532" />
<source>Applying a bundle file (fetch)</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2671" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2615" />
<source>Bisect subcommand ({0}) invalid.</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2878" />
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2716" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2814" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2658" />
<source>Git Bisect ({0})</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2771" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2711" />
<source>Process Generation Error</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2817" />
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2800" />
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2782" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2757" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2740" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2722" />
<source>Create Bisect Replay File</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2784" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2724" />
<source>Git Bisect Replay Files (*.replay)</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2801" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2741" />
<source><p>The Git bisect replay file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2818" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2758" />
<source><p>The file <b>{0}</b> could not be written.</p><p>Reason: {1}</p></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2839" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2777" />
<source>Edit Bisect Replay File</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2869" />
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2841" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2805" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2779" />
<source>Git Bisect Replay Files (*.replay);;All Files (*)</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2867" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2803" />
<source>Bisect Replay</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3225" />
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3043" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3147" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2977" />
<source>Show Remote Info</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3103" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3033" />
<source>Rename Remote Repository</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3104" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3034" />
<source>Enter new name for remote repository:</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3249" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3169" />
<source>Show Shortlog</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3308" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3226" />
<source>Cherry-pick</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3337" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3253" />
<source>Copy Changesets (Continue)</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3362" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3276" />
<source>Copy Changesets (Quit)</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3388" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3300" />
<source>Copy Changesets (Cancel)</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3470" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3378" />
<source>Saving stash</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3682" />
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3580" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3418" />
<source>Show Stash</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3683" />
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3641" />
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3590" />
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3548" />
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3513" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3581" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3541" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3492" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3452" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3419" />
<source>Select a stash (empty for latest stash):</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3589" />
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3547" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3491" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3451" />
<source>Restore Stash</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3603" />
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3561" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3505" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3465" />
<source>Restoring stash</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3640" />
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3629" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3540" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3529" />
<source>Create Branch</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3630" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3530" />
<source>Enter a branch name to restore a stash to:</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3655" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3555" />
<source>Creating branch</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3693" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3591" />
<source>Delete Stash</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3694" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3592" />
<source>Do you really want to delete the stash <b>{0}</b>?</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3704" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3602" />
<source>Deleting stash</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3726" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3622" />
<source>Delete All Stashes</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3727" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3623" />
<source>Do you really want to delete all stashes?</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3733" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3629" />
<source>Deleting all stashes</source>
<translation type="unfinished" />
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3689" />
+ <source>Showing the combined configuration settings</source>
+ <translation type="unfinished" />
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3711" />
+ <source>Verifying the integrity of the Git repository</source>
+ <translation type="unfinished" />
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3732" />
+ <source>Performing Repository Housekeeping</source>
+ <translation type="unfinished" />
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3773" />
+ <source><tr><td><b>Statistics</b></td></tr></source>
+ <translation type="unfinished" />
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3775" />
+ <source><tr><td>Number of loose objects: </td><td>{0}</td></tr></source>
+ <translation type="unfinished" />
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3780" />
+ <source><tr><td>Disk space used by loose objects: </td><td>{0} KiB</td></tr></source>
+ <translation type="unfinished" />
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3786" />
+ <source><tr><td>Number of packed objects: </td><td>{0}</td></tr></source>
+ <translation type="unfinished" />
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3792" />
+ <source><tr><td>Number of packs: </td><td>{0}</td></tr></source>
+ <translation type="unfinished" />
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3797" />
- <source>Showing the combined configuration settings</source>
+ <source><tr><td>Disk space used by packed objects: </td><td>{0} KiB</td></tr></source>
+ <translation type="unfinished" />
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3803" />
+ <source><tr><td>Packed objects waiting for pruning: </td><td>{0}</td></tr></source>
+ <translation type="unfinished" />
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3809" />
+ <source><tr><td>Garbage files: </td><td>{0}</td></tr></source>
+ <translation type="unfinished" />
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3814" />
+ <source><tr><td>Disk space used by garbage files: </td><td>{0} KiB</td></tr></source>
<translation type="unfinished" />
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3821" />
- <source>Verifying the integrity of the Git repository</source>
- <translation type="unfinished" />
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3844" />
- <source>Performing Repository Housekeeping</source>
+ <source><p><b>No statistics available.</b></p></source>
<translation type="unfinished" />
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3887" />
- <source><tr><td><b>Statistics</b></td></tr></source>
- <translation type="unfinished" />
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3889" />
- <source><tr><td>Number of loose objects: </td><td>{0}</td></tr></source>
- <translation type="unfinished" />
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3894" />
- <source><tr><td>Disk space used by loose objects: </td><td>{0} KiB</td></tr></source>
- <translation type="unfinished" />
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3900" />
- <source><tr><td>Number of packed objects: </td><td>{0}</td></tr></source>
- <translation type="unfinished" />
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3906" />
- <source><tr><td>Number of packs: </td><td>{0}</td></tr></source>
- <translation type="unfinished" />
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3911" />
- <source><tr><td>Disk space used by packed objects: </td><td>{0} KiB</td></tr></source>
- <translation type="unfinished" />
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3917" />
- <source><tr><td>Packed objects waiting for pruning: </td><td>{0}</td></tr></source>
- <translation type="unfinished" />
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3923" />
- <source><tr><td>Garbage files: </td><td>{0}</td></tr></source>
- <translation type="unfinished" />
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3928" />
- <source><tr><td>Disk space used by garbage files: </td><td>{0} KiB</td></tr></source>
- <translation type="unfinished" />
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3935" />
- <source><p><b>No statistics available.</b></p></source>
- <translation type="unfinished" />
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4003" />
<source>Creating Archive</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4045" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3927" />
<source>Add Submodule</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4113" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3993" />
<source>List Submodules</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4114" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3994" />
<source>No submodules defined for the project.</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4127" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4007" />
<source>All</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4131" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4011" />
<source>Submodule Path</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4132" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4012" />
<source>Select a submodule path:</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4183" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4061" />
<source>Initialize Submodules</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4218" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4094" />
<source>Unregister Submodules</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4292" />
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4251" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4164" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4125" />
<source>Update Submodules</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4324" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4194" />
<source>Synchronize Submodules</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4380" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4248" />
<source>Submodules Summary</source>
<translation type="unfinished" />
</message>
@@ -22337,22 +22337,22 @@
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="128" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="126" />
<source>Process Generation Error</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="129" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="127" />
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation type="unfinished" />
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="213" />
+ <source>Changed by skipped commit</source>
+ <translation type="unfinished" />
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="215" />
- <source>Changed by skipped commit</source>
- <translation type="unfinished" />
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="217" />
<source>Commit cannot be skipped</source>
<translation type="unfinished" />
</message>
@@ -22883,12 +22883,12 @@
<context>
<name>GitDescribeDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py" line="120" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py" line="118" />
<source>Process Generation Error</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py" line="121" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py" line="119" />
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation type="unfinished" />
</message>
@@ -23451,7 +23451,7 @@
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1898" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1896" />
<location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="340" />
<source>Branch</source>
<translation type="unfinished" />
@@ -23472,9 +23472,9 @@
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1959" />
- <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1870" />
- <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1847" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1957" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1868" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1845" />
<location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="356" />
<source>Switch</source>
<translation type="unfinished" />
@@ -23485,7 +23485,7 @@
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1986" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1984" />
<location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="364" />
<source>Show Short Log</source>
<translation type="unfinished" />
@@ -23537,94 +23537,94 @@
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1347" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1345" />
<source>Side-by-Side Diff to Parent {0}</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1361" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1359" />
<source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1807" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1805" />
<source>Copy Changesets</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1960" />
- <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1871" />
- <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1808" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1958" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1869" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1806" />
<source>The project should be reread. Do this now?</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1987" />
- <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1848" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1985" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1846" />
<source>Select a branch</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1937" />
- <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1899" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1935" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1897" />
<source>Select a default branch</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1936" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1934" />
<source>Branch & Switch</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2166" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2164" />
<source>Find Commit</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2167" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2165" />
<source>'{0}' was not found.</source>
<translation type="unfinished" />
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="0" />
- <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2211" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2209" />
<source>Differences</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2223" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2221" />
<source>Differences to Parent {0}</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2239" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2237" />
<source>Diff to Parent {0}</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2264" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2262" />
<source>There is no difference.</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2431" />
- <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2414" />
- <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2396" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2429" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2412" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2394" />
<source>Save Diff</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2398" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2396" />
<source>Patch Files (*.diff)</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2415" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2413" />
<source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2432" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2430" />
<source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source>
<translation type="unfinished" />
</message>
@@ -24214,14 +24214,14 @@
<context>
<name>GitPatchStatisticsDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="122" />
- <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="89" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="118" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="85" />
<source>Process Generation Error</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="123" />
- <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="90" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="119" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="86" />
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation type="unfinished" />
</message>
@@ -26445,12 +26445,12 @@
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="198" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="203" />
<source>Process Generation Error</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="199" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="204" />
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation type="unfinished" />
</message>
@@ -26662,12 +26662,12 @@
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="151" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="149" />
<source>Process Generation Error</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="152" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="150" />
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation type="unfinished" />
</message>
@@ -27010,21 +27010,21 @@
<translation type="unfinished" />
</message>
<message numerus="yes">
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="385" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="383" />
<source>%n file(s) changed</source>
<translation type="unfinished">
<numerusform />
</translation>
</message>
<message numerus="yes">
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="388" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="386" />
<source>%n line(s) inserted</source>
<translation type="unfinished">
<numerusform />
</translation>
</message>
<message numerus="yes">
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="391" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="389" />
<source>%n line(s) deleted</source>
<translation type="unfinished">
<numerusform />
@@ -27187,7 +27187,7 @@
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="0" />
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="676" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="674" />
<location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="195" />
<source>Commit</source>
<translation type="unfinished" />
@@ -27218,7 +27218,7 @@
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="719" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="717" />
<location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="210" />
<source>Add</source>
<translation type="unfinished" />
@@ -27249,7 +27249,7 @@
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="874" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="872" />
<location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="226" />
<source>Differences</source>
<translation type="unfinished" />
@@ -27270,7 +27270,7 @@
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="810" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="808" />
<location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="244" />
<source>Revert</source>
<translation type="unfinished" />
@@ -27281,7 +27281,7 @@
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="791" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="789" />
<location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="253" />
<source>Forget Missing</source>
<translation type="unfinished" />
@@ -27292,7 +27292,7 @@
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="839" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="837" />
<location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="257" />
<source>Restore Missing</source>
<translation type="unfinished" />
@@ -27329,108 +27329,108 @@
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="426" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="424" />
<source>Process Generation Error</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="427" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="425" />
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="606" />
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="470" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="604" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="468" />
<source>all</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="677" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="675" />
<source>There are no entries selected to be committed.</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="720" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="718" />
<source>There are no unversioned entries available/selected.</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="743" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="741" />
<source>Stage</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="744" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="742" />
<source>There are no stageable entries available/selected.</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="767" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="765" />
<source>Unstage</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="768" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="766" />
<source>There are no unstageable entries available/selected.</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="840" />
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="792" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="838" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="790" />
<source>There are no missing entries available/selected.</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="811" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="809" />
<source>There are no uncommitted, unstaged changes available/selected.</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="875" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="873" />
<source>There are no uncommitted changes available/selected.</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="925" />
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="901" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="923" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="899" />
<source>Working Tree to Staging Area</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="902" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="900" />
<source>Staging Area to HEAD Commit</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="926" />
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="903" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="924" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="901" />
<source>Working Tree to HEAD Commit</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="930" />
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="907" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="928" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="905" />
<source>Differences Side-by-Side</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="931" />
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="908" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="929" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="906" />
<source>Select the compare method.</source>
<translation type="unfinished" />
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1239" />
+ <source>Revert selected lines</source>
+ <translation type="unfinished" />
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1241" />
- <source>Revert selected lines</source>
- <translation type="unfinished" />
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1243" />
<source>Revert hunk</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1248" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1246" />
<source>Are you sure you want to revert the selected changes?</source>
<translation type="unfinished" />
</message>
@@ -27747,53 +27747,53 @@
<translation type="unfinished" />
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="44" />
+ <source>up-to-date</source>
+ <translation type="unfinished" />
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="45" />
+ <source>not initialized</source>
+ <translation type="unfinished" />
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="46" />
- <source>up-to-date</source>
+ <source>different to index</source>
<translation type="unfinished" />
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="47" />
- <source>not initialized</source>
- <translation type="unfinished" />
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="48" />
- <source>different to index</source>
- <translation type="unfinished" />
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="49" />
<source>merge conflicts</source>
<translation type="unfinished" />
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="54" />
+ <source>Refresh</source>
+ <translation type="unfinished" />
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="56" />
- <source>Refresh</source>
- <translation type="unfinished" />
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="58" />
<source>Press to refresh the status display</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="103" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="99" />
<source>The process {0} did not finish within 30 seconds.</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="109" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="105" />
<source>The process {0} finished with an error.
Error: {1}</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="116" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="112" />
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="137" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="133" />
<source>unknown</source>
<translation type="unfinished" />
</message>
@@ -28007,15 +28007,15 @@
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="102" />
- <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="96" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="109" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="103" />
<location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="0" />
<source>Commit</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="102" />
- <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="96" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="109" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="103" />
<location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="0" />
<source>Name</source>
<translation type="unfinished" />
@@ -28066,25 +28066,35 @@
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="96" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="103" />
<source>Annotation Message</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="100" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="107" />
<source>Git Branches List</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="140" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="145" />
<source>Process Generation Error</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="141" />
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="146" />
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation type="unfinished" />
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="336" />
+ <source>current branch</source>
+ <translation type="unfinished" />
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="339" />
+ <source>checked out in linked worktree</source>
+ <translation type="unfinished" />
+ </message>
</context>
<context>
<name>GitTagDialog</name>
@@ -47737,53 +47747,53 @@
<context>
<name>MicroPythonDevice</name>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="243" />
+ <location filename="../MicroPython/MicroPythonDevices.py" line="263" />
<source>RP2040 based</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="250" />
+ <location filename="../MicroPython/MicroPythonDevices.py" line="270" />
<source>Generic Board</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="368" />
- <location filename="../MicroPython/MicroPythonDevices.py" line="357" />
+ <location filename="../MicroPython/MicroPythonDevices.py" line="388" />
+ <location filename="../MicroPython/MicroPythonDevices.py" line="377" />
<source>Unknown Device</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="489" />
+ <location filename="../MicroPython/MicroPythonDevices.py" line="509" />
<source>Unsupported Device</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="499" />
+ <location filename="../MicroPython/MicroPythonDevices.py" line="519" />
<source>REPL is not supported by this device.</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="518" />
+ <location filename="../MicroPython/MicroPythonDevices.py" line="538" />
<source>Plotter is not supported by this device.</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="537" />
+ <location filename="../MicroPython/MicroPythonDevices.py" line="557" />
<source>Running scripts is not supported by this device.</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="556" />
+ <location filename="../MicroPython/MicroPythonDevices.py" line="576" />
<source>File Manager is not supported by this device.</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="601" />
+ <location filename="../MicroPython/MicroPythonDevices.py" line="621" />
<source>Select Device Directory</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="602" />
+ <location filename="../MicroPython/MicroPythonDevices.py" line="622" />
<source>Select the directory for the connected device:</source>
<translation type="unfinished" />
</message>
@@ -81038,122 +81048,122 @@
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="508" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="550" />
<source><h3>CircuitPython Board</h3><p>In order to prepare the board for flashing follow these steps:</p><ol><li>Switch your device to 'bootloader' mode by double-pressing the reset button.</li><li>Wait until the device has entered 'bootloader' mode.</li><li>(If this does not happen, then try shorter or longer pauses between presses.)</li><li>Ensure the boot volume is available (this may require mounting it).</li><li>Select the firmware file to be flashed and click the flash button.</li></ol></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="565" />
- <location filename="../MicroPython/UF2FlashDialog.py" line="533" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="607" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="575" />
<source><h3>Pi Pico (RP2040) Board</h3><p>In order to prepare the board for flashing follow these steps:</p><ol><li>Enter 'bootloader' mode (board <b>without</b> RESET button):<ul><li>Plug in your board while holding the BOOTSEL button.</li></ul>Enter 'bootloader' mode (board <b>with</b> RESET button):<ul><li>hold down RESET</li><li>hold down BOOTSEL</li><li>release RESET</li><li>release BOOTSEL</li></ul></li><li>Wait until the device has entered 'bootloader' mode.</li><li>Ensure the boot volume is available (this may require mounting it).</li><li>Select the firmware file to be flashed and click the flash button.</li></ol></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="641" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="683" />
<source>'{0}' Board</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="675" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="717" />
<source>MicroPython/CircuitPython Files (*.uf2);;All Files (*)</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="744" />
- <location filename="../MicroPython/UF2FlashDialog.py" line="733" />
- <location filename="../MicroPython/UF2FlashDialog.py" line="724" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="786" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="775" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="766" />
<source>Manual Select</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="843" />
- <location filename="../MicroPython/UF2FlashDialog.py" line="811" />
- <location filename="../MicroPython/UF2FlashDialog.py" line="788" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="885" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="853" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="830" />
<source>Reset Instructions:</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="790" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="832" />
<source><h4>No known devices detected.</h4><p>Follow the appropriate instructions below to set <b>one</b> board into 'bootloader' mode. Press <b>Refresh</b> when ready.</p></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="814" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="856" />
<source><h4>Flash {0} Firmware</h4><p>Follow the instructions below to set <b>one</b> board into 'bootloader' mode. Press <b>Refresh</b> when ready.</p><hr/>{1}</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="824" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="866" />
<source><h4>Potentially UF2 capable devices found</h4><p>Found these potentially UF2 capable devices:</p><ul><li>{0}</li></ul><p>Follow the instructions below to set <b>one</b> board into 'bootloader' mode. Press <b>Refresh</b> when ready.</p></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="845" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="887" />
<source><h4>No known devices detected.</h4><p>Follow the instructions below to set <b>one</b> board into 'bootloader' mode. Press <b>Refresh</b> when ready.</p></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="857" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="899" />
<source>Flash Instructions:</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="859" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="901" />
<source><h4>Flash method 'manual' selected.</h4><p>Follow the instructions below to flash a device by entering the data manually.</p><ol><li>Change the device to 'bootloader' mode.</li><li>Wait until the device has entered 'bootloader' mode.</li><li>Ensure the boot volume is available (this may require mounting it) and select its path.</li><li>Select the firmware file to be flashed and click the flash button.</li></ol></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="884" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="926" />
<source>Boot Volume not found:</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="886" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="928" />
<source><h4>No Boot Volume detected.</h4><p>Please ensure that the boot volume of the device to be flashed is available. </source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="892" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="934" />
<source>This volume should be named <b>{0}</b>. Press <b>Refresh</b> when ready.</p></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="897" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="939" />
<source>This volume should have one of these names.</p><ul><li>{0}</li></ul><p>Press <b>Refresh</b> when ready.</p></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="904" />
- <source><h4>Reset Instructions</h4><p>Follow the instructions below to set the board into 'bootloader' mode. Press <b>Refresh</b> when ready.</p></source>
- <translation type="unfinished" />
- </message>
- <message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="923" />
- <source>Multiple Boot Volumes found:</source>
- <translation type="unfinished" />
- </message>
- <message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="925" />
- <source><h4>Multiple Boot Volumes were found</h4><p>These volume paths were found.</p><ul><li>{0}</li></ul><p>Please ensure that only one device of a type is ready for flashing. Press <b>Refresh</b> when ready.</p></source>
- <translation type="unfinished" />
- </message>
- <message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="944" />
- <source>Flashing Firmware</source>
- <translation type="unfinished" />
- </message>
- <message>
<location filename="../MicroPython/UF2FlashDialog.py" line="946" />
+ <source><h4>Reset Instructions</h4><p>Follow the instructions below to set the board into 'bootloader' mode. Press <b>Refresh</b> when ready.</p></source>
+ <translation type="unfinished" />
+ </message>
+ <message>
+ <location filename="../MicroPython/UF2FlashDialog.py" line="965" />
+ <source>Multiple Boot Volumes found:</source>
+ <translation type="unfinished" />
+ </message>
+ <message>
+ <location filename="../MicroPython/UF2FlashDialog.py" line="967" />
+ <source><h4>Multiple Boot Volumes were found</h4><p>These volume paths were found.</p><ul><li>{0}</li></ul><p>Please ensure that only one device of a type is ready for flashing. Press <b>Refresh</b> when ready.</p></source>
+ <translation type="unfinished" />
+ </message>
+ <message>
+ <location filename="../MicroPython/UF2FlashDialog.py" line="986" />
+ <source>Flashing Firmware</source>
+ <translation type="unfinished" />
+ </message>
+ <message>
+ <location filename="../MicroPython/UF2FlashDialog.py" line="988" />
<source><p>Flashing the selected firmware to the device. Please wait until the device resets automatically.</p></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="953" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="995" />
<source>Flashing {0}</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="955" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="997" />
<source><p>Flashing the {0} firmware to the device. Please wait until the device resets automatically.</p></source>
<translation type="unfinished" />
</message>
