--- a/i18n/eric6_empty.ts Sat Feb 09 14:40:32 2019 +0100 +++ b/i18n/eric6_empty.ts Sun Feb 10 12:13:10 2019 +0100 @@ -6597,42 +6597,42 @@ <context> <name>DebuggerInterfacePython</name> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="461"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="465"/> <source>Start Debugger</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="461"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="465"/> <source><p>The debugger backend could not be started.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="956"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="960"/> <source>Parent Process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="957"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="961"/> <source>Child process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="958"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="962"/> <source>Client forking</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="958"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="962"/> <source>Select the fork branch to follow.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="1004"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="1008"/> <source>Debug Protocol Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="1004"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="1008"/> <source><p>The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{1}</p></source> <translation type="unfinished"></translation> </message> @@ -17533,7 +17533,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1558"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1561"/> <source>The git process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -17713,432 +17713,432 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1383"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1386"/> <source>Create {0} file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1383"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1386"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1442"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1445"/> <source>Git Copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1427"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1430"/> <source><p>Copying the directory <b>{0}</b> failed.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1442"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1445"/> <source><p>Copying the file <b>{0}</b> failed.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2627"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2630"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1629"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1632"/> <source>Git Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1629"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1632"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1678"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1681"/> <source>Fetching from a remote Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1716"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1719"/> <source>Pulling from a remote Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1757"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1760"/> <source>Pushing to a remote Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1785"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1788"/> <source>Committing failed merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1812"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1815"/> <source>Aborting uncommitted/failed merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1845"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1848"/> <source>Applying patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1877"/> - <source>Check patch files</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1880"/> + <source>Check patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1883"/> <source>Apply patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1962"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1965"/> <source>Tagging in the Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2193"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2196"/> <source>Branching in the Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2233"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2236"/> <source>Delete Remote Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2254"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2257"/> <source>Current Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2254"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2257"/> <source><p>The current branch is <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2318"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2321"/> <source>Create Bundle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2283"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2286"/> <source>Git Bundle Files (*.bundle)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2300"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2303"/> <source><p>The Git bundle file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2351"/> <source>Verify Bundle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2478"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2481"/> <source>Git Bundle Files (*.bundle);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2378"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2381"/> <source>List Bundle Heads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2478"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2481"/> <source>Apply Bundle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2501"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2504"/> <source>Applying a bundle file (fetch)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2528"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2531"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2731"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2734"/> <source>Git Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2627"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2630"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2671"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2674"/> <source>Create Bisect Replay File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2637"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2640"/> <source>Git Bisect Replay Files (*.replay)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2654"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2657"/> <source><p>The Git bisect replay file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2671"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2674"/> <source><p>The file <b>{0}</b> could not be written.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2692"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2695"/> <source>Edit Bisect Replay File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2719"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2722"/> <source>Git Bisect Replay Files (*.replay);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2719"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2722"/> <source>Bisect Replay</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3071"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3074"/> <source>Show Remote Info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2950"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2953"/> <source>Rename Remote Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2950"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2953"/> <source>Enter new name for remote repository:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3095"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3098"/> <source>Show Shortlog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3153"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3156"/> <source>Cherry-pick</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3183"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3186"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3208"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3211"/> <source>Copy Changesets (Quit)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3234"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3237"/> <source>Copy Changesets (Cancel)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3314"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3317"/> <source>Saving stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3513"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3516"/> <source>Show Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3513"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3516"/> <source>Select a stash (empty for latest stash):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3425"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3428"/> <source>Restore Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3439"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3442"/> <source>Restoring stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3473"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3476"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3463"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3466"/> <source>Enter a branch name to restore a stash to:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3488"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3491"/> <source>Creating branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3522"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3525"/> <source>Delete Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3522"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3525"/> <source>Do you really want to delete the stash <b>{0}</b>?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3533"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3536"/> <source>Deleting stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3553"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3556"/> <source>Delete All Stashes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3553"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3556"/> <source>Do you really want to delete all stashes?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3561"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3564"/> <source>Deleting all stashes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3636"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3659"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3662"/> <source>Verifying the integrity of the Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3684"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3687"/> <source>Performing Repository Housekeeping</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3728"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3731"/> <source><tr><td><b>Statistics</b></td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3729"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3732"/> <source><tr><td>Number of loose objects: </td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3733"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3736"/> <source><tr><td>Disk space used by loose objects: </td><td>{0} KiB</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3737"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3740"/> <source><tr><td>Number of packed objects: </td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3741"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3744"/> <source><tr><td>Number of packs: </td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3745"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3748"/> <source><tr><td>Disk space used by packed objects: </td><td>{0} KiB</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3749"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3752"/> <source><tr><td>Packed objects waiting for pruning: </td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3753"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3756"/> <source><tr><td>Garbage files: </td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3757"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3760"/> <source><tr><td>Disk space used by garbage files: </td><td>{0} KiB</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3763"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3766"/> <source><p><b>No statistics available.</b></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3829"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3832"/> <source>Creating Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3872"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3875"/> <source>Add Submodule</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3942"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3945"/> <source>List Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3942"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3945"/> <source>No submodules defined for the project.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3957"/> - <source>All</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3960"/> + <source>All</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3963"/> <source>Submodule Path</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3960"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3963"/> <source>Select a submodule path:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4013"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4016"/> <source>Initialize Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4050"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4053"/> <source>Unregister Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4130"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4133"/> <source>Update Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4164"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4167"/> <source>Synchronize Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4222"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4225"/> <source>Submodules Summary</source> <translation type="unfinished"></translation> </message> @@ -23616,12 +23616,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="103"/> <source>Select Submodule Repository Directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="129"/> <source>Select Submodule Directory</source> <translation type="unfinished"></translation> </message> @@ -46179,47 +46179,47 @@ <context> <name>NetworkManager</name> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="181"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="197"/> <source>SSL Certificate Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="182"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="198"/> <source><b>{0}</b><p>The page you are trying to access has errors in the SSL certificate.</p><ul><li>{1}</li></ul><p>Would you like to make an exception?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="192"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="208"/> <source>&Permanent accept</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="194"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="210"/> <source>&Temporary accept</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="196"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="212"/> <source>&Reject</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="229"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="245"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="232"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="248"/> <source><b>Enter username and password for '{0}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="275"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="291"/> <source>Authentication required</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="276"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="292"/> <source>Authentication is required to access:</source> <translation type="unfinished"></translation> </message> @@ -76090,7 +76090,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6953"/> + <location filename="../UI/UserInterface.py" line="6956"/> <source></table></source> <translation type="unfinished"></translation> </message> @@ -76352,92 +76352,92 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6728"/> + <location filename="../UI/UserInterface.py" line="6731"/> <source>&Cancel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6728"/> + <location filename="../UI/UserInterface.py" line="6731"/> <source>%v/%m</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6732"/> + <location filename="../UI/UserInterface.py" line="6735"/> <source>Version Check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6737"/> + <location filename="../UI/UserInterface.py" line="6740"/> <source>Trying host {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6801"/> + <location filename="../UI/UserInterface.py" line="6804"/> <source>Error getting versions information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6748"/> + <location filename="../UI/UserInterface.py" line="6751"/> <source>The versions information cannot not be downloaded because you are <b>offline</b>. Please go online and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6794"/> + <location filename="../UI/UserInterface.py" line="6797"/> <source>The versions information could not be downloaded. Please go online and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6801"/> + <location filename="../UI/UserInterface.py" line="6804"/> <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6895"/> + <location filename="../UI/UserInterface.py" line="6898"/> <source>Update available</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6895"/> + <location filename="../UI/UserInterface.py" line="6898"/> <source>The update to <b>{0}</b> of eric6 is available at <b>{1}</b>. Would you like to get it?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6908"/> + <location filename="../UI/UserInterface.py" line="6911"/> <source>Eric6 is up to date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6908"/> + <location filename="../UI/UserInterface.py" line="6911"/> <source>You are using the latest version of eric6</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6915"/> + <location filename="../UI/UserInterface.py" line="6918"/> <source>Error during updates check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6915"/> + <location filename="../UI/UserInterface.py" line="6918"/> <source>Could not perform updates check.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6939"/> + <location filename="../UI/UserInterface.py" line="6942"/> <source><h3>Available versions</h3><table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6990"/> + <location filename="../UI/UserInterface.py" line="6993"/> <source>First time usage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6990"/> + <location filename="../UI/UserInterface.py" line="6993"/> <source>eric6 has not been configured yet. The configuration dialog will be started.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7009"/> + <location filename="../UI/UserInterface.py" line="7012"/> <source>Select Workspace Directory</source> <translation type="unfinished"></translation> </message> @@ -76492,17 +76492,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6883"/> + <location filename="../UI/UserInterface.py" line="6886"/> <source>Update Check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6883"/> + <location filename="../UI/UserInterface.py" line="6886"/> <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6873"/> + <location filename="../UI/UserInterface.py" line="6876"/> <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source> <translation type="unfinished"></translation> </message> @@ -81104,18 +81104,18 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="63"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="65"/> <source>Virtualenv Target Directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="68"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="70"/> <source>Python Interpreter</source> <translation type="unfinished"></translation> </message> <message> <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="106"/> - <source>Select to denote a global environment (i.e. no virtual environment directory to be given)</source> + <source>Select,if this is a global environment (i.e. no virtual environment directory to be given)</source> <translation type="unfinished"></translation> </message> <message> @@ -81129,12 +81129,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="145"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="155"/> <source>PATH Prefix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="73"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="75"/> <source>Enter the executable search path to be prepended to the PATH environment variable. Use '{0}' as the separator.</source> <translation type="unfinished"></translation> </message> @@ -81151,7 +81151,7 @@ </message> <message> <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="120"/> - <source>Select, if this is an Conda environment</source> + <source>Select, if this is a Conda environment</source> <translation type="unfinished"></translation> </message> <message> @@ -81159,6 +81159,16 @@ <source>Conda Environment</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="130"/> + <source>Select, if this is a remotely accessed environment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="133"/> + <source>Remote Environment</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>VirtualenvConfigurationDialog</name> @@ -81579,52 +81589,52 @@ <context> <name>VirtualenvManager</name> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="187"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="194"/> <source>Add Virtual Environment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="187"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="194"/> <source>A virtual environment named <b>{0}</b> exists already. Shall it be replaced?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="244"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="255"/> <source>Change Virtual Environment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="293"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="307"/> <source>A virtual environment named <b>{0}</b> does not exist. Aborting!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="293"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="307"/> <source>Rename Virtual Environment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="371"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="387"/> <source>{0} - {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="322"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="337"/> <source>Delete Virtual Environments</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="322"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="337"/> <source>Do you really want to delete these virtual environments?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="376"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="392"/> <source>Remove Virtual Environments</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="376"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="392"/> <source>Do you really want to remove these virtual environments?</source> <translation type="unfinished"></translation> </message> @@ -86315,12 +86325,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="393"/> + <location filename="../eric6.py" line="394"/> <source>Starting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../eric6.py" line="398"/> + <location filename="../eric6.py" line="399"/> <source>Generating Main Window...</source> <translation type="unfinished"></translation> </message>