Mercurial Repositories > eric / changeset
changeset
Git: added capability to change the URL and/or user credentials for a remote repository.
Sun, 03 Jun 2018 14:03:19 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 03 Jun 2018 14:03:19 +0200
- changeset 6324
- b11c36cba2a1
- parent 6323
- 610b676336be
- child 6325
- ebdcf9a36f42
Git: added capability to change the URL and/or user credentials for a remote repository.
--- a/APIs/Python3/eric6.api Sun Jun 03 11:30:57 2018 +0200 +++ b/APIs/Python3/eric6.api Sun Jun 03 14:03:19 2018 +0200 @@ -5047,6 +5047,7 @@ eric6.Plugins.VcsPlugins.vcsGit.GitAddRemoteDialog.GitAddRemoteDialog.getData?4() eric6.Plugins.VcsPlugins.vcsGit.GitAddRemoteDialog.GitAddRemoteDialog.on_nameEdit_textChanged?4(txt) eric6.Plugins.VcsPlugins.vcsGit.GitAddRemoteDialog.GitAddRemoteDialog.on_urlEdit_textChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitAddRemoteDialog.GitAddRemoteDialog.on_userEdit_textChanged?4(txt) eric6.Plugins.VcsPlugins.vcsGit.GitAddRemoteDialog.GitAddRemoteDialog?1(parent=None) eric6.Plugins.VcsPlugins.vcsGit.GitApplyBundleDataDialog.GitApplyBundleDataDialog.getData?4() eric6.Plugins.VcsPlugins.vcsGit.GitApplyBundleDataDialog.GitApplyBundleDataDialog?1(bundleHeads, branches, parent=None) @@ -5109,6 +5110,9 @@ eric6.Plugins.VcsPlugins.vcsGit.GitBundleDialog.GitBundleDialog.on_tagButton_toggled?4(checked) eric6.Plugins.VcsPlugins.vcsGit.GitBundleDialog.GitBundleDialog.on_tagCombo_editTextChanged?4(txt) eric6.Plugins.VcsPlugins.vcsGit.GitBundleDialog.GitBundleDialog?1(tagsList, branchesList, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitChangeRemoteUrlDialog.GitChangeRemoteUrlDialog.getData?4() +eric6.Plugins.VcsPlugins.vcsGit.GitChangeRemoteUrlDialog.GitChangeRemoteUrlDialog.on_newUrlEdit_textChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitChangeRemoteUrlDialog.GitChangeRemoteUrlDialog?1(remoteName, remoteUrl, parent=None) eric6.Plugins.VcsPlugins.vcsGit.GitCherryPickDialog.GitCherryPickDialog.getData?4() eric6.Plugins.VcsPlugins.vcsGit.GitCherryPickDialog.GitCherryPickDialog.on_commitsEdit_textChanged?4() eric6.Plugins.VcsPlugins.vcsGit.GitCherryPickDialog.GitCherryPickDialog?1(commits=None, parent=None) @@ -5286,10 +5290,15 @@ eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.GitReflogBrowserDialog.show?4() eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.GitReflogBrowserDialog.start?4(projectdir) eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.GitReflogBrowserDialog?1(vcs, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitRemoteCredentialsDialog.GitRemoteCredentialsDialog.getData?4() +eric6.Plugins.VcsPlugins.vcsGit.GitRemoteCredentialsDialog.GitRemoteCredentialsDialog.on_userEdit_textChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitRemoteCredentialsDialog.GitRemoteCredentialsDialog?1(remoteName, remoteUrl, parent=None) eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.GitRemoteRepositoriesDialog.closeEvent?4(e) eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.GitRemoteRepositoriesDialog.keyPressEvent?4(evt) eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.GitRemoteRepositoriesDialog.on_addButton_clicked?4() eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.GitRemoteRepositoriesDialog.on_buttonBox_clicked?4(button) +eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.GitRemoteRepositoriesDialog.on_changeUrlButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.GitRemoteRepositoriesDialog.on_credentialsButton_clicked?4() eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.GitRemoteRepositoriesDialog.on_input_returnPressed?4() eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.GitRemoteRepositoriesDialog.on_passwordCheckBox_toggled?4(isOn) eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.GitRemoteRepositoriesDialog.on_pruneButton_clicked?4() @@ -5450,6 +5459,8 @@ eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitBundleListHeads?4(projectDir) eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitBundlePull?4(projectDir) eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitCancelMerge?4(name) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitChangeRemoteCredentials?4(projectDir, remoteName, remoteUrl="") +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitChangeRemoteUrl?4(projectDir, remoteName, remoteUrl="") eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitCherryPick?4(projectDir, commits=None) eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitCherryPickAbort?4(projectDir) eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitCherryPickContinue?4(projectDir) @@ -5469,6 +5480,7 @@ eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitGetBundleHeads?4(repodir, bundleFile) eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitGetCurrentBranch?4(repodir) eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitGetRemoteBranchesList?4(repodir, remote) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitGetRemoteUrl?4(repodir, remoteName) eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitGetRemoteUrlsList?4(repodir, forFetch=True) eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitGetRemotesList?4(repodir) eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitGetTagsList?4(repodir, withType=False)
--- a/APIs/Python3/eric6.bas Sun Jun 03 11:30:57 2018 +0200 +++ b/APIs/Python3/eric6.bas Sun Jun 03 14:03:19 2018 +0200 @@ -318,6 +318,7 @@ GitBranchDialog QDialog Ui_GitBranchDialog GitBranchPushDialog QDialog Ui_GitBranchPushDialog GitBundleDialog QDialog Ui_GitBundleDialog +GitChangeRemoteUrlDialog QDialog Ui_GitChangeRemoteUrlDialog GitCherryPickDialog QDialog Ui_GitCherryPickDialog GitCommandDialog QDialog Ui_GitCommandDialog GitCommitDialog QWidget Ui_GitCommitDialog @@ -341,6 +342,7 @@ GitPullDialog QDialog Ui_GitPullDialog GitPushDialog QDialog Ui_GitPushDialog GitReflogBrowserDialog QWidget Ui_GitReflogBrowserDialog +GitRemoteCredentialsDialog QDialog Ui_GitRemoteCredentialsDialog GitRemoteRepositoriesDialog QWidget Ui_GitRemoteRepositoriesDialog GitRevisionSelectionDialog QDialog Ui_GitRevisionSelectionDialog GitRevisionsSelectionDialog QDialog Ui_GitRevisionsSelectionDialog
--- a/Documentation/Help/source.qhp Sun Jun 03 11:30:57 2018 +0200 +++ b/Documentation/Help/source.qhp Sun Jun 03 14:03:19 2018 +0200 @@ -568,6 +568,7 @@ <section title="eric6.Plugins.VcsPlugins.vcsGit.GitBranchDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBranchDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsGit.GitBranchPushDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBranchPushDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsGit.GitBundleDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBundleDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitChangeRemoteUrlDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitChangeRemoteUrlDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsGit.GitCherryPickDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitCherryPickDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsGit.GitCommandDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitCommandDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsGit.GitCommitDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitCommitDialog.html" /> @@ -589,6 +590,7 @@ <section title="eric6.Plugins.VcsPlugins.vcsGit.GitPullDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPullDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsGit.GitPushDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPushDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteCredentialsDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteCredentialsDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionSelectionDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionSelectionDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.html" /> @@ -6473,6 +6475,8 @@ <keyword name="Git.gitBundleListHeads" id="Git.gitBundleListHeads" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitBundleListHeads" /> <keyword name="Git.gitBundlePull" id="Git.gitBundlePull" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitBundlePull" /> <keyword name="Git.gitCancelMerge" id="Git.gitCancelMerge" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitCancelMerge" /> + <keyword name="Git.gitChangeRemoteCredentials" id="Git.gitChangeRemoteCredentials" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitChangeRemoteCredentials" /> + <keyword name="Git.gitChangeRemoteUrl" id="Git.gitChangeRemoteUrl" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitChangeRemoteUrl" /> <keyword name="Git.gitCherryPick" id="Git.gitCherryPick" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitCherryPick" /> <keyword name="Git.gitCherryPickAbort" id="Git.gitCherryPickAbort" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitCherryPickAbort" /> <keyword name="Git.gitCherryPickContinue" id="Git.gitCherryPickContinue" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitCherryPickContinue" /> @@ -6492,6 +6496,7 @@ <keyword name="Git.gitGetBundleHeads" id="Git.gitGetBundleHeads" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitGetBundleHeads" /> <keyword name="Git.gitGetCurrentBranch" id="Git.gitGetCurrentBranch" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitGetCurrentBranch" /> <keyword name="Git.gitGetRemoteBranchesList" id="Git.gitGetRemoteBranchesList" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitGetRemoteBranchesList" /> + <keyword name="Git.gitGetRemoteUrl" id="Git.gitGetRemoteUrl" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitGetRemoteUrl" /> <keyword name="Git.gitGetRemoteUrlsList" id="Git.gitGetRemoteUrlsList" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitGetRemoteUrlsList" /> <keyword name="Git.gitGetRemotesList" id="Git.gitGetRemotesList" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitGetRemotesList" /> <keyword name="Git.gitGetTagsList" id="Git.gitGetTagsList" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitGetTagsList" /> @@ -6573,6 +6578,7 @@ <keyword name="GitAddRemoteDialog.getData" id="GitAddRemoteDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsGit.GitAddRemoteDialog.html#GitAddRemoteDialog.getData" /> <keyword name="GitAddRemoteDialog.on_nameEdit_textChanged" id="GitAddRemoteDialog.on_nameEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitAddRemoteDialog.html#GitAddRemoteDialog.on_nameEdit_textChanged" /> <keyword name="GitAddRemoteDialog.on_urlEdit_textChanged" id="GitAddRemoteDialog.on_urlEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitAddRemoteDialog.html#GitAddRemoteDialog.on_urlEdit_textChanged" /> + <keyword name="GitAddRemoteDialog.on_userEdit_textChanged" id="GitAddRemoteDialog.on_userEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitAddRemoteDialog.html#GitAddRemoteDialog.on_userEdit_textChanged" /> <keyword name="GitApplyBundleDataDialog" id="GitApplyBundleDataDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitApplyBundleDataDialog.html#GitApplyBundleDataDialog" /> <keyword name="GitApplyBundleDataDialog (Constructor)" id="GitApplyBundleDataDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitApplyBundleDataDialog.html#GitApplyBundleDataDialog.__init__" /> <keyword name="GitApplyBundleDataDialog (Module)" id="GitApplyBundleDataDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitApplyBundleDataDialog.html" /> @@ -6661,6 +6667,12 @@ <keyword name="GitBundleDialog.on_revisionsEdit_textChanged" id="GitBundleDialog.on_revisionsEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBundleDialog.html#GitBundleDialog.on_revisionsEdit_textChanged" /> <keyword name="GitBundleDialog.on_tagButton_toggled" id="GitBundleDialog.on_tagButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBundleDialog.html#GitBundleDialog.on_tagButton_toggled" /> <keyword name="GitBundleDialog.on_tagCombo_editTextChanged" id="GitBundleDialog.on_tagCombo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBundleDialog.html#GitBundleDialog.on_tagCombo_editTextChanged" /> + <keyword name="GitChangeRemoteUrlDialog" id="GitChangeRemoteUrlDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitChangeRemoteUrlDialog.html#GitChangeRemoteUrlDialog" /> + <keyword name="GitChangeRemoteUrlDialog (Constructor)" id="GitChangeRemoteUrlDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitChangeRemoteUrlDialog.html#GitChangeRemoteUrlDialog.__init__" /> + <keyword name="GitChangeRemoteUrlDialog (Module)" id="GitChangeRemoteUrlDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitChangeRemoteUrlDialog.html" /> + <keyword name="GitChangeRemoteUrlDialog.__updateOK" id="GitChangeRemoteUrlDialog.__updateOK" ref="eric6.Plugins.VcsPlugins.vcsGit.GitChangeRemoteUrlDialog.html#GitChangeRemoteUrlDialog.__updateOK" /> + <keyword name="GitChangeRemoteUrlDialog.getData" id="GitChangeRemoteUrlDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsGit.GitChangeRemoteUrlDialog.html#GitChangeRemoteUrlDialog.getData" /> + <keyword name="GitChangeRemoteUrlDialog.on_newUrlEdit_textChanged" id="GitChangeRemoteUrlDialog.on_newUrlEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitChangeRemoteUrlDialog.html#GitChangeRemoteUrlDialog.on_newUrlEdit_textChanged" /> <keyword name="GitCherryPickDialog" id="GitCherryPickDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitCherryPickDialog.html#GitCherryPickDialog" /> <keyword name="GitCherryPickDialog (Constructor)" id="GitCherryPickDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitCherryPickDialog.html#GitCherryPickDialog.__init__" /> <keyword name="GitCherryPickDialog (Module)" id="GitCherryPickDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitCherryPickDialog.html" /> @@ -6954,6 +6966,7 @@ <keyword name="GitProjectHelper.__gitBundleListHeads" id="GitProjectHelper.__gitBundleListHeads" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitBundleListHeads" /> <keyword name="GitProjectHelper.__gitBundlePull" id="GitProjectHelper.__gitBundlePull" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitBundlePull" /> <keyword name="GitProjectHelper.__gitCancelMerge" id="GitProjectHelper.__gitCancelMerge" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitCancelMerge" /> + <keyword name="GitProjectHelper.__gitChangeRemoteUrl" id="GitProjectHelper.__gitChangeRemoteUrl" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitChangeRemoteUrl" /> <keyword name="GitProjectHelper.__gitCheckPatches" id="GitProjectHelper.__gitCheckPatches" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitCheckPatches" /> <keyword name="GitProjectHelper.__gitCherryPick" id="GitProjectHelper.__gitCherryPick" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitCherryPick" /> <keyword name="GitProjectHelper.__gitCherryPickAbort" id="GitProjectHelper.__gitCherryPickAbort" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitCherryPickAbort" /> @@ -6976,6 +6989,7 @@ <keyword name="GitProjectHelper.__gitPull" id="GitProjectHelper.__gitPull" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitPull" /> <keyword name="GitProjectHelper.__gitPush" id="GitProjectHelper.__gitPush" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitPush" /> <keyword name="GitProjectHelper.__gitReflogBrowser" id="GitProjectHelper.__gitReflogBrowser" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitReflogBrowser" /> + <keyword name="GitProjectHelper.__gitRemoteCredentials" id="GitProjectHelper.__gitRemoteCredentials" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitRemoteCredentials" /> <keyword name="GitProjectHelper.__gitRemoveRemote" id="GitProjectHelper.__gitRemoveRemote" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitRemoveRemote" /> <keyword name="GitProjectHelper.__gitRenameRemote" id="GitProjectHelper.__gitRenameRemote" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitRenameRemote" /> <keyword name="GitProjectHelper.__gitRevert" id="GitProjectHelper.__gitRevert" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitRevert" /> @@ -7057,6 +7071,11 @@ <keyword name="GitReflogBrowserDialog.on_sendButton_clicked" id="GitReflogBrowserDialog.on_sendButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.html#GitReflogBrowserDialog.on_sendButton_clicked" /> <keyword name="GitReflogBrowserDialog.show" id="GitReflogBrowserDialog.show" ref="eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.html#GitReflogBrowserDialog.show" /> <keyword name="GitReflogBrowserDialog.start" id="GitReflogBrowserDialog.start" ref="eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.html#GitReflogBrowserDialog.start" /> + <keyword name="GitRemoteCredentialsDialog" id="GitRemoteCredentialsDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteCredentialsDialog.html#GitRemoteCredentialsDialog" /> + <keyword name="GitRemoteCredentialsDialog (Constructor)" id="GitRemoteCredentialsDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteCredentialsDialog.html#GitRemoteCredentialsDialog.__init__" /> + <keyword name="GitRemoteCredentialsDialog (Module)" id="GitRemoteCredentialsDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteCredentialsDialog.html" /> + <keyword name="GitRemoteCredentialsDialog.getData" id="GitRemoteCredentialsDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteCredentialsDialog.html#GitRemoteCredentialsDialog.getData" /> + <keyword name="GitRemoteCredentialsDialog.on_userEdit_textChanged" id="GitRemoteCredentialsDialog.on_userEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteCredentialsDialog.html#GitRemoteCredentialsDialog.on_userEdit_textChanged" /> <keyword name="GitRemoteRepositoriesDialog" id="GitRemoteRepositoriesDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.html#GitRemoteRepositoriesDialog" /> <keyword name="GitRemoteRepositoriesDialog (Constructor)" id="GitRemoteRepositoriesDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.html#GitRemoteRepositoriesDialog.__init__" /> <keyword name="GitRemoteRepositoriesDialog (Module)" id="GitRemoteRepositoriesDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.html" /> @@ -7072,6 +7091,8 @@ <keyword name="GitRemoteRepositoriesDialog.keyPressEvent" id="GitRemoteRepositoriesDialog.keyPressEvent" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.html#GitRemoteRepositoriesDialog.keyPressEvent" /> <keyword name="GitRemoteRepositoriesDialog.on_addButton_clicked" id="GitRemoteRepositoriesDialog.on_addButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.html#GitRemoteRepositoriesDialog.on_addButton_clicked" /> <keyword name="GitRemoteRepositoriesDialog.on_buttonBox_clicked" id="GitRemoteRepositoriesDialog.on_buttonBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.html#GitRemoteRepositoriesDialog.on_buttonBox_clicked" /> + <keyword name="GitRemoteRepositoriesDialog.on_changeUrlButton_clicked" id="GitRemoteRepositoriesDialog.on_changeUrlButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.html#GitRemoteRepositoriesDialog.on_changeUrlButton_clicked" /> + <keyword name="GitRemoteRepositoriesDialog.on_credentialsButton_clicked" id="GitRemoteRepositoriesDialog.on_credentialsButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.html#GitRemoteRepositoriesDialog.on_credentialsButton_clicked" /> <keyword name="GitRemoteRepositoriesDialog.on_input_returnPressed" id="GitRemoteRepositoriesDialog.on_input_returnPressed" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.html#GitRemoteRepositoriesDialog.on_input_returnPressed" /> <keyword name="GitRemoteRepositoriesDialog.on_passwordCheckBox_toggled" id="GitRemoteRepositoriesDialog.on_passwordCheckBox_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.html#GitRemoteRepositoriesDialog.on_passwordCheckBox_toggled" /> <keyword name="GitRemoteRepositoriesDialog.on_pruneButton_clicked" id="GitRemoteRepositoriesDialog.on_pruneButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.html#GitRemoteRepositoriesDialog.on_pruneButton_clicked" /> @@ -19660,6 +19681,7 @@ <file>eric6.Plugins.VcsPlugins.vcsGit.GitBranchDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsGit.GitBranchPushDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsGit.GitBundleDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitChangeRemoteUrlDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsGit.GitCherryPickDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsGit.GitCommandDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsGit.GitCommitDialog.html</file> @@ -19681,6 +19703,7 @@ <file>eric6.Plugins.VcsPlugins.vcsGit.GitPullDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsGit.GitPushDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitRemoteCredentialsDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsGit.GitRevisionSelectionDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.html</file>
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsGit.GitAddRemoteDialog.html Sun Jun 03 11:30:57 2018 +0200 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsGit.GitAddRemoteDialog.html Sun Jun 03 14:03:19 2018 +0200 @@ -71,6 +71,9 @@ </tr><tr> <td><a href="#GitAddRemoteDialog.on_urlEdit_textChanged">on_urlEdit_textChanged</a></td> <td>Private slot handling changes of the entered URL.</td> +</tr><tr> +<td><a href="#GitAddRemoteDialog.on_userEdit_textChanged">on_userEdit_textChanged</a></td> +<td>Private slot handling changes of the entered user name.</td> </tr> </table> <h3>Static Methods</h3> @@ -83,9 +86,9 @@ <p> Constructor </p><dl> -<dt><i>parent</i></dt> +<dt><i>parent</i> (QWidget)</dt> <dd> -reference to the parent widget (QWidget) +reference to the parent widget </dd> </dl><a NAME="GitAddRemoteDialog.__updateOK" ID="GitAddRemoteDialog.__updateOK"></a> <h4>GitAddRemoteDialog.__updateOK</h4> @@ -100,8 +103,12 @@ </p><dl> <dt>Returns:</dt> <dd> -tuple with the name (string) and URL (string) of - the remote repository +tuple with name and URL of the remote repository +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +tuple of (str, str) </dd> </dl><a NAME="GitAddRemoteDialog.on_nameEdit_textChanged" ID="GitAddRemoteDialog.on_nameEdit_textChanged"></a> <h4>GitAddRemoteDialog.on_nameEdit_textChanged</h4> @@ -109,9 +116,9 @@ <p> Private slot handling changes of the entered name. </p><dl> -<dt><i>txt</i></dt> +<dt><i>txt</i> (str)</dt> <dd> -current text (string) +current text </dd> </dl><a NAME="GitAddRemoteDialog.on_urlEdit_textChanged" ID="GitAddRemoteDialog.on_urlEdit_textChanged"></a> <h4>GitAddRemoteDialog.on_urlEdit_textChanged</h4> @@ -119,9 +126,19 @@ <p> Private slot handling changes of the entered URL. </p><dl> -<dt><i>txt</i></dt> +<dt><i>txt</i> (str)</dt> <dd> -current text (string) +current text +</dd> +</dl><a NAME="GitAddRemoteDialog.on_userEdit_textChanged" ID="GitAddRemoteDialog.on_userEdit_textChanged"></a> +<h4>GitAddRemoteDialog.on_userEdit_textChanged</h4> +<b>on_userEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot handling changes of the entered user name. +</p><dl> +<dt><i>txt</i> (str)</dt> +<dd> +current text </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsGit.GitChangeRemoteUrlDialog.html Sun Jun 03 14:03:19 2018 +0200 @@ -0,0 +1,126 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitChangeRemoteUrlDialog</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric6.Plugins.VcsPlugins.vcsGit.GitChangeRemoteUrlDialog</h1> +<p> +Module implementing a dialog to change the URL of a remote git repository. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitChangeRemoteUrlDialog">GitChangeRemoteUrlDialog</a></td> +<td>Class implementing a dialog to change the URL of a remote git repository.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitChangeRemoteUrlDialog" ID="GitChangeRemoteUrlDialog"></a> +<h2>GitChangeRemoteUrlDialog</h2> +<p> + Class implementing a dialog to change the URL of a remote git repository. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitChangeRemoteUrlDialog +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#GitChangeRemoteUrlDialog.__init__">GitChangeRemoteUrlDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitChangeRemoteUrlDialog.__updateOK">__updateOK</a></td> +<td>Private method to update the status of the OK button.</td> +</tr><tr> +<td><a href="#GitChangeRemoteUrlDialog.getData">getData</a></td> +<td>Public method to get the entered data.</td> +</tr><tr> +<td><a href="#GitChangeRemoteUrlDialog.on_newUrlEdit_textChanged">on_newUrlEdit_textChanged</a></td> +<td>Private slot handling changes of the entered URL.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitChangeRemoteUrlDialog.__init__" ID="GitChangeRemoteUrlDialog.__init__"></a> +<h4>GitChangeRemoteUrlDialog (Constructor)</h4> +<b>GitChangeRemoteUrlDialog</b>(<i>remoteName, remoteUrl, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>remoteName</i> (str)</dt> +<dd> +name of the remote repository +</dd><dt><i>remoteUrl</i> (str)</dt> +<dd> +URL of the remote repository +</dd><dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent widget +</dd> +</dl><a NAME="GitChangeRemoteUrlDialog.__updateOK" ID="GitChangeRemoteUrlDialog.__updateOK"></a> +<h4>GitChangeRemoteUrlDialog.__updateOK</h4> +<b>__updateOK</b>(<i></i>) +<p> + Private method to update the status of the OK button. +</p><a NAME="GitChangeRemoteUrlDialog.getData" ID="GitChangeRemoteUrlDialog.getData"></a> +<h4>GitChangeRemoteUrlDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to get the entered data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple with name and new URL of the remote repository +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +tuple of (str, str) +</dd> +</dl><a NAME="GitChangeRemoteUrlDialog.on_newUrlEdit_textChanged" ID="GitChangeRemoteUrlDialog.on_newUrlEdit_textChanged"></a> +<h4>GitChangeRemoteUrlDialog.on_newUrlEdit_textChanged</h4> +<b>on_newUrlEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot handling changes of the entered URL. +</p><dl> +<dt><i>txt</i> (str)</dt> +<dd> +current text +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsGit.GitRemoteCredentialsDialog.html Sun Jun 03 14:03:19 2018 +0200 @@ -0,0 +1,118 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitRemoteCredentialsDialog</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric6.Plugins.VcsPlugins.vcsGit.GitRemoteCredentialsDialog</h1> +<p> +Module implementing a dialog to enter the data of a remote repository. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitRemoteCredentialsDialog">GitRemoteCredentialsDialog</a></td> +<td>Class implementing a dialog to enter the data of a remote repository.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitRemoteCredentialsDialog" ID="GitRemoteCredentialsDialog"></a> +<h2>GitRemoteCredentialsDialog</h2> +<p> + Class implementing a dialog to enter the data of a remote repository. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitRemoteCredentialsDialog +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#GitRemoteCredentialsDialog.__init__">GitRemoteCredentialsDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitRemoteCredentialsDialog.getData">getData</a></td> +<td>Public method to get the entered data.</td> +</tr><tr> +<td><a href="#GitRemoteCredentialsDialog.on_userEdit_textChanged">on_userEdit_textChanged</a></td> +<td>Private slot handling changes of the entered user name.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitRemoteCredentialsDialog.__init__" ID="GitRemoteCredentialsDialog.__init__"></a> +<h4>GitRemoteCredentialsDialog (Constructor)</h4> +<b>GitRemoteCredentialsDialog</b>(<i>remoteName, remoteUrl, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>remoteName</i> (str)</dt> +<dd> +name of the remote repository +</dd><dt><i>remoteUrl</i> (str)</dt> +<dd> +URL of the remote repository +</dd><dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent widget +</dd> +</dl><a NAME="GitRemoteCredentialsDialog.getData" ID="GitRemoteCredentialsDialog.getData"></a> +<h4>GitRemoteCredentialsDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to get the entered data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple with name and URL of the remote repository +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +tuple of (str, str) +</dd> +</dl><a NAME="GitRemoteCredentialsDialog.on_userEdit_textChanged" ID="GitRemoteCredentialsDialog.on_userEdit_textChanged"></a> +<h4>GitRemoteCredentialsDialog.on_userEdit_textChanged</h4> +<b>on_userEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot handling changes of the entered user name. +</p><dl> +<dt><i>txt</i> (str)</dt> +<dd> +current text +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.html Sun Jun 03 11:30:57 2018 +0200 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.html Sun Jun 03 14:03:19 2018 +0200 @@ -96,6 +96,12 @@ <td><a href="#GitRemoteRepositoriesDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td> <td>Private slot called by a button of the button box clicked.</td> </tr><tr> +<td><a href="#GitRemoteRepositoriesDialog.on_changeUrlButton_clicked">on_changeUrlButton_clicked</a></td> +<td>Private slot to change the URL of a remote repository.</td> +</tr><tr> +<td><a href="#GitRemoteRepositoriesDialog.on_credentialsButton_clicked">on_credentialsButton_clicked</a></td> +<td>Private slot to change the credentials of a remote repository.</td> +</tr><tr> <td><a href="#GitRemoteRepositoriesDialog.on_input_returnPressed">on_input_returnPressed</a></td> <td>Private slot to handle the press of the return key in the input field.</td> </tr><tr> @@ -245,7 +251,17 @@ <dd> button that was clicked (QAbstractButton) </dd> -</dl><a NAME="GitRemoteRepositoriesDialog.on_input_returnPressed" ID="GitRemoteRepositoriesDialog.on_input_returnPressed"></a> +</dl><a NAME="GitRemoteRepositoriesDialog.on_changeUrlButton_clicked" ID="GitRemoteRepositoriesDialog.on_changeUrlButton_clicked"></a> +<h4>GitRemoteRepositoriesDialog.on_changeUrlButton_clicked</h4> +<b>on_changeUrlButton_clicked</b>(<i></i>) +<p> + Private slot to change the URL of a remote repository. +</p><a NAME="GitRemoteRepositoriesDialog.on_credentialsButton_clicked" ID="GitRemoteRepositoriesDialog.on_credentialsButton_clicked"></a> +<h4>GitRemoteRepositoriesDialog.on_credentialsButton_clicked</h4> +<b>on_credentialsButton_clicked</b>(<i></i>) +<p> + Private slot to change the credentials of a remote repository. +</p><a NAME="GitRemoteRepositoriesDialog.on_input_returnPressed" ID="GitRemoteRepositoriesDialog.on_input_returnPressed"></a> <h4>GitRemoteRepositoriesDialog.on_input_returnPressed</h4> <b>on_input_returnPressed</b>(<i></i>) <p>
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html Sun Jun 03 11:30:57 2018 +0200 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html Sun Jun 03 14:03:19 2018 +0200 @@ -117,6 +117,9 @@ <td><a href="#GitProjectHelper.__gitCancelMerge">__gitCancelMerge</a></td> <td>Private slot used to cancel an uncommitted or failed merge.</td> </tr><tr> +<td><a href="#GitProjectHelper.__gitChangeRemoteUrl">__gitChangeRemoteUrl</a></td> +<td>Private slot to change the URL of a remote repository.</td> +</tr><tr> <td><a href="#GitProjectHelper.__gitCheckPatches">__gitCheckPatches</a></td> <td>Private slot to check a list of patch files, if they would apply cleanly.</td> </tr><tr> @@ -183,6 +186,9 @@ <td><a href="#GitProjectHelper.__gitReflogBrowser">__gitReflogBrowser</a></td> <td>Private slot to show the reflog of the current project.</td> </tr><tr> +<td><a href="#GitProjectHelper.__gitRemoteCredentials">__gitRemoteCredentials</a></td> +<td>Private slot to change or set the user credentials for a remote repository.</td> +</tr><tr> <td><a href="#GitProjectHelper.__gitRemoveRemote">__gitRemoveRemote</a></td> <td>Private slot to remove a remote repository.</td> </tr><tr> @@ -423,6 +429,11 @@ <b>__gitCancelMerge</b>(<i></i>) <p> Private slot used to cancel an uncommitted or failed merge. +</p><a NAME="GitProjectHelper.__gitChangeRemoteUrl" ID="GitProjectHelper.__gitChangeRemoteUrl"></a> +<h4>GitProjectHelper.__gitChangeRemoteUrl</h4> +<b>__gitChangeRemoteUrl</b>(<i></i>) +<p> + Private slot to change the URL of a remote repository. </p><a NAME="GitProjectHelper.__gitCheckPatches" ID="GitProjectHelper.__gitCheckPatches"></a> <h4>GitProjectHelper.__gitCheckPatches</h4> <b>__gitCheckPatches</b>(<i></i>) @@ -537,6 +548,12 @@ <b>__gitReflogBrowser</b>(<i></i>) <p> Private slot to show the reflog of the current project. +</p><a NAME="GitProjectHelper.__gitRemoteCredentials" ID="GitProjectHelper.__gitRemoteCredentials"></a> +<h4>GitProjectHelper.__gitRemoteCredentials</h4> +<b>__gitRemoteCredentials</b>(<i></i>) +<p> + Private slot to change or set the user credentials for a remote + repository. </p><a NAME="GitProjectHelper.__gitRemoveRemote" ID="GitProjectHelper.__gitRemoveRemote"></a> <h4>GitProjectHelper.__gitRemoveRemote</h4> <b>__gitRemoveRemote</b>(<i></i>)
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsGit.git.html Sun Jun 03 11:30:57 2018 +0200 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsGit.git.html Sun Jun 03 14:03:19 2018 +0200 @@ -138,6 +138,12 @@ <td><a href="#Git.gitCancelMerge">gitCancelMerge</a></td> <td>Public method to cancel an uncommitted or failed merge.</td> </tr><tr> +<td><a href="#Git.gitChangeRemoteCredentials">gitChangeRemoteCredentials</a></td> +<td>Public method to change the user credentials of a remote repository.</td> +</tr><tr> +<td><a href="#Git.gitChangeRemoteUrl">gitChangeRemoteUrl</a></td> +<td>Public method to change the URL of a remote repository.</td> +</tr><tr> <td><a href="#Git.gitCherryPick">gitCherryPick</a></td> <td>Public method to cherry pick commits and apply them to the current branch.</td> </tr><tr> @@ -195,6 +201,9 @@ <td><a href="#Git.gitGetRemoteBranchesList">gitGetRemoteBranchesList</a></td> <td>Public method to get the list of a remote repository branches.</td> </tr><tr> +<td><a href="#Git.gitGetRemoteUrl">gitGetRemoteUrl</a></td> +<td>Public method to get the URL of a remote repository.</td> +</tr><tr> <td><a href="#Git.gitGetRemoteUrlsList">gitGetRemoteUrlsList</a></td> <td>Public method to get the list of remote repos and their URLs.</td> </tr><tr> @@ -793,6 +802,38 @@ flag indicating, that the cancellation contained an add or delete (boolean) </dd> +</dl><a NAME="Git.gitChangeRemoteCredentials" ID="Git.gitChangeRemoteCredentials"></a> +<h4>Git.gitChangeRemoteCredentials</h4> +<b>gitChangeRemoteCredentials</b>(<i>projectDir, remoteName, remoteUrl=""</i>) +<p> + Public method to change the user credentials of a remote repository. +</p><dl> +<dt><i>projectDir</i> (str)</dt> +<dd> +name of the project directory +</dd><dt><i>remoteName</i> (str)</dt> +<dd> +name of the remote repository +</dd><dt><i>remoteUrl</i> (str)</dt> +<dd> +URL of the remote repository +</dd> +</dl><a NAME="Git.gitChangeRemoteUrl" ID="Git.gitChangeRemoteUrl"></a> +<h4>Git.gitChangeRemoteUrl</h4> +<b>gitChangeRemoteUrl</b>(<i>projectDir, remoteName, remoteUrl=""</i>) +<p> + Public method to change the URL of a remote repository. +</p><dl> +<dt><i>projectDir</i> (str)</dt> +<dd> +name of the project directory +</dd><dt><i>remoteName</i> (str)</dt> +<dd> +name of the remote repository +</dd><dt><i>remoteUrl</i> (str)</dt> +<dd> +URL of the remote repository +</dd> </dl><a NAME="Git.gitCherryPick" ID="Git.gitCherryPick"></a> <h4>Git.gitCherryPick</h4> <b>gitCherryPick</b>(<i>projectDir, commits=None</i>) @@ -1072,6 +1113,29 @@ <dd> list of remote repository branches (list of string) </dd> +</dl><a NAME="Git.gitGetRemoteUrl" ID="Git.gitGetRemoteUrl"></a> +<h4>Git.gitGetRemoteUrl</h4> +<b>gitGetRemoteUrl</b>(<i>repodir, remoteName</i>) +<p> + Public method to get the URL of a remote repository. +</p><dl> +<dt><i>repodir</i> (str)</dt> +<dd> +directory name of the repository +</dd><dt><i>remoteName</i> (str)</dt> +<dd> +name of the remote repository +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +URL of the remote repository +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> </dl><a NAME="Git.gitGetRemoteUrlsList" ID="Git.gitGetRemoteUrlsList"></a> <h4>Git.gitGetRemoteUrlsList</h4> <b>gitGetRemoteUrlsList</b>(<i>repodir, forFetch=True</i>)
--- a/Documentation/Source/eric6.Utilities.BackgroundService.html Sun Jun 03 11:30:57 2018 +0200 +++ b/Documentation/Source/eric6.Utilities.BackgroundService.html Sun Jun 03 14:03:19 2018 +0200 @@ -109,7 +109,7 @@ <td>Public method to remove the service from the service list.</td> </tr><tr> <td><a href="#BackgroundService.shutdown">shutdown</a></td> -<td>Public method to cleanup the connections and processes when eric is shuting down.</td> +<td>Public method to cleanup the connections and processes when eric is shutting down.</td> </tr> </table> <h3>Static Methods</h3> @@ -290,7 +290,7 @@ <b>shutdown</b>(<i></i>) <p> Public method to cleanup the connections and processes when eric is - shuting down. + shutting down. </p> <div align="right"><a href="#top">Up</a></div> <hr />
--- a/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsGit.html Sun Jun 03 11:30:57 2018 +0200 +++ b/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsGit.html Sun Jun 03 14:03:19 2018 +0200 @@ -68,6 +68,9 @@ <td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitBundleDialog.html">GitBundleDialog</a></td> <td>Module implementing a dialog to enter the data for a bundle operation.</td> </tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitChangeRemoteUrlDialog.html">GitChangeRemoteUrlDialog</a></td> +<td>Module implementing a dialog to change the URL of a remote git repository.</td> +</tr><tr> <td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitCherryPickDialog.html">GitCherryPickDialog</a></td> <td>Module implementing a dialog to enter cherry-pick data.</td> </tr><tr> @@ -131,6 +134,9 @@ <td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.html">GitReflogBrowserDialog</a></td> <td>Module implementing a dialog to browse the reflog history.</td> </tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteCredentialsDialog.html">GitRemoteCredentialsDialog</a></td> +<td>Module implementing a dialog to enter the data of a remote repository.</td> +</tr><tr> <td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.html">GitRemoteRepositoriesDialog</a></td> <td>Module implementing a dialog to show available remote repositories.</td> </tr><tr>
--- a/Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.py Sun Jun 03 11:30:57 2018 +0200 +++ b/Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.py Sun Jun 03 14:03:19 2018 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt5.QtCore import pyqtSlot +from PyQt5.QtCore import pyqtSlot, QUrl from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_GitAddRemoteDialog import Ui_GitAddRemoteDialog @@ -23,12 +23,16 @@ """ Constructor - @param parent reference to the parent widget (QWidget) + @param parent reference to the parent widget + @type QWidget """ super(GitAddRemoteDialog, self).__init__(parent) self.setupUi(self) self.__updateOK() + + msh = self.minimumSizeHint() + self.resize(max(self.width(), msh.width()), msh.height()) def __updateOK(self): """ @@ -43,7 +47,8 @@ """ Private slot handling changes of the entered name. - @param txt current text (string) + @param txt current text + @type str """ self.__updateOK() @@ -52,15 +57,34 @@ """ Private slot handling changes of the entered URL. - @param txt current text (string) + @param txt current text + @type str """ self.__updateOK() + @pyqtSlot(str) + def on_userEdit_textChanged(self, txt): + """ + Private slot handling changes of the entered user name. + + @param txt current text + @type str + """ + self.passwordEdit.setEnabled(bool(txt)) + def getData(self): """ Public method to get the entered data. - @return tuple with the name (string) and URL (string) of - the remote repository + @return tuple with name and URL of the remote repository + @rtype tuple of (str, str) """ - return self.nameEdit.text(), self.urlEdit.text() + url = QUrl.fromUserInput(self.urlEdit.text()) + userName = self.userEdit.text() + if userName: + url.setUserName(userName) + password = self.passwordEdit.text() + if password: + url.setPassword(password) + + return self.nameEdit.text(), url.toString()
--- a/Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui Sun Jun 03 11:30:57 2018 +0200 +++ b/Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui Sun Jun 03 14:03:19 2018 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>700</width> - <height>107</height> + <height>185</height> </rect> </property> <property name="windowTitle"> @@ -46,6 +46,46 @@ </widget> </item> <item row="2" column="0" colspan="2"> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Credentials</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Username:</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="userEdit"> + <property name="toolTip"> + <string>Enter the user name for the remote repository</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>Password:</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="passwordEdit"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter the password for the remote repository</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="3" column="0" colspan="2"> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.py Sun Jun 03 14:03:19 2018 +0200 @@ -0,0 +1,78 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2018 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to change the URL of a remote git repository. +""" + +from __future__ import unicode_literals + +from PyQt5.QtCore import pyqtSlot, Qt, QUrl +from PyQt5.QtWidgets import QDialog, QDialogButtonBox + +from .Ui_GitChangeRemoteUrlDialog import Ui_GitChangeRemoteUrlDialog + + +class GitChangeRemoteUrlDialog(QDialog, Ui_GitChangeRemoteUrlDialog): + """ + Class implementing a dialog to change the URL of a remote git repository. + """ + def __init__(self, remoteName, remoteUrl, parent=None): + """ + Constructor + + @param remoteName name of the remote repository + @type str + @param remoteUrl URL of the remote repository + @type str + @param parent reference to the parent widget + @type QWidget + """ + super(GitChangeRemoteUrlDialog, self).__init__(parent) + self.setupUi(self) + + url = QUrl(remoteUrl) + self.__userInfo = url.userInfo() + + self.nameEdit.setText(remoteName) + self.urlEdit.setText(url.toString(QUrl.RemoveUserInfo)) + + self.__updateOK() + + self.newUrlEdit.setFocus(Qt.OtherFocusReason) + + msh = self.minimumSizeHint() + self.resize(max(self.width(), msh.width()), msh.height()) + + def __updateOK(self): + """ + Private method to update the status of the OK button. + """ + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled( + bool(self.newUrlEdit.text()) + ) + + @pyqtSlot(str) + def on_newUrlEdit_textChanged(self, txt): + """ + Private slot handling changes of the entered URL. + + @param txt current text + @type str + """ + self.__updateOK() + + def getData(self): + """ + Public method to get the entered data. + + @return tuple with name and new URL of the remote repository + @rtype tuple of (str, str) + """ + url = QUrl.fromUserInput(self.newUrlEdit.text()) + if self.__userInfo: + url.setUserInfo(self.__userInfo) + + return self.nameEdit.text(), url.toString()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui Sun Jun 03 14:03:19 2018 +0200 @@ -0,0 +1,115 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitChangeRemoteUrlDialog</class> + <widget class="QDialog" name="GitChangeRemoteUrlDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>700</width> + <height>140</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git Change Remote URL</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Name:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLineEdit" name="nameEdit"> + <property name="toolTip"> + <string/> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>URL:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLineEdit" name="urlEdit"> + <property name="toolTip"> + <string/> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>New URL:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QLineEdit" name="newUrlEdit"> + <property name="toolTip"> + <string>Enter the new remote URL</string> + </property> + </widget> + </item> + <item row="3" column="0" colspan="2"> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>GitChangeRemoteUrlDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>248</x> + <y>254</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>GitChangeRemoteUrlDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>316</x> + <y>260</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.py Sun Jun 03 14:03:19 2018 +0200 @@ -0,0 +1,73 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2018 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter the data of a remote repository. +""" + +from __future__ import unicode_literals + +from PyQt5.QtCore import pyqtSlot, Qt, QUrl +from PyQt5.QtWidgets import QDialog + +from .Ui_GitRemoteCredentialsDialog import Ui_GitRemoteCredentialsDialog + + +class GitRemoteCredentialsDialog(QDialog, Ui_GitRemoteCredentialsDialog): + """ + Class implementing a dialog to enter the data of a remote repository. + """ + def __init__(self, remoteName, remoteUrl, parent=None): + """ + Constructor + + @param remoteName name of the remote repository + @type str + @param remoteUrl URL of the remote repository + @type str + @param parent reference to the parent widget + @type QWidget + """ + super(GitRemoteCredentialsDialog, self).__init__(parent) + self.setupUi(self) + + url = QUrl(remoteUrl) + + self.nameEdit.setText(remoteName) + self.urlEdit.setText(url.toString(QUrl.RemoveUserInfo)) + self.userEdit.setText(url.userName()) + self.passwordEdit.setText(url.password()) + + self.userEdit.setFocus(Qt.OtherFocusReason) + + msh = self.minimumSizeHint() + self.resize(max(self.width(), msh.width()), msh.height()) + + @pyqtSlot(str) + def on_userEdit_textChanged(self, txt): + """ + Private slot handling changes of the entered user name. + + @param txt current text + @type str + """ + self.passwordEdit.setEnabled(bool(txt)) + + def getData(self): + """ + Public method to get the entered data. + + @return tuple with name and URL of the remote repository + @rtype tuple of (str, str) + """ + url = QUrl.fromUserInput(self.urlEdit.text()) + userName = self.userEdit.text() + if userName: + url.setUserName(userName) + password = self.passwordEdit.text() + if password: + url.setPassword(password) + + return self.nameEdit.text(), url.toString()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui Sun Jun 03 14:03:19 2018 +0200 @@ -0,0 +1,141 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitRemoteCredentialsDialog</class> + <widget class="QDialog" name="GitRemoteCredentialsDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>700</width> + <height>185</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git Remote Credentials</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Name:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLineEdit" name="nameEdit"> + <property name="toolTip"> + <string/> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>URL:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLineEdit" name="urlEdit"> + <property name="toolTip"> + <string/> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="2" column="0" colspan="2"> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Credentials</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Username:</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="userEdit"> + <property name="toolTip"> + <string>Enter the user name for the remote repository</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>Password:</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="passwordEdit"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter the password for the remote repository</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="3" column="0" colspan="2"> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>GitRemoteCredentialsDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>248</x> + <y>254</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>GitRemoteCredentialsDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>316</x> + <y>260</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- a/Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py Sun Jun 03 11:30:57 2018 +0200 +++ b/Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py Sun Jun 03 14:03:19 2018 +0200 @@ -28,7 +28,6 @@ import Preferences -# TODO: add button to set user credentials (git remote set-url) class GitRemoteRepositoriesDialog(QWidget, Ui_GitRemoteRepositoriesDialog): """ Class implementing a dialog to show available remote repositories. @@ -307,9 +306,11 @@ enable = len(self.repolist.selectedItems()) == 1 self.removeButton.setEnabled(enable) - self.renameButton.setEnabled(enable) self.pruneButton.setEnabled(enable) self.showInfoButton.setEnabled(enable) + self.renameButton.setEnabled(enable) + self.changeUrlButton.setEnabled(enable) + self.credentialsButton.setEnabled(enable) @pyqtSlot() def on_repolist_itemSelectionChanged(self): @@ -327,15 +328,6 @@ self.on_refreshButton_clicked() @pyqtSlot() - def on_renameButton_clicked(self): - """ - Private slot to rename a remote repository. - """ - remoteName = self.repolist.selectedItems()[0].text(0) - self.vcs.gitRenameRemote(self.projectDir, remoteName) - self.on_refreshButton_clicked() - - @pyqtSlot() def on_removeButton_clicked(self): """ Private slot to remove a remote repository. @@ -359,3 +351,35 @@ """ remoteName = self.repolist.selectedItems()[0].text(0) self.vcs.gitPruneRemote(self.projectDir, remoteName) + + @pyqtSlot() + def on_renameButton_clicked(self): + """ + Private slot to rename a remote repository. + """ + remoteName = self.repolist.selectedItems()[0].text(0) + self.vcs.gitRenameRemote(self.projectDir, remoteName) + self.on_refreshButton_clicked() + + @pyqtSlot() + def on_changeUrlButton_clicked(self): + """ + Private slot to change the URL of a remote repository. + """ + repositoryItem = self.repolist.selectedItems()[0] + remoteName = repositoryItem.text(0) + remoteUrl = repositoryItem.text(1) + self.vcs.gitChangeRemoteUrl(self.projectDir, remoteName, remoteUrl) + self.on_refreshButton_clicked() + + @pyqtSlot() + def on_credentialsButton_clicked(self): + """ + Private slot to change the credentials of a remote repository. + """ + repositoryItem = self.repolist.selectedItems()[0] + remoteName = repositoryItem.text(0) + remoteUrl = repositoryItem.text(1) + self.vcs.gitChangeRemoteCredentials(self.projectDir, remoteName, + remoteUrl) + self.on_refreshButton_clicked()
--- a/Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui Sun Jun 03 11:30:57 2018 +0200 +++ b/Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui Sun Jun 03 14:03:19 2018 +0200 @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>600</width> - <height>450</height> + <width>650</width> + <height>500</height> </rect> </property> <property name="windowTitle"> @@ -87,16 +87,6 @@ </widget> </item> <item> - <widget class="QPushButton" name="renameButton"> - <property name="toolTip"> - <string>Press to rename the selected repository</string> - </property> - <property name="text"> - <string>&Rename</string> - </property> - </widget> - </item> - <item> <widget class="QPushButton" name="removeButton"> <property name="toolTip"> <string>Press to remove the selected repository</string> @@ -149,6 +139,66 @@ </layout> </item> <item> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <spacer name="horizontalSpacer_3"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="renameButton"> + <property name="toolTip"> + <string>Press to rename the selected repository</string> + </property> + <property name="text"> + <string>&Rename</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="changeUrlButton"> + <property name="toolTip"> + <string>Press to change the URL of the selected repository</string> + </property> + <property name="text"> + <string>Change &URL</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="credentialsButton"> + <property name="toolTip"> + <string>Press to set or change the user credentials of the selected repository</string> + </property> + <property name="text"> + <string>&Credentials</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_4"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> <widget class="QGroupBox" name="errorGroup"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> @@ -249,10 +299,12 @@ <tabstops> <tabstop>repolist</tabstop> <tabstop>addButton</tabstop> - <tabstop>renameButton</tabstop> <tabstop>removeButton</tabstop> <tabstop>pruneButton</tabstop> <tabstop>showInfoButton</tabstop> + <tabstop>renameButton</tabstop> + <tabstop>changeUrlButton</tabstop> + <tabstop>credentialsButton</tabstop> <tabstop>errors</tabstop> <tabstop>input</tabstop> <tabstop>passwordCheckBox</tabstop>
--- a/Plugins/VcsPlugins/vcsGit/ProjectHelper.py Sun Jun 03 11:30:57 2018 +0200 +++ b/Plugins/VcsPlugins/vcsGit/ProjectHelper.py Sun Jun 03 14:03:19 2018 +0200 @@ -601,6 +601,36 @@ self.gitRemoteRenameAct.triggered.connect(self.__gitRenameRemote) self.actions.append(self.gitRemoteRenameAct) + self.gitRemoteChangeUrlAct = E5Action( + self.tr('Change URL'), + self.tr('Change URL...'), + 0, 0, self, 'git_change_remote_url') + self.gitRemoteChangeUrlAct.setStatusTip(self.tr( + 'Change the URL of a remote repository' + )) + self.gitRemoteChangeUrlAct.setWhatsThis(self.tr( + """<b>Change URL</b>""" + """<p>This changes the URL of a remote repository.</p>""" + )) + self.gitRemoteChangeUrlAct.triggered.connect(self.__gitChangeRemoteUrl) + self.actions.append(self.gitRemoteChangeUrlAct) + + self.gitRemoteCredentialsAct = E5Action( + self.tr('Credentials'), + self.tr('Credentials...'), + 0, 0, self, 'git_remote_credentials') + self.gitRemoteCredentialsAct.setStatusTip(self.tr( + 'Change or set the user credentials of a remote repository' + )) + self.gitRemoteCredentialsAct.setWhatsThis(self.tr( + """<b>Credentials</b>""" + """<p>This changes or sets the user credentials of a""" + """ remote repository.</p>""" + )) + self.gitRemoteCredentialsAct.triggered.connect( + self.__gitRemoteCredentials) + self.actions.append(self.gitRemoteCredentialsAct) + self.gitCherryPickAct = E5Action( self.tr('Copy Commits'), UI.PixmapCache.getIcon("vcsGraft.png"), @@ -1430,6 +1460,8 @@ remotesMenu.addSeparator() remotesMenu.addAction(self.gitRemoteAddAct) remotesMenu.addAction(self.gitRemoteRenameAct) + remotesMenu.addAction(self.gitRemoteChangeUrlAct) + remotesMenu.addAction(self.gitRemoteCredentialsAct) remotesMenu.addAction(self.gitRemoteRemoveAct) remotesMenu.addAction(self.gitRemotePruneAct) @@ -1819,6 +1851,36 @@ if ok: self.vcs.gitRenameRemote(self.project.getProjectPath(), remote) + def __gitChangeRemoteUrl(self): + """ + Private slot to change the URL of a remote repository. + """ + remotes = self.vcs.gitGetRemotesList(self.project.getProjectPath()) + remote, ok = QInputDialog.getItem( + None, + self.tr("Rename"), + self.tr("Select a remote repository:"), + remotes, + 0, False) + if ok: + self.vcs.gitChangeRemoteUrl(self.project.getProjectPath(), remote) + + def __gitRemoteCredentials(self): + """ + Private slot to change or set the user credentials for a remote + repository. + """ + remotes = self.vcs.gitGetRemotesList(self.project.getProjectPath()) + remote, ok = QInputDialog.getItem( + None, + self.tr("Rename"), + self.tr("Select a remote repository:"), + remotes, + 0, False) + if ok: + self.vcs.gitChangeRemoteCredentials(self.project.getProjectPath(), + remote) + def __gitCherryPick(self): """ Private slot used to copy commits into the current branch.
--- a/Plugins/VcsPlugins/vcsGit/git.py Sun Jun 03 11:30:57 2018 +0200 +++ b/Plugins/VcsPlugins/vcsGit/git.py Sun Jun 03 14:03:19 2018 +0200 @@ -2787,6 +2787,35 @@ return remotesList + def gitGetRemoteUrl(self, repodir, remoteName): + """ + Public method to get the URL of a remote repository. + + @param repodir directory name of the repository + @type str + @param remoteName name of the remote repository + @type str + @return URL of the remote repository + @rtype str + """ + args = self.initCommand("remote") + args.append("get-url") + args.append(remoteName) + + output = "" + process = QProcess() + process.setWorkingDirectory(repodir) + process.start('git', args) + procStarted = process.waitForStarted(5000) + if procStarted: + finished = process.waitForFinished(30000) + if finished and process.exitCode() == 0: + output = str(process.readAllStandardOutput(), + Preferences.getSystem("IOEncoding"), + 'replace').strip() + + return output + def gitGetRemoteBranchesList(self, repodir, remote): """ Public method to get the list of a remote repository branches. @@ -2909,6 +2938,74 @@ self.startSynchronizedProcess(QProcess(), "git", args, workingDir=repodir) + def gitChangeRemoteUrl(self, projectDir, remoteName, remoteUrl=""): + """ + Public method to change the URL of a remote repository. + + @param projectDir name of the project directory + @type str + @param remoteName name of the remote repository + @type str + @param remoteUrl URL of the remote repository + @type str + """ + # find the root of the repo + repodir = projectDir + while not os.path.isdir(os.path.join(repodir, self.adminDir)): + repodir = os.path.dirname(repodir) + if os.path.splitdrive(repodir)[1] == os.sep: + return + + if not remoteUrl: + remoteUrl = self.gitGetRemoteUrl(repodir, remoteName) + + from .GitChangeRemoteUrlDialog import GitChangeRemoteUrlDialog + dlg = GitChangeRemoteUrlDialog(remoteName, remoteUrl) + if dlg.exec_() == QDialog.Accepted: + name, url = dlg.getData() + if url != remoteUrl: + args = self.initCommand("remote") + args.append("set-url") + args.append(name) + args.append(url) + + self.startSynchronizedProcess(QProcess(), "git", args, + workingDir=repodir) + + def gitChangeRemoteCredentials(self, projectDir, remoteName, remoteUrl=""): + """ + Public method to change the user credentials of a remote repository. + + @param projectDir name of the project directory + @type str + @param remoteName name of the remote repository + @type str + @param remoteUrl URL of the remote repository + @type str + """ + # find the root of the repo + repodir = projectDir + while not os.path.isdir(os.path.join(repodir, self.adminDir)): + repodir = os.path.dirname(repodir) + if os.path.splitdrive(repodir)[1] == os.sep: + return + + if not remoteUrl: + remoteUrl = self.gitGetRemoteUrl(repodir, remoteName) + + from .GitRemoteCredentialsDialog import GitRemoteCredentialsDialog + dlg = GitRemoteCredentialsDialog(remoteName, remoteUrl) + if dlg.exec_() == QDialog.Accepted: + name, url = dlg.getData() + if url != remoteUrl: + args = self.initCommand("remote") + args.append("set-url") + args.append(name) + args.append(url) + + self.startSynchronizedProcess(QProcess(), "git", args, + workingDir=repodir) + def gitRemoveRemote(self, projectDir, remoteName): """ Public method to remove a remote repository.
--- a/changelog Sun Jun 03 11:30:57 2018 +0200 +++ b/changelog Sun Jun 03 14:03:19 2018 +0200 @@ -1,5 +1,11 @@ Change Log ---------- +Version 18.07: +- bug fixes +- Git Interface + -- added capability to change the URL and/or user credentials for a + remote repository + Version 18.06: - bug fixes - Editor
--- a/eric6.e4p Sun Jun 03 11:30:57 2018 +0200 +++ b/eric6.e4p Sun Jun 03 14:03:19 2018 +0200 @@ -575,6 +575,7 @@ <Source>Plugins/VcsPlugins/vcsGit/GitBranchDialog.py</Source> <Source>Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.py</Source> <Source>Plugins/VcsPlugins/vcsGit/GitBundleDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.py</Source> <Source>Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.py</Source> <Source>Plugins/VcsPlugins/vcsGit/GitCommandDialog.py</Source> <Source>Plugins/VcsPlugins/vcsGit/GitCommitDialog.py</Source> @@ -596,6 +597,7 @@ <Source>Plugins/VcsPlugins/vcsGit/GitPullDialog.py</Source> <Source>Plugins/VcsPlugins/vcsGit/GitPushDialog.py</Source> <Source>Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.py</Source> <Source>Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py</Source> <Source>Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.py</Source> <Source>Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.py</Source> @@ -1818,6 +1820,7 @@ <Form>Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui</Form> @@ -1836,6 +1839,7 @@ <Form>Plugins/VcsPlugins/vcsGit/GitPullDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsGit/GitPushDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui</Form> @@ -2203,14 +2207,14 @@ </Resources> <Others> <Other>.hgignore</Other> + <Other>APIs/Python/zope-2.10.7.api</Other> + <Other>APIs/Python/zope-2.11.2.api</Other> + <Other>APIs/Python/zope-3.3.1.api</Other> <Other>APIs/Python3/PyQt4.bas</Other> <Other>APIs/Python3/PyQt5.bas</Other> <Other>APIs/Python3/QScintilla2.bas</Other> <Other>APIs/Python3/eric6.api</Other> <Other>APIs/Python3/eric6.bas</Other> - <Other>APIs/Python/zope-2.10.7.api</Other> - <Other>APIs/Python/zope-2.11.2.api</Other> - <Other>APIs/Python/zope-3.3.1.api</Other> <Other>APIs/QSS/qss.api</Other> <Other>APIs/Ruby/Ruby-1.8.7.api</Other> <Other>APIs/Ruby/Ruby-1.8.7.bas</Other>
--- a/i18n/eric6_cs.ts Sun Jun 03 11:30:57 2018 +0200 +++ b/i18n/eric6_cs.ts Sun Jun 03 14:03:19 2018 +0200 @@ -1539,7 +1539,7 @@ </message> <message> <location filename="../Utilities/BackgroundService.py" line="422"/> - <source>Erics background client disconnected because of an unknown reason.</source> + <source>Eric's background client disconnected because of an unknown reason.</source> <translation type="unfinished"></translation> </message> <message> @@ -18530,237 +18530,237 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2972"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3070"/> <source>Show Remote Info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> <source>Rename Remote Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> <source>Enter new name for remote repository:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2996"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3094"/> <source>Show Shortlog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3054"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3152"/> <source>Cherry-pick</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3084"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3182"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3109"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3207"/> <source>Copy Changesets (Quit)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3233"/> <source>Copy Changesets (Cancel)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3215"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3313"/> <source>Saving stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3414"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> <source>Show Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3414"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> <source>Select a stash (empty for latest stash):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3326"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3424"/> <source>Restore Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3340"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3438"/> <source>Restoring stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3374"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3472"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3364"/> - <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="3389"/> - <source>Creating branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3423"/> - <source>Delete Stash</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3423"/> - <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="3434"/> - <source>Deleting stash</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3454"/> - <source>Delete All Stashes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3454"/> - <source>Do you really want to delete all stashes?</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> - <source>Deleting all stashes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3534"/> - <source>Showing the combined configuration settings</source> - <translation type="unfinished">Zobrazení nastavení kombinovaných konfigurací</translation> + <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="3487"/> + <source>Creating branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <source>Delete Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <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="3532"/> + <source>Deleting stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <source>Delete All Stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <source>Do you really want to delete all stashes?</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3560"/> - <source>Verifying the integrity of the Git repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3585"/> - <source>Performing Repository Housekeeping</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3629"/> - <source><tr><td><b>Statistics</b></td></tr></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3630"/> - <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="3634"/> - <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="3638"/> - <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="3642"/> - <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="3646"/> - <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="3650"/> - <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="3654"/> - <source><tr><td>Garbage files: </td><td>{0}</td></tr></source> - <translation type="unfinished"></translation> + <source>Deleting all stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3632"/> + <source>Showing the combined configuration settings</source> + <translation type="unfinished">Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3658"/> + <source>Verifying the integrity of the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3683"/> + <source>Performing Repository Housekeeping</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3727"/> + <source><tr><td><b>Statistics</b></td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3728"/> + <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="3732"/> + <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="3736"/> + <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="3740"/> + <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="3744"/> + <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="3748"/> + <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="3752"/> + <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="3756"/> <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="3664"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3762"/> <source><p><b>No statistics available.</b></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3730"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3828"/> <source>Creating Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3773"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3871"/> <source>Add Submodule</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> <source>List Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> <source>No submodules defined for the project.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3956"/> <source>All</source> <translation type="unfinished">Vše</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> <source>Submodule Path</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> <source>Select a submodule path:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3914"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4012"/> <source>Initialize Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3951"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4049"/> <source>Unregister Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4031"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4129"/> <source>Update Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4065"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4163"/> <source>Synchronize Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4123"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4221"/> <source>Submodules Summary</source> <translation type="unfinished"></translation> </message> @@ -18792,6 +18792,31 @@ <source>Enter the remote URL</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="51"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="57"/> + <source>Username:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="64"/> + <source>Enter the user name for the remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="71"/> + <source>Password:</source> + <translation type="unfinished">Heslo:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="81"/> + <source>Enter the password for the remote repository</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>GitApplyBundleDataDialog</name> @@ -19417,6 +19442,34 @@ </message> </context> <context> + <name>GitChangeRemoteUrlDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="14"/> + <source>Git Change Remote URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished">Jméno:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="40"/> + <source>URL:</source> + <translation type="unfinished">URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="57"/> + <source>New URL:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="64"/> + <source>Enter the new remote URL</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GitCherryPickDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="14"/> @@ -21681,7 +21734,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1765"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1797"/> <source>Show Remote Info</source> <translation type="unfinished"></translation> </message> @@ -21696,7 +21749,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1161"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1191"/> <source>Add</source> <translation type="unfinished">Přidat</translation> </message> @@ -21716,7 +21769,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1785"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1817"/> <source>Remove</source> <translation type="unfinished">Odebrat</translation> </message> @@ -21736,7 +21789,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1799"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1831"/> <source>Prune</source> <translation type="unfinished"></translation> </message> @@ -21756,7 +21809,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1874"/> <source>Rename</source> <translation type="unfinished"></translation> </message> @@ -21776,940 +21829,980 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1833"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1895"/> <source>Copy Commits</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="609"/> - <source>Copies commits into the current branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="612"/> - <source><b>Copy Commits</b><p>This copies commits on top of the current branch.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="619"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="623"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="626"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="635"/> - <source>Quit Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="639"/> - <source>Quit the current copying session</source> + <source>Copies commits into the current branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="642"/> - <source><b>Quit Copying Session</b><p>This quits the current copying session.</p></source> + <source><b>Copy Commits</b><p>This copies commits on top of the current branch.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="649"/> - <source>Cancel Copying Session</source> + <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="653"/> - <source>Cancel the current copying session and return to the previous state</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="657"/> - <source><b>Cancel Copying Session</b><p>This cancels the current copying session and returns to the previous state.</p></source> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="656"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="665"/> - <source>Stash changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="665"/> - <source>Stash changes...</source> + <source>Quit Copying Session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="669"/> - <source>Stash all current changes of the project</source> + <source>Quit the current copying session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="672"/> - <source><b>Stash changes</b><p>This stashes all current changes of the project.</p></source> + <source><b>Quit Copying Session</b><p>This quits the current copying session.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="679"/> - <source>Show stash browser</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="679"/> - <source>Show stash browser...</source> + <source>Cancel Copying Session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="683"/> - <source>Show a dialog with all stashes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="686"/> - <source><b>Show stash browser...</b><p>This shows a dialog listing all available stashes. Actions on these stashes may be executed via the context menu.</p></source> + <source>Cancel the current copying session and return to the previous state</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="687"/> + <source><b>Cancel Copying Session</b><p>This cancels the current copying session and returns to the previous state.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> - <source>Show stash</source> + <source>Stash changes</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> - <source>Show stash...</source> + <source>Stash changes...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="699"/> - <source>Show a dialog with a patch of a stash</source> + <source>Stash all current changes of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="702"/> + <source><b>Stash changes</b><p>This stashes all current changes of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="709"/> + <source>Show stash browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="709"/> + <source>Show stash browser...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="713"/> + <source>Show a dialog with all stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="716"/> + <source><b>Show stash browser...</b><p>This shows a dialog listing all available stashes. Actions on these stashes may be executed via the context menu.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="725"/> + <source>Show stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="725"/> + <source>Show stash...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="729"/> + <source>Show a dialog with a patch of a stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="732"/> <source><b>Show stash...</b><p>This shows a dialog with a patch of a selectable stash.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="710"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="740"/> <source>Restore && Keep</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="714"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="744"/> <source>Restore a stash but keep it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="717"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="747"/> <source><b>Restore &amp; Keep</b><p>This restores a selectable stash and keeps it.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="724"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="754"/> <source>Restore && Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="758"/> <source>Restore a stash and delete it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="731"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="761"/> <source><b>Restore &amp; Delete</b><p>This restores a selectable stash and deletes it.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1980"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2042"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="772"/> <source>Create a new branch and restore a stash into it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="745"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="775"/> <source><b>Create Branch</b><p>This creates a new branch and restores a stash into it.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="753"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="783"/> <source>Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="787"/> <source>Delete a stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="760"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="790"/> <source><b>Delete</b><p>This deletes a stash.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="767"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="797"/> <source>Delete All</source> <translation type="unfinished">Smazat vše</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="771"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="801"/> <source>Delete all stashes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="774"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="804"/> <source><b>Delete All</b><p>This deletes all stashes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="811"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="811"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="785"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="815"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="788"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="818"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="825"/> <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="825"/> <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="829"/> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="802"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="810"/> - <source>Create .gitignore</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="814"/> - <source>Create a .gitignore file with default values</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="817"/> - <source><b>Create .gitignore</b><p>This creates a .gitignore file with default values.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="824"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="824"/> - <source>Show combined configuration settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="828"/> - <source>Show the combined configuration settings from all configuration files</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="832"/> - <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="840"/> - <source>Verify repository</source> - <translation type="unfinished">Ověřit repozitář</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="840"/> - <source>Verify repository...</source> - <translation type="unfinished">Ověřit repozitář...</translation> + <source>Create .gitignore</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="844"/> - <source>Verify the connectivity and validity of objects of the database</source> + <source>Create a .gitignore file with default values</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="847"/> - <source><b>Verify repository</b><p>This verifies the connectivity and validity of objects of the database.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="855"/> - <source>Optimize repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="855"/> - <source>Optimize repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="859"/> - <source>Cleanup and optimize the local repository</source> + <source><b>Create .gitignore</b><p>This creates a .gitignore file with default values.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="854"/> + <source>Show combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="854"/> + <source>Show combined configuration settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="858"/> + <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="862"/> + <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="870"/> + <source>Verify repository</source> + <translation type="unfinished">Ověřit repozitář</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="870"/> + <source>Verify repository...</source> + <translation type="unfinished">Ověřit repozitář...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="874"/> + <source>Verify the connectivity and validity of objects of the database</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="877"/> + <source><b>Verify repository</b><p>This verifies the connectivity and validity of objects of the database.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="885"/> + <source>Optimize repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="885"/> + <source>Optimize repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="889"/> + <source>Cleanup and optimize the local repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="892"/> <source><b>Optimize repository</b><p>This cleans up and optimizes the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="899"/> <source>Repository Statistics</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="899"/> <source>Repository Statistics...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="903"/> <source>Show some statistics of the local repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="876"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="906"/> <source><b>Repository Statistics</b><p>This show some statistics of the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="883"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="913"/> <source>Create Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="887"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="917"/> <source>Create an archive from the local repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="890"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="920"/> <source><b>Create Archive</b><p>This creates an archive from the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="897"/> - <source>Create bundle</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="897"/> - <source>Create bundle...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="901"/> - <source>Create bundle file collecting changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="904"/> - <source><b>Create bundle</b><p>This creates a bundle file collecting selected changesets (git bundle create).</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="912"/> - <source>Verify bundle</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="912"/> - <source>Verify bundle...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="916"/> - <source>Verify the validity and applicability of a bundle file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="919"/> - <source><b>Verify bundle</b><p>This verifies that a bundle file is valid and will apply cleanly.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> - <source>List bundle heads</source> + <source>Create bundle</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> - <source>List bundle heads...</source> + <source>Create bundle...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="931"/> - <source>List all heads contained in a bundle file</source> + <source>Create bundle file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="934"/> + <source><b>Create bundle</b><p>This creates a bundle file collecting selected changesets (git bundle create).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="942"/> + <source>Verify bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="942"/> + <source>Verify bundle...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="946"/> + <source>Verify the validity and applicability of a bundle file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="949"/> + <source><b>Verify bundle</b><p>This verifies that a bundle file is valid and will apply cleanly.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="957"/> + <source>List bundle heads</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="957"/> + <source>List bundle heads...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="961"/> + <source>List all heads contained in a bundle file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="964"/> <source><b>List bundle heads</b><p>This lists all heads contained in a bundle file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="971"/> <source>Apply Bundle (fetch)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="971"/> <source>Apply Bundle (fetch)...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="945"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="975"/> <source>Apply a head of a bundle file using fetch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="948"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="978"/> <source><b>Apply Bundle (fetch)</b><p>This applies a head of a bundle file using fetch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2097"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2159"/> <source>Apply Bundle (pull)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="955"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="985"/> <source>Apply Bundle (pull)...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="959"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="989"/> <source>Apply a head of a bundle file using pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="962"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="992"/> <source><b>Apply Bundle (pull)</b><p>This applies a head of a bundle file using pull.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="969"/> - <source>Start</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="973"/> - <source>Start a bisect session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="976"/> - <source><b>Start</b><p>This starts a bisect session.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="983"/> - <source>Start (Extended)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="987"/> - <source>Start a bisect session giving a bad and optionally good commits</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="990"/> - <source><b>Start (Extended)</b><p>This starts a bisect session giving a bad and optionally good commits.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="999"/> - <source>Mark as "good"</source> - <translation type="unfinished">Označit jako "v pořádku"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="999"/> - <source>Mark as "good"...</source> - <translation type="unfinished">Označit jako "v pořádku"...</translation> + <source>Start</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1003"/> - <source>Mark a selectable revision as good</source> + <source>Start a bisect session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1006"/> - <source><b>Mark as "good"</b><p>This marks a selectable revision as good.</p></source> + <source><b>Start</b><p>This starts a bisect session.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1013"/> - <source>Mark as "bad"</source> - <translation type="unfinished">Označit jako "špatná"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1013"/> - <source>Mark as "bad"...</source> - <translation type="unfinished">Označit jako "špatná"...</translation> + <source>Start (Extended)</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1017"/> - <source>Mark a selectable revision as bad</source> + <source>Start a bisect session giving a bad and optionally good commits</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1020"/> + <source><b>Start (Extended)</b><p>This starts a bisect session giving a bad and optionally good commits.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1029"/> + <source>Mark as "good"</source> + <translation type="unfinished">Označit jako "v pořádku"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1029"/> + <source>Mark as "good"...</source> + <translation type="unfinished">Označit jako "v pořádku"...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1033"/> + <source>Mark a selectable revision as good</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1036"/> + <source><b>Mark as "good"</b><p>This marks a selectable revision as good.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1043"/> + <source>Mark as "bad"</source> + <translation type="unfinished">Označit jako "špatná"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1043"/> + <source>Mark as "bad"...</source> + <translation type="unfinished">Označit jako "špatná"...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1047"/> + <source>Mark a selectable revision as bad</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1050"/> <source><b>Mark as "bad"</b><p>This marks a selectable revision as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1057"/> <source>Skip</source> <translation type="unfinished">Přeskočit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1057"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1031"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1061"/> <source>Skip a selectable revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1064"/> <source><b>Skip</b><p>This skips a selectable revision.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1071"/> <source>Reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1071"/> <source>Reset...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1075"/> <source>Reset the bisect session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1078"/> <source><b>Reset</b><p>This resets the bisect session.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1055"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1085"/> <source>Show bisect log browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1090"/> <source>Show a dialog to browse the bisect log of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1063"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1093"/> <source><b>Show bisect log browser</b><p>This shows a dialog to browse the bisect log of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1072"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1102"/> <source>Create replay file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1106"/> <source>Create a replay file to repeat the current bisect session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1109"/> <source><b>Create replay file</b><p>This creates a replay file to repeat the current bisect session.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1088"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1118"/> <source>Edit replay file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1092"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1122"/> <source>Edit a bisect replay file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1095"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1125"/> <source><b>Edit replay file</b><p>This edits a bisect replay file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1133"/> <source>Replay session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1107"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1137"/> <source>Replay a bisect session from file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1110"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1140"/> <source><b>Replay session</b><p>This replays a bisect session from file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1147"/> <source>Check patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1121"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1151"/> <source>Check a list of patch files, if they would apply cleanly</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1124"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1154"/> <source><b>Check patch files</b><p>This checks a list of patch files, if they would apply cleanly.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2323"/> <source>Apply patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1166"/> <source>Apply a list of patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1139"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1169"/> <source><b>Apply patch files</b><p>This applies a list of patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1146"/> - <source>Show patch statistics</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1150"/> - <source>Show some statistics for a list of patch files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1153"/> - <source><b>Show patch statistics</b><p>This shows some statistics for a list of patch files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1165"/> - <source>Add a submodule to the current project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1168"/> - <source><b>Add</b><p>This adds a submodule to the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1176"/> - <source>List</source> + <source>Show patch statistics</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1180"/> - <source>List the submodule of the current project</source> + <source>Show some statistics for a list of patch files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1183"/> - <source><b>List</b><p>This lists the submodules of the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1191"/> - <source>Initialize</source> + <source><b>Show patch statistics</b><p>This shows some statistics for a list of patch files.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1195"/> - <source>Initialize the submodules of the current project</source> + <source>Add a submodule to the current project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1198"/> + <source><b>Add</b><p>This adds a submodule to the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1206"/> + <source>List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1210"/> + <source>List the submodule of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1213"/> + <source><b>List</b><p>This lists the submodules of the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1221"/> + <source>Initialize</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1225"/> + <source>Initialize the submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1228"/> <source><b>Initialize</b><p>This initializes the submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1207"/> - <source>Unregister</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1211"/> - <source>Unregister submodules of the current project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1214"/> - <source><b>Unregister</b><p>This unregisters submodules of the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1222"/> - <source>Update</source> - <translation type="unfinished">Obnovit</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1226"/> - <source>Update submodules of the current project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1229"/> - <source><b>Update</b><p>This updates submodules of the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1237"/> - <source>Initialize and Update</source> + <source>Unregister</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1241"/> - <source>Initialize and update submodules of the current project</source> + <source>Unregister submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1244"/> + <source><b>Unregister</b><p>This unregisters submodules of the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1252"/> + <source>Update</source> + <translation type="unfinished">Obnovit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1256"/> + <source>Update submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1259"/> + <source><b>Update</b><p>This updates submodules of the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1267"/> + <source>Initialize and Update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1271"/> + <source>Initialize and update submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1274"/> <source><b>Initialize and Update</b><p>This initializes and updates submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1253"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1283"/> <source>Fetch and Update</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1257"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1287"/> <source>Fetch and update submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1260"/> - <source><b>Fetch and Update</b><p>This fetches and updates submodules of the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1269"/> - <source>Update with Options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1273"/> - <source>Update submodules of the current project offering a dialog to enter options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1277"/> - <source><b>Update with Options</b><p>This updates submodules of the current project offering a dialog to enter update options.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1286"/> - <source>Synchronize URLs</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1290"/> + <source><b>Fetch and Update</b><p>This fetches and updates submodules of the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1299"/> + <source>Update with Options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1303"/> + <source>Update submodules of the current project offering a dialog to enter options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1307"/> + <source><b>Update with Options</b><p>This updates submodules of the current project offering a dialog to enter update options.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1316"/> + <source>Synchronize URLs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1320"/> <source>Synchronize URLs of submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1293"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1323"/> <source><b>Synchronize URLs</b><p>This synchronizes URLs of submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1332"/> <source>Show Status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1306"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1336"/> <source>Show the status of submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1339"/> <source><b>Show Status</b><p>This shows a dialog with the status of submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1318"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1348"/> <source>Show Summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1322"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1352"/> <source>Show summary information for submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1325"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1355"/> <source><b>Show Summary</b><p>This shows some summary information for submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1344"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1374"/> <source>Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1360"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1390"/> <source>Bundle Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1401"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2237"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2299"/> <source>Bisect</source> <translation type="unfinished">Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1397"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1427"/> <source>Tags</source> <translation type="unfinished">Tagy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1405"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1435"/> <source>Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1418"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1448"/> <source>Manage Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1426"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1456"/> <source>Remote Repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1436"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1468"/> <source>Cherry-pick</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1444"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1476"/> <source>Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1459"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1491"/> <source>Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1541"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1573"/> <source>Git</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1646"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1678"/> <source>Branch</source> <translation type="unfinished">Větev</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2323"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1690"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1722"/> <source>Pull</source> <translation type="unfinished">Stáhnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1715"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1747"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1734"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1766"/> <source>Unstage Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1874"/> <source>Select a remote repository:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1853"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1915"/> <source>Copy Commits (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1872"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1934"/> <source>Copy Commits (Quit)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1892"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1954"/> <source>Copy Commits (Cancel)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1911"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1973"/> <source>Save Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1961"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2023"/> <source>Restore Stash</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="604"/> + <source>Change URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="604"/> + <source>Change URL...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="608"/> + <source>Change the URL of a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="611"/> + <source><b>Change URL</b><p>This changes the URL of a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="618"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="618"/> + <source>Credentials...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="622"/> + <source>Change or set the user credentials of a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="625"/> + <source><b>Credentials</b><p>This changes or sets the user credentials of a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>GitPullDialog</name> @@ -23011,6 +23104,49 @@ </message> </context> <context> + <name>GitRemoteCredentialsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="14"/> + <source>Git Remote Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished">Jméno:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="40"/> + <source>URL:</source> + <translation type="unfinished">URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="57"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="63"/> + <source>Username:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="70"/> + <source>Enter the user name for the remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="77"/> + <source>Password:</source> + <translation type="unfinished">Heslo:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="87"/> + <source>Enter the password for the remote repository</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GitRemoteRepositoriesDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="14"/> @@ -23054,92 +23190,92 @@ <translation type="unfinished">Přid&at</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="159"/> + <source>Press to rename the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="162"/> + <source>&Rename</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="92"/> - <source>Press to rename the selected repository</source> + <source>Press to remove the selected repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="95"/> - <source>&Rename</source> + <source>Re&move</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="102"/> - <source>Press to remove the selected repository</source> + <source>Press to delete stale tracking branches under the selected repository </source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="105"/> - <source>Re&move</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="112"/> - <source>Press to delete stale tracking branches under the selected repository </source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="115"/> <source>&Prune</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="129"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="119"/> <source>Press to show information about the selected repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="132"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="122"/> <source>Show &Info...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="160"/> - <source>Errors</source> - <translation type="unfinished">Chyby</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="166"/> - <source><b>Git log errors</b><p>This shows possible error messages of the git log command.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="182"/> - <source>Input</source> - <translation type="unfinished">Vstup</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="204"/> - <source>Press to send the input to the git process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="207"/> - <source>&Send</source> - <translation type="unfinished">Ode&slat</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="210"/> + <source>Errors</source> + <translation type="unfinished">Chyby</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="216"/> + <source><b>Git log errors</b><p>This shows possible error messages of the git log command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="232"/> + <source>Input</source> + <translation type="unfinished">Vstup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="254"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="257"/> + <source>&Send</source> + <translation type="unfinished">Ode&slat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="260"/> <source>Alt+S</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="267"/> <source>Enter data to be sent to the git process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="224"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="274"/> <source>Select to switch the input field to password mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="227"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="277"/> <source>&Password Mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="280"/> <source>Alt+P</source> <translation type="unfinished"></translation> </message> @@ -23163,6 +23299,26 @@ <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="169"/> + <source>Press to change the URL of the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="172"/> + <source>Change &URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="179"/> + <source>Press to set or change the user credentials of the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="182"/> + <source>&Credentials</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>GitRevisionSelectionDialog</name>
--- a/i18n/eric6_de.ts Sun Jun 03 11:30:57 2018 +0200 +++ b/i18n/eric6_de.ts Sun Jun 03 14:03:19 2018 +0200 @@ -1482,7 +1482,7 @@ </message> <message> <location filename="../Utilities/BackgroundService.py" line="422"/> - <source>Erics background client disconnected because of an unknown reason.</source> + <source>Eric's background client disconnected because of an unknown reason.</source> <translation>Die Verbindung zu Erics Hintergund Client wurde aus unbekanntem Grund getrennt.</translation> </message> <message> @@ -17952,182 +17952,182 @@ <translation>Bisect wiederholen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2972"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3070"/> <source>Show Remote Info</source> <translation>Zeige entfernte Informationen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> <source>Rename Remote Repository</source> <translation>Entferntes Repository umbenennen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> <source>Enter new name for remote repository:</source> <translation>Gib einen Namen für das entfernte Repository ein:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2996"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3094"/> <source>Show Shortlog</source> <translation>Kurzbeschreibungen anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3054"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3152"/> <source>Cherry-pick</source> <translation>Aussuchen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3084"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3182"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3109"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3207"/> <source>Copy Changesets (Quit)</source> <translation>Änderungssätze kopieren (Beenden)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3233"/> <source>Copy Changesets (Cancel)</source> <translation>Änderungssätze kopieren (Abbrechen)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3215"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3313"/> <source>Saving stash</source> <translation>Ablage sichern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3414"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> <source>Show Stash</source> <translation>Ablage anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3414"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> <source>Select a stash (empty for latest stash):</source> <translation>Wähle eine Ablage (leer für aktuellste):</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3326"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3424"/> <source>Restore Stash</source> <translation>Ablage wiederherstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3340"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3438"/> <source>Restoring stash</source> <translation>Stelle Ablage wieder her</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3374"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3472"/> <source>Create Branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3364"/> - <source>Enter a branch name to restore a stash to:</source> - <translation>Gib einen Zweignamen für die Ablagewiederherstellung ein:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3389"/> - <source>Creating branch</source> - <translation>Erzeuge Zweig</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3423"/> - <source>Delete Stash</source> - <translation>Ablage löschen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3423"/> - <source>Do you really want to delete the stash <b>{0}</b>?</source> - <translation>Soll die Ablage <b>{0}</b> wirklich gelöscht werden?</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3434"/> - <source>Deleting stash</source> - <translation>Lösche Ablage</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3454"/> - <source>Delete All Stashes</source> - <translation>Alle Ablagen löschen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3454"/> - <source>Do you really want to delete all stashes?</source> - <translation>Sollen wirklich alle Ablagen gelöscht werden?</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> - <source>Deleting all stashes</source> - <translation>Lösche alle Ablagen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3534"/> - <source>Showing the combined configuration settings</source> - <translation>Zeige die kombinierten Einstellungen</translation> + <source>Enter a branch name to restore a stash to:</source> + <translation>Gib einen Zweignamen für die Ablagewiederherstellung ein:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3487"/> + <source>Creating branch</source> + <translation>Erzeuge Zweig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <source>Delete Stash</source> + <translation>Ablage löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <source>Do you really want to delete the stash <b>{0}</b>?</source> + <translation>Soll die Ablage <b>{0}</b> wirklich gelöscht werden?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3532"/> + <source>Deleting stash</source> + <translation>Lösche Ablage</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <source>Delete All Stashes</source> + <translation>Alle Ablagen löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <source>Do you really want to delete all stashes?</source> + <translation>Sollen wirklich alle Ablagen gelöscht werden?</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3560"/> - <source>Verifying the integrity of the Git repository</source> - <translation>Verifiziere die Integrität des Git-Repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3585"/> - <source>Performing Repository Housekeeping</source> - <translation>Führe Repository Reorganisation durch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3629"/> - <source><tr><td><b>Statistics</b></td></tr></source> - <translation><tr><td><b>Statistik</b></td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3630"/> - <source><tr><td>Number of loose objects: </td><td>{0}</td></tr></source> - <translation><tr><td>Anzahl loser Objekte: </td><td>{0}</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3634"/> - <source><tr><td>Disk space used by loose objects: </td><td>{0} KiB</td></tr></source> - <translation><tr><td>Festplattenverbrauch durch lose Objekte: </td><td>{0} KiB</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3638"/> - <source><tr><td>Number of packed objects: </td><td>{0}</td></tr></source> - <translation><tr><td>Anzahl gepackter Objekte: </td><td>{0}</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3642"/> - <source><tr><td>Number of packs: </td><td>{0}</td></tr></source> - <translation><tr><td>Anzahl Pakete: </td><td>{0}</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3646"/> - <source><tr><td>Disk space used by packed objects: </td><td>{0} KiB</td></tr></source> - <translation><tr><td>Festplattenverbrauch durch lose Objekte </td><td>{0} KiB</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3650"/> - <source><tr><td>Packed objects waiting for pruning: </td><td>{0}</td></tr></source> - <translation><tr><td>Gepackte Objekte bereit zum Löschen: </td><td>{0}</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3654"/> - <source><tr><td>Garbage files: </td><td>{0}</td></tr></source> - <translation><tr><td>Wertlose Dateien: </td><td>{0}</td></tr></translation> + <source>Deleting all stashes</source> + <translation>Lösche alle Ablagen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3632"/> + <source>Showing the combined configuration settings</source> + <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3658"/> + <source>Verifying the integrity of the Git repository</source> + <translation>Verifiziere die Integrität des Git-Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3683"/> + <source>Performing Repository Housekeeping</source> + <translation>Führe Repository Reorganisation durch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3727"/> + <source><tr><td><b>Statistics</b></td></tr></source> + <translation><tr><td><b>Statistik</b></td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3728"/> + <source><tr><td>Number of loose objects: </td><td>{0}</td></tr></source> + <translation><tr><td>Anzahl loser Objekte: </td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3732"/> + <source><tr><td>Disk space used by loose objects: </td><td>{0} KiB</td></tr></source> + <translation><tr><td>Festplattenverbrauch durch lose Objekte: </td><td>{0} KiB</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3736"/> + <source><tr><td>Number of packed objects: </td><td>{0}</td></tr></source> + <translation><tr><td>Anzahl gepackter Objekte: </td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3740"/> + <source><tr><td>Number of packs: </td><td>{0}</td></tr></source> + <translation><tr><td>Anzahl Pakete: </td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3744"/> + <source><tr><td>Disk space used by packed objects: </td><td>{0} KiB</td></tr></source> + <translation><tr><td>Festplattenverbrauch durch lose Objekte </td><td>{0} KiB</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3748"/> + <source><tr><td>Packed objects waiting for pruning: </td><td>{0}</td></tr></source> + <translation><tr><td>Gepackte Objekte bereit zum Löschen: </td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3752"/> + <source><tr><td>Garbage files: </td><td>{0}</td></tr></source> + <translation><tr><td>Wertlose Dateien: </td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3756"/> <source><tr><td>Disk space used by garbage files: </td><td>{0} KiB</td></tr></source> <translation><tr><td>Festplattenverbrauch durch wertlose Dateien: </td><td>{0} KiB</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3664"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3762"/> <source><p><b>No statistics available.</b></p></source> <translation><p><b>Keine Statistik verfügbar.</b></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3730"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3828"/> <source>Creating Archive</source> <translation>Erzeuge Archiv</translation> </message> @@ -18157,57 +18157,57 @@ <translation>Patchdateien anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3773"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3871"/> <source>Add Submodule</source> <translation>Submodul hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> <source>List Submodules</source> <translation>Submodule auflisten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> <source>No submodules defined for the project.</source> <translation>Für das Projekt sind keine Submodule definiert.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3956"/> <source>All</source> <translation>Alle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> <source>Submodule Path</source> <translation>Submodulpfad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> <source>Select a submodule path:</source> <translation>Wähle einen Submodulpfad:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3914"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4012"/> <source>Initialize Submodules</source> <translation>Submodule initialisieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3951"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4049"/> <source>Unregister Submodules</source> <translation>Submodule deregistrieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4031"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4129"/> <source>Update Submodules</source> <translation>Submodule aktualisieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4065"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4163"/> <source>Synchronize Submodules</source> <translation>Submodule synchronisieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4123"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4221"/> <source>Submodules Summary</source> <translation>Submodulüberblick</translation> </message> @@ -18239,6 +18239,31 @@ <source>Enter the remote URL</source> <translation>Gib die Repository URL ein</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="51"/> + <source>Credentials</source> + <translation>Berechtigung</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="57"/> + <source>Username:</source> + <translation>Nutzername:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="64"/> + <source>Enter the user name for the remote repository</source> + <translation>Gib den Nutzernamen für das entfernte Repository ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="71"/> + <source>Password:</source> + <translation>Kennwort:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="81"/> + <source>Enter the password for the remote repository</source> + <translation>Gib das Kennwort für das entfernte Repository ein</translation> + </message> </context> <context> <name>GitApplyBundleDataDialog</name> @@ -18868,6 +18893,34 @@ </message> </context> <context> + <name>GitChangeRemoteUrlDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="14"/> + <source>Git Change Remote URL</source> + <translation>URL ändern</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="23"/> + <source>Name:</source> + <translation>Name:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="40"/> + <source>URL:</source> + <translation>URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="57"/> + <source>New URL:</source> + <translation>Neue URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="64"/> + <source>Enter the new remote URL</source> + <translation>Gib die neue Repository URL ein</translation> + </message> +</context> +<context> <name>GitCherryPickDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="14"/> @@ -21120,7 +21173,7 @@ <translation><b>Zeige Entfernte</b><p>Dies zeigt die zum Hoch- und Herunterladen verfügbaren entfernten Repositories.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1765"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1797"/> <source>Show Remote Info</source> <translation>Zeige entfernte Informationen</translation> </message> @@ -21135,7 +21188,7 @@ <translation>Zeigt Informationen über ein entferntes Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1161"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1191"/> <source>Add</source> <translation>Hinzufügen</translation> </message> @@ -21155,7 +21208,7 @@ <translation><b>Hinzufügen</b><p>Ein entferntes Repository hinzufügen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1785"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1817"/> <source>Remove</source> <translation>Entfernen</translation> </message> @@ -21175,7 +21228,7 @@ <translation><b>Entfernen</b><p>Ein entferntes Repository entfernen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1799"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1831"/> <source>Prune</source> <translation>Aufräumen</translation> </message> @@ -21195,7 +21248,7 @@ <translation><b>Aufräumen</b><p>Dies löscht lose Trackingzweige eines entfernten Repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1874"/> <source>Rename</source> <translation>Umbenennen</translation> </message> @@ -21215,712 +21268,712 @@ <translation><b>Umbenennen</b><p>Dies benennt ein entferntes Repository um.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1833"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1895"/> <source>Copy Commits</source> <translation>Revisionen kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="609"/> - <source>Copies commits into the current branch</source> - <translation>Kopiert Revisionen in den aktuellen Zweig</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="612"/> - <source><b>Copy Commits</b><p>This copies commits on top of the current branch.</p></source> - <translation><b>Revisionen kopieren</b><p>Dies kopiert Revisionen in den aktuellen Zweig.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="619"/> - <source>Continue Copying Session</source> - <translation>Kopiersitzung fortsetzen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="623"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation>Setzt die letzte Kopiersitzung nach Lösung von Konflikten fort</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="626"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation><b>Kopiersitzung fortsetzen</b><p>Dies setzt die letzte Kopiersitzung nach Lösung von Konflikten fort.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="635"/> - <source>Quit Copying Session</source> - <translation>Kopiersitzung beenden</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="639"/> - <source>Quit the current copying session</source> - <translation>Beendet die aktuelle Kopiersitzung</translation> + <source>Copies commits into the current branch</source> + <translation>Kopiert Revisionen in den aktuellen Zweig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="642"/> + <source><b>Copy Commits</b><p>This copies commits on top of the current branch.</p></source> + <translation><b>Revisionen kopieren</b><p>Dies kopiert Revisionen in den aktuellen Zweig.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="649"/> - <source>Cancel Copying Session</source> - <translation>Kopiersitzung abbrechen</translation> + <source>Continue Copying Session</source> + <translation>Kopiersitzung fortsetzen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="653"/> - <source>Cancel the current copying session and return to the previous state</source> - <translation>Bricht die aktuelle Kopiersitzung ab und kehrt zum Ausgangszustand zurück</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="657"/> - <source><b>Cancel Copying Session</b><p>This cancels the current copying session and returns to the previous state.</p></source> - <translation><b>Kopiersitzung abbrechen</b><p>Dies bricht die aktuelle Kopiersitzung ab und kehrt zum Ausgangszustand zurück.</p></translation> + <source>Continue the last copying session after conflicts were resolved</source> + <translation>Setzt die letzte Kopiersitzung nach Lösung von Konflikten fort</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="656"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation><b>Kopiersitzung fortsetzen</b><p>Dies setzt die letzte Kopiersitzung nach Lösung von Konflikten fort.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="665"/> - <source>Stash changes</source> - <translation>Änderungen ablegen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="665"/> - <source>Stash changes...</source> - <translation>Änderungen ablegen...</translation> + <source>Quit Copying Session</source> + <translation>Kopiersitzung beenden</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="669"/> - <source>Stash all current changes of the project</source> - <translation>Alle aktuellen Änderungen des Projektes ablegen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="672"/> - <source><b>Stash changes</b><p>This stashes all current changes of the project.</p></source> - <translation><b>Änderungen ablegen</b<p>Dies legt alle aktuellen Änderungen des Projektes ab.</p></translation> + <source>Quit the current copying session</source> + <translation>Beendet die aktuelle Kopiersitzung</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="679"/> - <source>Show stash browser</source> - <translation>Zeige Ablagenbrowser</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="679"/> - <source>Show stash browser...</source> - <translation>Zeige Ablagenbrowser...</translation> + <source>Cancel Copying Session</source> + <translation>Kopiersitzung abbrechen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="683"/> - <source>Show a dialog with all stashes</source> - <translation>Zeigt einen Dialog mit allen Ablagen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="686"/> - <source><b>Show stash browser...</b><p>This shows a dialog listing all available stashes. Actions on these stashes may be executed via the context menu.</p></source> - <translation><b>Zeige Ablagenbrowser</b<p>Dies zeigt einen Dialog mit allen Ablagen. Aktionen können über das Kontextmenü ausgewählt werden.</p></translation> + <source>Cancel the current copying session and return to the previous state</source> + <translation>Bricht die aktuelle Kopiersitzung ab und kehrt zum Ausgangszustand zurück</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="687"/> + <source><b>Cancel Copying Session</b><p>This cancels the current copying session and returns to the previous state.</p></source> + <translation><b>Kopiersitzung abbrechen</b><p>Dies bricht die aktuelle Kopiersitzung ab und kehrt zum Ausgangszustand zurück.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> - <source>Show stash</source> - <translation>Ablage anzeigen</translation> + <source>Stash changes</source> + <translation>Änderungen ablegen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> - <source>Show stash...</source> - <translation>Ablage anzeigen...</translation> + <source>Stash changes...</source> + <translation>Änderungen ablegen...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="699"/> - <source>Show a dialog with a patch of a stash</source> - <translation>Zeigt einen Dialog mit dem Inhalt der Ablage</translation> + <source>Stash all current changes of the project</source> + <translation>Alle aktuellen Änderungen des Projektes ablegen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="702"/> + <source><b>Stash changes</b><p>This stashes all current changes of the project.</p></source> + <translation><b>Änderungen ablegen</b<p>Dies legt alle aktuellen Änderungen des Projektes ab.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="709"/> + <source>Show stash browser</source> + <translation>Zeige Ablagenbrowser</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="709"/> + <source>Show stash browser...</source> + <translation>Zeige Ablagenbrowser...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="713"/> + <source>Show a dialog with all stashes</source> + <translation>Zeigt einen Dialog mit allen Ablagen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="716"/> + <source><b>Show stash browser...</b><p>This shows a dialog listing all available stashes. Actions on these stashes may be executed via the context menu.</p></source> + <translation><b>Zeige Ablagenbrowser</b<p>Dies zeigt einen Dialog mit allen Ablagen. Aktionen können über das Kontextmenü ausgewählt werden.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="725"/> + <source>Show stash</source> + <translation>Ablage anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="725"/> + <source>Show stash...</source> + <translation>Ablage anzeigen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="729"/> + <source>Show a dialog with a patch of a stash</source> + <translation>Zeigt einen Dialog mit dem Inhalt der Ablage</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="732"/> <source><b>Show stash...</b><p>This shows a dialog with a patch of a selectable stash.</p></source> <translation><b>Ablage anzeigen...</b><p>Dies zeigt einen Dialog mit dem Inhalt einer ausgewählten Ablage.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="710"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="740"/> <source>Restore && Keep</source> <translation>Wiederherstellen && Behalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="714"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="744"/> <source>Restore a stash but keep it</source> <translation>Ablage wieder herstellen und behalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="717"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="747"/> <source><b>Restore &amp; Keep</b><p>This restores a selectable stash and keeps it.</p></source> <translation><b>Wiederherstellen &amp; Behalten</b><p>Dies stellt eine Ablage wieder her, löscht sie aber nicht.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="724"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="754"/> <source>Restore && Delete</source> <translation>Wiederherstellen && Löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="758"/> <source>Restore a stash and delete it</source> <translation>Ablage wieder herstellen und löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="731"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="761"/> <source><b>Restore &amp; Delete</b><p>This restores a selectable stash and deletes it.</p></source> <translation><b>Wiederherstellen &amp; Löschen</b><p>Dies stellt eine Ablage wieder her und löscht sie.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1980"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2042"/> <source>Create Branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="772"/> <source>Create a new branch and restore a stash into it</source> <translation>Erzeugt einen neuen Zweig und stellt eine Ablage in ihm wieder her</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="745"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="775"/> <source><b>Create Branch</b><p>This creates a new branch and restores a stash into it.</p></source> <translation><b>Zweig erzeugen</b><p>Dies erzeugt einen neuen Zweig und stellt eine Ablage in ihm wieder her.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="753"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="783"/> <source>Delete</source> <translation>Löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="787"/> <source>Delete a stash</source> <translation>Ablage löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="760"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="790"/> <source><b>Delete</b><p>This deletes a stash.</p></source> <translation><b>Löschen</b><p>Dies löscht eine Ablage.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="767"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="797"/> <source>Delete All</source> <translation>Alle Löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="771"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="801"/> <source>Delete all stashes</source> <translation>Alle Ablagen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="774"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="804"/> <source><b>Delete All</b><p>This deletes all stashes.</p></source> <translation><b>Alle Löschen</b><p>Dies löscht alle Ablagen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="811"/> <source>Edit user configuration</source> <translation>Nutzerkonfiguration editieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="811"/> <source>Edit user configuration...</source> <translation>Nutzerkonfiguration editieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="785"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="815"/> <source>Show an editor to edit the user configuration file</source> <translation>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Nutzers</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="788"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="818"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation><b>Nutzerkonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Nutzers.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="825"/> <source>Edit repository configuration</source> <translation>Repositorykonfiguration editieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="825"/> <source>Edit repository configuration...</source> <translation>Repositorykonfiguration editieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="829"/> <source>Show an editor to edit the repository configuration file</source> <translation>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="802"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation><b>Repositorykonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="810"/> - <source>Create .gitignore</source> - <translation>Erstelle .gitignore</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="814"/> - <source>Create a .gitignore file with default values</source> - <translation>Erstelle eine .gitignore-Datei mit Standardwerten</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="817"/> - <source><b>Create .gitignore</b><p>This creates a .gitignore file with default values.</p></source> - <translation><b>Erstelle .gitignore</b><p>Dies erstellt eine .gitignore-Datei mit Standardwerten.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="824"/> - <source>Show combined configuration settings</source> - <translation>Zeige kombinierte Einstellungen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="824"/> - <source>Show combined configuration settings...</source> - <translation>Zeige kombinierte Einstellungen...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="828"/> - <source>Show the combined configuration settings from all configuration files</source> - <translation>Zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="832"/> - <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> - <translation><b>Zeige kombinierte Einstellungen</b><p>Dies zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien.</p></translation> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> + <translation><b>Repositorykonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="840"/> - <source>Verify repository</source> - <translation>Repository verifizieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="840"/> - <source>Verify repository...</source> - <translation>Repository verifizieren...</translation> + <source>Create .gitignore</source> + <translation>Erstelle .gitignore</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="844"/> - <source>Verify the connectivity and validity of objects of the database</source> - <translation>Verifiziert die Erreichbarkeit und Gültigkeit von Objekten der Datenbank</translation> + <source>Create a .gitignore file with default values</source> + <translation>Erstelle eine .gitignore-Datei mit Standardwerten</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="847"/> - <source><b>Verify repository</b><p>This verifies the connectivity and validity of objects of the database.</p></source> - <translation><b>Repository verifizieren</b><p>Dies verifiziert die Erreichbarkeit und Gültigkeit von Objekten der Datenbank.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="855"/> - <source>Optimize repository</source> - <translation>Repository optimieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="855"/> - <source>Optimize repository...</source> - <translation>Repository optimieren...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="859"/> - <source>Cleanup and optimize the local repository</source> - <translation>Säubert und optimiert das lokale Repository</translation> + <source><b>Create .gitignore</b><p>This creates a .gitignore file with default values.</p></source> + <translation><b>Erstelle .gitignore</b><p>Dies erstellt eine .gitignore-Datei mit Standardwerten.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="854"/> + <source>Show combined configuration settings</source> + <translation>Zeige kombinierte Einstellungen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="854"/> + <source>Show combined configuration settings...</source> + <translation>Zeige kombinierte Einstellungen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="858"/> + <source>Show the combined configuration settings from all configuration files</source> + <translation>Zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="862"/> + <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> + <translation><b>Zeige kombinierte Einstellungen</b><p>Dies zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="870"/> + <source>Verify repository</source> + <translation>Repository verifizieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="870"/> + <source>Verify repository...</source> + <translation>Repository verifizieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="874"/> + <source>Verify the connectivity and validity of objects of the database</source> + <translation>Verifiziert die Erreichbarkeit und Gültigkeit von Objekten der Datenbank</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="877"/> + <source><b>Verify repository</b><p>This verifies the connectivity and validity of objects of the database.</p></source> + <translation><b>Repository verifizieren</b><p>Dies verifiziert die Erreichbarkeit und Gültigkeit von Objekten der Datenbank.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="885"/> + <source>Optimize repository</source> + <translation>Repository optimieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="885"/> + <source>Optimize repository...</source> + <translation>Repository optimieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="889"/> + <source>Cleanup and optimize the local repository</source> + <translation>Säubert und optimiert das lokale Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="892"/> <source><b>Optimize repository</b><p>This cleans up and optimizes the local repository.</p></source> <translation><b>Repository optimieren</b><p>Dies säubert und optimiert das lokale Repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="899"/> <source>Repository Statistics</source> <translation>Repository Statistiken</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="899"/> <source>Repository Statistics...</source> <translation>Repository Statistiken...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="903"/> <source>Show some statistics of the local repository</source> <translation>Zeigt einige Statistiken zum lokalen Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="876"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="906"/> <source><b>Repository Statistics</b><p>This show some statistics of the local repository.</p></source> <translation><b>Repository Statistiken</b><p>Dies zeigt einige Statistiken zum lokalen Repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="883"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="913"/> <source>Create Archive</source> <translation>Archiv erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="887"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="917"/> <source>Create an archive from the local repository</source> <translation>Erzeugt ein Archiv aus dem lokalen Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="890"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="920"/> <source><b>Create Archive</b><p>This creates an archive from the local repository.</p></source> <translation><b>Archiv erzeugen</b><p>Dies erzeugt ein Archiv aus dem lokalen Repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="897"/> - <source>Create bundle</source> - <translation>Paket erzeugen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="897"/> - <source>Create bundle...</source> - <translation>Paket erzeugen...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="901"/> - <source>Create bundle file collecting changesets</source> - <translation>Erzeugt ein Paket mit Änderungssätzen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="904"/> - <source><b>Create bundle</b><p>This creates a bundle file collecting selected changesets (git bundle create).</p></source> - <translation><b>Paket erzeugen</b><p>Dies erzeugt eine Paketdatei mit ausgewählten Änderungssätzen (git bundle create).</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="912"/> - <source>Verify bundle</source> - <translation>Paket verifizieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="912"/> - <source>Verify bundle...</source> - <translation>Paket verifizieren...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="916"/> - <source>Verify the validity and applicability of a bundle file</source> - <translation>Verifiziert die Gültigkeit und die Anwendbarkeit einer Paketdatei</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="919"/> - <source><b>Verify bundle</b><p>This verifies that a bundle file is valid and will apply cleanly.</p></source> - <translation><b>Paket verifizieren</b><p>Dies verifiziert, dass eine Paketdatei gültig ist und fehlerfrei angewendet werden kann.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> - <source>List bundle heads</source> - <translation>Köpfe eines Pakets anzeigen</translation> + <source>Create bundle</source> + <translation>Paket erzeugen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> - <source>List bundle heads...</source> - <translation>Köpfe eines Pakets anzeigen...</translation> + <source>Create bundle...</source> + <translation>Paket erzeugen...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="931"/> - <source>List all heads contained in a bundle file</source> - <translation>Zeigt alle Köpfe, die in einer Paketdatei enthalten sind</translation> + <source>Create bundle file collecting changesets</source> + <translation>Erzeugt ein Paket mit Änderungssätzen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="934"/> + <source><b>Create bundle</b><p>This creates a bundle file collecting selected changesets (git bundle create).</p></source> + <translation><b>Paket erzeugen</b><p>Dies erzeugt eine Paketdatei mit ausgewählten Änderungssätzen (git bundle create).</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="942"/> + <source>Verify bundle</source> + <translation>Paket verifizieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="942"/> + <source>Verify bundle...</source> + <translation>Paket verifizieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="946"/> + <source>Verify the validity and applicability of a bundle file</source> + <translation>Verifiziert die Gültigkeit und die Anwendbarkeit einer Paketdatei</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="949"/> + <source><b>Verify bundle</b><p>This verifies that a bundle file is valid and will apply cleanly.</p></source> + <translation><b>Paket verifizieren</b><p>Dies verifiziert, dass eine Paketdatei gültig ist und fehlerfrei angewendet werden kann.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="957"/> + <source>List bundle heads</source> + <translation>Köpfe eines Pakets anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="957"/> + <source>List bundle heads...</source> + <translation>Köpfe eines Pakets anzeigen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="961"/> + <source>List all heads contained in a bundle file</source> + <translation>Zeigt alle Köpfe, die in einer Paketdatei enthalten sind</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="964"/> <source><b>List bundle heads</b><p>This lists all heads contained in a bundle file.</p></source> <translation><b>Köpfe eines Pakets anzeigen</b><p>Dies zeigt alle Köpfe, die in einer Paketdatei enthalten sind.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="971"/> <source>Apply Bundle (fetch)</source> <translation>Paket anwenden (fetch)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="971"/> <source>Apply Bundle (fetch)...</source> <translation>Paket anwenden (fetch)...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="945"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="975"/> <source>Apply a head of a bundle file using fetch</source> <translation>Wendet einen Kopf der Paketdatei mittels 'fetch' an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="948"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="978"/> <source><b>Apply Bundle (fetch)</b><p>This applies a head of a bundle file using fetch.</p></source> <translation><b>Paket anwenden (fetch)</b><p>Dies wendet einen Kopf der Paketdatei mittels 'fetch' an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2097"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2159"/> <source>Apply Bundle (pull)</source> <translation>Paket anwenden (pull)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="955"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="985"/> <source>Apply Bundle (pull)...</source> <translation>Paket anwenden (pull)...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="959"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="989"/> <source>Apply a head of a bundle file using pull</source> <translation>Wendet einen Kopf der Paketdatei mittels 'pull' an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="962"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="992"/> <source><b>Apply Bundle (pull)</b><p>This applies a head of a bundle file using pull.</p></source> <translation><b>Paket anwenden (pull)</b><p>Dies wendet einen Kopf der Paketdatei mittels 'pull' an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="969"/> - <source>Start</source> - <translation>Starten</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="973"/> - <source>Start a bisect session</source> - <translation>Startet eine bisect Session</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="976"/> - <source><b>Start</b><p>This starts a bisect session.</p></source> - <translation><b>Starten</b><p>Dies startet eine bisect Session.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="983"/> - <source>Start (Extended)</source> - <translation>Starten (erweitert)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="987"/> - <source>Start a bisect session giving a bad and optionally good commits</source> - <translation>Startet eine bisect Session mit Angabe einer schlechten und von guten Revisionen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="990"/> - <source><b>Start (Extended)</b><p>This starts a bisect session giving a bad and optionally good commits.</p></source> - <translation><b>Starten (erweitert)</b><p>Dies startet eine bisect Session mit Angabe einer schlechten und von guten Revisionen.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="999"/> - <source>Mark as "good"</source> - <translation>Als „gut“ markieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="999"/> - <source>Mark as "good"...</source> - <translation>Als „gut“ markieren...</translation> + <source>Start</source> + <translation>Starten</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1003"/> - <source>Mark a selectable revision as good</source> - <translation>Markiere eine auswählbare Revision als gut</translation> + <source>Start a bisect session</source> + <translation>Startet eine bisect Session</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1006"/> - <source><b>Mark as "good"</b><p>This marks a selectable revision as good.</p></source> - <translation><b>Als "gut" markieren</b><p>Dies markiert eine auswählbare Revision als gut.</p></translation> + <source><b>Start</b><p>This starts a bisect session.</p></source> + <translation><b>Starten</b><p>Dies startet eine bisect Session.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1013"/> - <source>Mark as "bad"</source> - <translation>Als „schlecht“ markieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1013"/> - <source>Mark as "bad"...</source> - <translation>Als „schlecht“ markieren...</translation> + <source>Start (Extended)</source> + <translation>Starten (erweitert)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1017"/> - <source>Mark a selectable revision as bad</source> - <translation>Markiere eine auswählbare Revision als schlecht</translation> + <source>Start a bisect session giving a bad and optionally good commits</source> + <translation>Startet eine bisect Session mit Angabe einer schlechten und von guten Revisionen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1020"/> + <source><b>Start (Extended)</b><p>This starts a bisect session giving a bad and optionally good commits.</p></source> + <translation><b>Starten (erweitert)</b><p>Dies startet eine bisect Session mit Angabe einer schlechten und von guten Revisionen.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1029"/> + <source>Mark as "good"</source> + <translation>Als „gut“ markieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1029"/> + <source>Mark as "good"...</source> + <translation>Als „gut“ markieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1033"/> + <source>Mark a selectable revision as good</source> + <translation>Markiere eine auswählbare Revision als gut</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1036"/> + <source><b>Mark as "good"</b><p>This marks a selectable revision as good.</p></source> + <translation><b>Als "gut" markieren</b><p>Dies markiert eine auswählbare Revision als gut.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1043"/> + <source>Mark as "bad"</source> + <translation>Als „schlecht“ markieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1043"/> + <source>Mark as "bad"...</source> + <translation>Als „schlecht“ markieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1047"/> + <source>Mark a selectable revision as bad</source> + <translation>Markiere eine auswählbare Revision als schlecht</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1050"/> <source><b>Mark as "bad"</b><p>This marks a selectable revision as bad.</p></source> <translation><b>Als "schlecht" markieren</b><p>Dies markiert eine auswählbare Revision als schlecht.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1057"/> <source>Skip</source> <translation>Überspringen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1057"/> <source>Skip...</source> <translation>Überspringen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1031"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1061"/> <source>Skip a selectable revision</source> <translation>Überspringe eine auswählbare Revision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1064"/> <source><b>Skip</b><p>This skips a selectable revision.</p></source> <translation><b>Überspringen</b><p>Dies überspringt eine auswählbare Revision.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1071"/> <source>Reset</source> <translation>Zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1071"/> <source>Reset...</source> <translation>Zurücksetzen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1075"/> <source>Reset the bisect session</source> <translation>Setzt die bisect Session zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1078"/> <source><b>Reset</b><p>This resets the bisect session.</p></source> <translation><b>Zurücksetzen</b><p>Dies setzt die bisect Session zurück.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1055"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1085"/> <source>Show bisect log browser</source> <translation>Bisect-Browser anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1090"/> <source>Show a dialog to browse the bisect log of the local project</source> <translation>Zeigt einen Dialog, um den Ablauf der bisect Session durchzusehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1063"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1093"/> <source><b>Show bisect log browser</b><p>This shows a dialog to browse the bisect log of the local project.</p></source> <translation><b>Bisect-Browser anzeigen</b><p>Dies zeigt einen Dialog, um den Ablauf der bisect Session durchzusehen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1072"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1102"/> <source>Create replay file</source> <translation>Wiederholungsdatei erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1106"/> <source>Create a replay file to repeat the current bisect session</source> <translation>Erzeugt eine Datei zur Wiederholung der aktuellen bisect Session</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1109"/> <source><b>Create replay file</b><p>This creates a replay file to repeat the current bisect session.</p></source> <translation><b>Wiederholungsdatei erzeugen</b><p>Dies erzeugt eine Datei zur Wiederholung der aktuellen bisect Session.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1088"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1118"/> <source>Edit replay file</source> <translation>Editiere Wiederholungsdatei</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1092"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1122"/> <source>Edit a bisect replay file</source> <translation>Eine bisect Wiederholungsdatei bearbeiten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1095"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1125"/> <source><b>Edit replay file</b><p>This edits a bisect replay file.</p></source> <translation><b>Editiere Wiederholungsdatei</b><p>Dies bearbeitet eine bisect Wiederholungsdatei.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1133"/> <source>Replay session</source> <translation>Session wiederholen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1107"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1137"/> <source>Replay a bisect session from file</source> <translation>Wiederholt eine bisect Session aus einer Datei</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1110"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1140"/> <source><b>Replay session</b><p>This replays a bisect session from file.</p></source> <translation><b>Session wiederholen</b><p>Dies wiederholt eine bisect Session aus einer Datei.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1344"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1374"/> <source>Administration</source> <translation>Verwaltung</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1360"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1390"/> <source>Bundle Management</source> <translation>Paketverwaltung</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1690"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1722"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2237"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2299"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1397"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1427"/> <source>Tags</source> <translation>Marken</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1405"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1435"/> <source>Branches</source> <translation>Zweige</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1418"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1448"/> <source>Manage Changes</source> <translation>Änderungen verwalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1426"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1456"/> <source>Remote Repositories</source> <translation>Entfernte Repositories</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1436"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1468"/> <source>Cherry-pick</source> <translation>Aussuchen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1444"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1476"/> <source>Stash</source> <translation>Ablage</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1646"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1678"/> <source>Branch</source> <translation>Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2323"/> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1715"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1747"/> <source>Revert Changes</source> <translation>Änderungen rückgängig machen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1734"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1766"/> <source>Unstage Changes</source> <translation>Vormerkung rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1874"/> <source>Select a remote repository:</source> <translation>Wähle ein entferntes Repository:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1853"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1915"/> <source>Copy Commits (Continue)</source> <translation>Revisionen kopieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1872"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1934"/> <source>Copy Commits (Quit)</source> <translation>Revisionen kopieren (Beenden)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1892"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1954"/> <source>Copy Commits (Cancel)</source> <translation>Revisionen kopieren (Abbrechen)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1911"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1973"/> <source>Save Stash</source> <translation>Ablage erstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1961"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2023"/> <source>Restore Stash</source> <translation>Ablage wiederherstellen</translation> </message> @@ -21930,7 +21983,7 @@ <translation><b>Aktuellste Marke zeigen</b><p>Dies zeigt die aktuellste Marke, die vom Arbeitsbereich erreichbar ist.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="672"/> <source><b>Quit Copying Session</b><p>This quits the current copying session.</p></source> <translation><b>Kopiersitzung beenden</b><p>Dies beendet die aktuelle Kopiersitzung.</p></translation> </message> @@ -21955,225 +22008,265 @@ <translation><b>Änderungen in Repository einpflegen</b><p>Dies pflegt Änderungen am lokalen Projekt in das Git-Repository ein.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1541"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1573"/> <source>Git</source> <translation>Git</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1147"/> <source>Check patch files</source> <translation>Patchdateien prüfen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1121"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1151"/> <source>Check a list of patch files, if they would apply cleanly</source> <translation>Prüfe eine Liste von Patchdateien, ob sie fehlerfrei angewendet werden können</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1124"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1154"/> <source><b>Check patch files</b><p>This checks a list of patch files, if they would apply cleanly.</p></source> <translation><b>Patchdateien prüfen</b><p>Dies prüft eine Liste von Patchdateien, ob sie fehlerfrei angewendet werden können.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2323"/> <source>Apply patch files</source> <translation>Patchdateien anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1166"/> <source>Apply a list of patch files</source> <translation>Wendet eine Liste von Patchdateien an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1139"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1169"/> <source><b>Apply patch files</b><p>This applies a list of patch files.</p></source> <translation><b>Patchdateien anwenden</b><p>Dies wendet eine Liste von Patchdateien an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1146"/> - <source>Show patch statistics</source> - <translation>Zeige Patch Statistiken</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1150"/> - <source>Show some statistics for a list of patch files</source> - <translation>Zeigt Statistiken für eine Liste von Patchdateien an</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1153"/> - <source><b>Show patch statistics</b><p>This shows some statistics for a list of patch files.</p></source> - <translation><b>Zeige Patch Statistiken</b><p>Dies zeigt Statistiken für eine Liste von Patchdateien an.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1371"/> - <source>Patch Management</source> - <translation>Verwaltung von Patches</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1165"/> - <source>Add a submodule to the current project</source> - <translation>Ein Submodule zum aktuellen Projekt hinzufügen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1168"/> - <source><b>Add</b><p>This adds a submodule to the current project.</p></source> - <translation><b>Hinzufügen</b><p>Dies fügt dem aktuellen Projekt ein Submodul hinzu.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1176"/> - <source>List</source> - <translation>Auflisten</translation> + <source>Show patch statistics</source> + <translation>Zeige Patch Statistiken</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1180"/> - <source>List the submodule of the current project</source> - <translation>Liste die Submodule des aktuellen Projektes auf</translation> + <source>Show some statistics for a list of patch files</source> + <translation>Zeigt Statistiken für eine Liste von Patchdateien an</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1183"/> - <source><b>List</b><p>This lists the submodules of the current project.</p></source> - <translation><b>Auflisten</b><p>Dies listet die Submodule des aktuellen Projektes auf.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1191"/> - <source>Initialize</source> - <translation>Initialisieren</translation> + <source><b>Show patch statistics</b><p>This shows some statistics for a list of patch files.</p></source> + <translation><b>Zeige Patch Statistiken</b><p>Dies zeigt Statistiken für eine Liste von Patchdateien an.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1401"/> + <source>Patch Management</source> + <translation>Verwaltung von Patches</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1195"/> - <source>Initialize the submodules of the current project</source> - <translation>Initialisiert die Submodule des aktuellen Projektes</translation> + <source>Add a submodule to the current project</source> + <translation>Ein Submodule zum aktuellen Projekt hinzufügen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1198"/> + <source><b>Add</b><p>This adds a submodule to the current project.</p></source> + <translation><b>Hinzufügen</b><p>Dies fügt dem aktuellen Projekt ein Submodul hinzu.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1206"/> + <source>List</source> + <translation>Auflisten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1210"/> + <source>List the submodule of the current project</source> + <translation>Liste die Submodule des aktuellen Projektes auf</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1213"/> + <source><b>List</b><p>This lists the submodules of the current project.</p></source> + <translation><b>Auflisten</b><p>Dies listet die Submodule des aktuellen Projektes auf.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1221"/> + <source>Initialize</source> + <translation>Initialisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1225"/> + <source>Initialize the submodules of the current project</source> + <translation>Initialisiert die Submodule des aktuellen Projektes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1228"/> <source><b>Initialize</b><p>This initializes the submodules of the current project.</p></source> <translation><b>Initialisieren</b><p>Dies initialisiert die Submodule des aktuellen Projektes.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1207"/> - <source>Unregister</source> - <translation>Deregistrieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1211"/> - <source>Unregister submodules of the current project</source> - <translation>Deregistriert Submodules des aktuellen Projektes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1214"/> - <source><b>Unregister</b><p>This unregisters submodules of the current project.</p></source> - <translation><b>Deregistrieren</b><p>Dies deregistriert Submodules des aktuellen Projektes.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1222"/> - <source>Update</source> - <translation>Aktualisieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1226"/> - <source>Update submodules of the current project</source> - <translation>Aktualisiert Submodule des aktuellen Projektes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1229"/> - <source><b>Update</b><p>This updates submodules of the current project.</p></source> - <translation><b>Aktualisieren</b><p>Dies aktualisiert Submodule des aktuellen Projektes.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1237"/> - <source>Initialize and Update</source> - <translation>Initialisieren und Aktualisieren</translation> + <source>Unregister</source> + <translation>Deregistrieren</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1241"/> - <source>Initialize and update submodules of the current project</source> - <translation>Initialisiert und aktualisiert Submodule des aktuellen Projektes</translation> + <source>Unregister submodules of the current project</source> + <translation>Deregistriert Submodules des aktuellen Projektes</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1244"/> + <source><b>Unregister</b><p>This unregisters submodules of the current project.</p></source> + <translation><b>Deregistrieren</b><p>Dies deregistriert Submodules des aktuellen Projektes.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1252"/> + <source>Update</source> + <translation>Aktualisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1256"/> + <source>Update submodules of the current project</source> + <translation>Aktualisiert Submodule des aktuellen Projektes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1259"/> + <source><b>Update</b><p>This updates submodules of the current project.</p></source> + <translation><b>Aktualisieren</b><p>Dies aktualisiert Submodule des aktuellen Projektes.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1267"/> + <source>Initialize and Update</source> + <translation>Initialisieren und Aktualisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1271"/> + <source>Initialize and update submodules of the current project</source> + <translation>Initialisiert und aktualisiert Submodule des aktuellen Projektes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1274"/> <source><b>Initialize and Update</b><p>This initializes and updates submodules of the current project.</p></source> <translation><b>Initialisieren und Aktualisieren</b><p>Dies initialisiert und aktualisiert Submodule des aktuellen Projektes.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1253"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1283"/> <source>Fetch and Update</source> <translation>Herunterladen und Aktualisieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1257"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1287"/> <source>Fetch and update submodules of the current project</source> <translation>Lädt Änderungen an Submodulen des aktuellen Projektes herunter und aktualisiert sie</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1260"/> - <source><b>Fetch and Update</b><p>This fetches and updates submodules of the current project.</p></source> - <translation><b>Herunterladen und Aktualisieren</b><p>Dies lädt Änderungen an Submodulen des aktuellen Projektes herunter und aktualisiert sie.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1269"/> - <source>Update with Options</source> - <translation>Aktualisieren (mit Optionen)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1273"/> - <source>Update submodules of the current project offering a dialog to enter options</source> - <translation>Aktualisiert Submodule des aktuellen Projektes mit Eingabemöglichkeit für Optionen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1277"/> - <source><b>Update with Options</b><p>This updates submodules of the current project offering a dialog to enter update options.</p></source> - <translation><b>Aktualisieren (mit Optionen)</b><p>Dies aktualisiert Submodule des aktuellen Projektes mit Eingabemöglichkeit für Optionen.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1286"/> - <source>Synchronize URLs</source> - <translation>URLs synchronisieren</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1290"/> + <source><b>Fetch and Update</b><p>This fetches and updates submodules of the current project.</p></source> + <translation><b>Herunterladen und Aktualisieren</b><p>Dies lädt Änderungen an Submodulen des aktuellen Projektes herunter und aktualisiert sie.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1299"/> + <source>Update with Options</source> + <translation>Aktualisieren (mit Optionen)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1303"/> + <source>Update submodules of the current project offering a dialog to enter options</source> + <translation>Aktualisiert Submodule des aktuellen Projektes mit Eingabemöglichkeit für Optionen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1307"/> + <source><b>Update with Options</b><p>This updates submodules of the current project offering a dialog to enter update options.</p></source> + <translation><b>Aktualisieren (mit Optionen)</b><p>Dies aktualisiert Submodule des aktuellen Projektes mit Eingabemöglichkeit für Optionen.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1316"/> + <source>Synchronize URLs</source> + <translation>URLs synchronisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1320"/> <source>Synchronize URLs of submodules of the current project</source> <translation>Synchronisiert URLs der Submodule des aktuellen Projektes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1293"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1323"/> <source><b>Synchronize URLs</b><p>This synchronizes URLs of submodules of the current project.</p></source> <translation><b>URLs synchronisieren</b><p>Dies synchronisiert URLs der Submodule des aktuellen Projektes.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1332"/> <source>Show Status</source> <translation>Status anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1306"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1336"/> <source>Show the status of submodules of the current project</source> <translation>Zeigt den Status der Submodule des aktuellen Projektes an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1339"/> <source><b>Show Status</b><p>This shows a dialog with the status of submodules of the current project.</p></source> <translation><b>Status anzeigen</b><p>Dies zeigt den Status der Submodule des aktuellen Projektes an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1318"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1348"/> <source>Show Summary</source> <translation>Übersicht anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1322"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1352"/> <source>Show summary information for submodules of the current project</source> <translation>Zeigt Übersichtsinformationen für Submodule des aktuellen Projektes an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1325"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1355"/> <source><b>Show Summary</b><p>This shows some summary information for submodules of the current project.</p></source> <translation><b>Übersicht anzeigen</b><p>Dies zeigt Übersichtsinformationen für Submodule des aktuellen Projektes an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1459"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1491"/> <source>Submodules</source> <translation>Submodule</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="604"/> + <source>Change URL</source> + <translation>URL ändern</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="604"/> + <source>Change URL...</source> + <translation>URL ändern...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="608"/> + <source>Change the URL of a remote repository</source> + <translation>Ändere die URL eines entfernten Repositories</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="611"/> + <source><b>Change URL</b><p>This changes the URL of a remote repository.</p></source> + <translation><b>URL ändern</b><p>Dies ändert die URL eines entfernten Repositories.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="618"/> + <source>Credentials</source> + <translation>Berechtigung</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="618"/> + <source>Credentials...</source> + <translation>Berechtigung...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="622"/> + <source>Change or set the user credentials of a remote repository</source> + <translation>Ändere oder setze die Nutzerparameter eines entfernten Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="625"/> + <source><b>Credentials</b><p>This changes or sets the user credentials of a remote repository.</p></source> + <translation><b>Berechtigung</b><p>Dies ändert oder setzt die Nutzerparameter eines entfernten Repository.</p></translation> + </message> </context> <context> <name>GitPullDialog</name> @@ -22475,6 +22568,49 @@ </message> </context> <context> + <name>GitRemoteCredentialsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="14"/> + <source>Git Remote Credentials</source> + <translation>Berechtigung für entferntes Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="23"/> + <source>Name:</source> + <translation>Name:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="40"/> + <source>URL:</source> + <translation>URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="57"/> + <source>Credentials</source> + <translation>Berechtigung</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="63"/> + <source>Username:</source> + <translation>Nutzername:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="70"/> + <source>Enter the user name for the remote repository</source> + <translation>Gib den Nutzernamen für das entfernte Repository ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="77"/> + <source>Password:</source> + <translation>Kennwort:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="87"/> + <source>Enter the password for the remote repository</source> + <translation>Gib das Kennwort für das entfernte Repository ein</translation> + </message> +</context> +<context> <name>GitRemoteRepositoriesDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="14"/> @@ -22519,92 +22655,92 @@ <translation>&Hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="159"/> <source>Press to rename the selected repository</source> <translation>Drücken, um das ausgewählte Repository umzubenennen</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="162"/> + <source>&Rename</source> + <translation>&Umbenennen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="92"/> + <source>Press to remove the selected repository</source> + <translation>Drücken, um das ausgewählte Repository zu entfernen</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="95"/> - <source>&Rename</source> - <translation>&Umbenennen</translation> + <source>Re&move</source> + <translation>&Entfernen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="102"/> - <source>Press to remove the selected repository</source> - <translation>Drücken, um das ausgewählte Repository zu entfernen</translation> + <source>Press to delete stale tracking branches under the selected repository </source> + <translation>Drücken, um lose Trackingzweige innerhalb des ausgewählten Repository zu löschen </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="105"/> - <source>Re&move</source> - <translation>&Entfernen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="112"/> - <source>Press to delete stale tracking branches under the selected repository </source> - <translation>Drücken, um lose Trackingzweige innerhalb des ausgewählten Repository zu löschen </translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="115"/> <source>&Prune</source> <translation>&Beschneiden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="129"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="119"/> <source>Press to show information about the selected repository</source> <translation>Drücken, um Informationen zum ausgewählten Repository anzuzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="132"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="122"/> <source>Show &Info...</source> <translation>&Informationen zeigen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="160"/> - <source>Errors</source> - <translation>Fehler</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="166"/> - <source><b>Git log errors</b><p>This shows possible error messages of the git log command.</p></source> - <translation><b>Git Protokoll-Fehler</b><p>Dies zeigt mögliche Fehlermeldungen des git-Befehls.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="182"/> - <source>Input</source> - <translation>Eingabe</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="204"/> - <source>Press to send the input to the git process</source> - <translation>Drücken um die Eingabe an den git-Prozess zu senden</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="207"/> - <source>&Send</source> - <translation>Sen&den</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="210"/> + <source>Errors</source> + <translation>Fehler</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="216"/> + <source><b>Git log errors</b><p>This shows possible error messages of the git log command.</p></source> + <translation><b>Git Protokoll-Fehler</b><p>Dies zeigt mögliche Fehlermeldungen des git-Befehls.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="232"/> + <source>Input</source> + <translation>Eingabe</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="254"/> + <source>Press to send the input to the git process</source> + <translation>Drücken um die Eingabe an den git-Prozess zu senden</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="257"/> + <source>&Send</source> + <translation>Sen&den</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="260"/> <source>Alt+S</source> <translation>Alt+D</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="267"/> <source>Enter data to be sent to the git process</source> <translation>Gib die Daten ein, die an den git-Prozess geschickt werden sollen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="224"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="274"/> <source>Select to switch the input field to password mode</source> <translation>Anwählen, um den Kennwortmodus für das Eingabefeld auszuwählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="227"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="277"/> <source>&Password Mode</source> <translation>&Kennwortmodus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="280"/> <source>Alt+P</source> <translation>Alt+K</translation> </message> @@ -22628,6 +22764,26 @@ <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="169"/> + <source>Press to change the URL of the selected repository</source> + <translation>Drücken, um die URL des ausgewählten Repository zu ändern</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="172"/> + <source>Change &URL</source> + <translation>UR&L ändern</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="179"/> + <source>Press to set or change the user credentials of the selected repository</source> + <translation>Drücken, um die Nutzerparameter des ausgewählten Repository zu ändern</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="182"/> + <source>&Credentials</source> + <translation>&Nutzerparameter</translation> + </message> </context> <context> <name>GitRevisionSelectionDialog</name>
--- a/i18n/eric6_empty.ts Sun Jun 03 11:30:57 2018 +0200 +++ b/i18n/eric6_empty.ts Sun Jun 03 14:03:19 2018 +0200 @@ -1471,7 +1471,7 @@ </message> <message> <location filename="../Utilities/BackgroundService.py" line="422"/> - <source>Erics background client disconnected because of an unknown reason.</source> + <source>Eric's background client disconnected because of an unknown reason.</source> <translation type="unfinished"></translation> </message> <message> @@ -17840,237 +17840,237 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2972"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3070"/> <source>Show Remote Info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> <source>Rename Remote Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> <source>Enter new name for remote repository:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2996"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3094"/> <source>Show Shortlog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3054"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3152"/> <source>Cherry-pick</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3084"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3182"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3109"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3207"/> <source>Copy Changesets (Quit)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3233"/> <source>Copy Changesets (Cancel)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3215"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3313"/> <source>Saving stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3414"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> <source>Show Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3414"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> <source>Select a stash (empty for latest stash):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3326"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3424"/> <source>Restore Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3340"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3438"/> <source>Restoring stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3374"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3472"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3364"/> - <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="3389"/> - <source>Creating branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3423"/> - <source>Delete Stash</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3423"/> - <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="3434"/> - <source>Deleting stash</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3454"/> - <source>Delete All Stashes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3454"/> - <source>Do you really want to delete all stashes?</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> - <source>Deleting all stashes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3534"/> - <source>Showing the combined configuration settings</source> + <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="3487"/> + <source>Creating branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <source>Delete Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <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="3532"/> + <source>Deleting stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <source>Delete All Stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <source>Do you really want to delete all stashes?</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3560"/> - <source>Verifying the integrity of the Git repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3585"/> - <source>Performing Repository Housekeeping</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3629"/> - <source><tr><td><b>Statistics</b></td></tr></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3630"/> - <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="3634"/> - <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="3638"/> - <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="3642"/> - <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="3646"/> - <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="3650"/> - <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="3654"/> - <source><tr><td>Garbage files: </td><td>{0}</td></tr></source> + <source>Deleting all stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3632"/> + <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3658"/> + <source>Verifying the integrity of the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3683"/> + <source>Performing Repository Housekeeping</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3727"/> + <source><tr><td><b>Statistics</b></td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3728"/> + <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="3732"/> + <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="3736"/> + <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="3740"/> + <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="3744"/> + <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="3748"/> + <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="3752"/> + <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="3756"/> <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="3664"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3762"/> <source><p><b>No statistics available.</b></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3730"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3828"/> <source>Creating Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3773"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3871"/> <source>Add Submodule</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> <source>List Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> <source>No submodules defined for the project.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3956"/> <source>All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> <source>Submodule Path</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> <source>Select a submodule path:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3914"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4012"/> <source>Initialize Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3951"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4049"/> <source>Unregister Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4031"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4129"/> <source>Update Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4065"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4163"/> <source>Synchronize Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4123"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4221"/> <source>Submodules Summary</source> <translation type="unfinished"></translation> </message> @@ -18102,6 +18102,31 @@ <source>Enter the remote URL</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="51"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="57"/> + <source>Username:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="64"/> + <source>Enter the user name for the remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="71"/> + <source>Password:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="81"/> + <source>Enter the password for the remote repository</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>GitApplyBundleDataDialog</name> @@ -18727,6 +18752,34 @@ </message> </context> <context> + <name>GitChangeRemoteUrlDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="14"/> + <source>Git Change Remote URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="40"/> + <source>URL:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="57"/> + <source>New URL:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="64"/> + <source>Enter the new remote URL</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GitCherryPickDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="14"/> @@ -20990,7 +21043,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1765"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1797"/> <source>Show Remote Info</source> <translation type="unfinished"></translation> </message> @@ -21005,7 +21058,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1161"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1191"/> <source>Add</source> <translation type="unfinished"></translation> </message> @@ -21025,7 +21078,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1785"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1817"/> <source>Remove</source> <translation type="unfinished"></translation> </message> @@ -21045,7 +21098,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1799"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1831"/> <source>Prune</source> <translation type="unfinished"></translation> </message> @@ -21065,7 +21118,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1874"/> <source>Rename</source> <translation type="unfinished"></translation> </message> @@ -21085,940 +21138,980 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1833"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1895"/> <source>Copy Commits</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="609"/> - <source>Copies commits into the current branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="612"/> - <source><b>Copy Commits</b><p>This copies commits on top of the current branch.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="619"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="623"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="626"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="635"/> - <source>Quit Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="639"/> - <source>Quit the current copying session</source> + <source>Copies commits into the current branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="642"/> - <source><b>Quit Copying Session</b><p>This quits the current copying session.</p></source> + <source><b>Copy Commits</b><p>This copies commits on top of the current branch.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="649"/> - <source>Cancel Copying Session</source> + <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="653"/> - <source>Cancel the current copying session and return to the previous state</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="657"/> - <source><b>Cancel Copying Session</b><p>This cancels the current copying session and returns to the previous state.</p></source> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="656"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="665"/> - <source>Stash changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="665"/> - <source>Stash changes...</source> + <source>Quit Copying Session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="669"/> - <source>Stash all current changes of the project</source> + <source>Quit the current copying session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="672"/> - <source><b>Stash changes</b><p>This stashes all current changes of the project.</p></source> + <source><b>Quit Copying Session</b><p>This quits the current copying session.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="679"/> - <source>Show stash browser</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="679"/> - <source>Show stash browser...</source> + <source>Cancel Copying Session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="683"/> - <source>Show a dialog with all stashes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="686"/> - <source><b>Show stash browser...</b><p>This shows a dialog listing all available stashes. Actions on these stashes may be executed via the context menu.</p></source> + <source>Cancel the current copying session and return to the previous state</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="687"/> + <source><b>Cancel Copying Session</b><p>This cancels the current copying session and returns to the previous state.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> - <source>Show stash</source> + <source>Stash changes</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> - <source>Show stash...</source> + <source>Stash changes...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="699"/> - <source>Show a dialog with a patch of a stash</source> + <source>Stash all current changes of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="702"/> + <source><b>Stash changes</b><p>This stashes all current changes of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="709"/> + <source>Show stash browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="709"/> + <source>Show stash browser...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="713"/> + <source>Show a dialog with all stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="716"/> + <source><b>Show stash browser...</b><p>This shows a dialog listing all available stashes. Actions on these stashes may be executed via the context menu.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="725"/> + <source>Show stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="725"/> + <source>Show stash...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="729"/> + <source>Show a dialog with a patch of a stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="732"/> <source><b>Show stash...</b><p>This shows a dialog with a patch of a selectable stash.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="710"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="740"/> <source>Restore && Keep</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="714"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="744"/> <source>Restore a stash but keep it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="717"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="747"/> <source><b>Restore &amp; Keep</b><p>This restores a selectable stash and keeps it.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="724"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="754"/> <source>Restore && Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="758"/> <source>Restore a stash and delete it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="731"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="761"/> <source><b>Restore &amp; Delete</b><p>This restores a selectable stash and deletes it.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1980"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2042"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="772"/> <source>Create a new branch and restore a stash into it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="745"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="775"/> <source><b>Create Branch</b><p>This creates a new branch and restores a stash into it.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="753"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="783"/> <source>Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="787"/> <source>Delete a stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="760"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="790"/> <source><b>Delete</b><p>This deletes a stash.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="767"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="797"/> <source>Delete All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="771"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="801"/> <source>Delete all stashes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="774"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="804"/> <source><b>Delete All</b><p>This deletes all stashes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="811"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="811"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="785"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="815"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="788"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="818"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="825"/> <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="825"/> <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="829"/> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="802"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="810"/> - <source>Create .gitignore</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="814"/> - <source>Create a .gitignore file with default values</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="817"/> - <source><b>Create .gitignore</b><p>This creates a .gitignore file with default values.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="824"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="824"/> - <source>Show combined configuration settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="828"/> - <source>Show the combined configuration settings from all configuration files</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="832"/> - <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="840"/> - <source>Verify repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="840"/> - <source>Verify repository...</source> + <source>Create .gitignore</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="844"/> - <source>Verify the connectivity and validity of objects of the database</source> + <source>Create a .gitignore file with default values</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="847"/> - <source><b>Verify repository</b><p>This verifies the connectivity and validity of objects of the database.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="855"/> - <source>Optimize repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="855"/> - <source>Optimize repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="859"/> - <source>Cleanup and optimize the local repository</source> + <source><b>Create .gitignore</b><p>This creates a .gitignore file with default values.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="854"/> + <source>Show combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="854"/> + <source>Show combined configuration settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="858"/> + <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="862"/> + <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="870"/> + <source>Verify repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="870"/> + <source>Verify repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="874"/> + <source>Verify the connectivity and validity of objects of the database</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="877"/> + <source><b>Verify repository</b><p>This verifies the connectivity and validity of objects of the database.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="885"/> + <source>Optimize repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="885"/> + <source>Optimize repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="889"/> + <source>Cleanup and optimize the local repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="892"/> <source><b>Optimize repository</b><p>This cleans up and optimizes the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="899"/> <source>Repository Statistics</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="899"/> <source>Repository Statistics...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="903"/> <source>Show some statistics of the local repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="876"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="906"/> <source><b>Repository Statistics</b><p>This show some statistics of the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="883"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="913"/> <source>Create Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="887"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="917"/> <source>Create an archive from the local repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="890"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="920"/> <source><b>Create Archive</b><p>This creates an archive from the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="897"/> - <source>Create bundle</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="897"/> - <source>Create bundle...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="901"/> - <source>Create bundle file collecting changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="904"/> - <source><b>Create bundle</b><p>This creates a bundle file collecting selected changesets (git bundle create).</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="912"/> - <source>Verify bundle</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="912"/> - <source>Verify bundle...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="916"/> - <source>Verify the validity and applicability of a bundle file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="919"/> - <source><b>Verify bundle</b><p>This verifies that a bundle file is valid and will apply cleanly.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> - <source>List bundle heads</source> + <source>Create bundle</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> - <source>List bundle heads...</source> + <source>Create bundle...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="931"/> - <source>List all heads contained in a bundle file</source> + <source>Create bundle file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="934"/> + <source><b>Create bundle</b><p>This creates a bundle file collecting selected changesets (git bundle create).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="942"/> + <source>Verify bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="942"/> + <source>Verify bundle...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="946"/> + <source>Verify the validity and applicability of a bundle file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="949"/> + <source><b>Verify bundle</b><p>This verifies that a bundle file is valid and will apply cleanly.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="957"/> + <source>List bundle heads</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="957"/> + <source>List bundle heads...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="961"/> + <source>List all heads contained in a bundle file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="964"/> <source><b>List bundle heads</b><p>This lists all heads contained in a bundle file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="971"/> <source>Apply Bundle (fetch)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="971"/> <source>Apply Bundle (fetch)...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="945"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="975"/> <source>Apply a head of a bundle file using fetch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="948"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="978"/> <source><b>Apply Bundle (fetch)</b><p>This applies a head of a bundle file using fetch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2097"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2159"/> <source>Apply Bundle (pull)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="955"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="985"/> <source>Apply Bundle (pull)...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="959"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="989"/> <source>Apply a head of a bundle file using pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="962"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="992"/> <source><b>Apply Bundle (pull)</b><p>This applies a head of a bundle file using pull.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="969"/> - <source>Start</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="973"/> - <source>Start a bisect session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="976"/> - <source><b>Start</b><p>This starts a bisect session.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="983"/> - <source>Start (Extended)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="987"/> - <source>Start a bisect session giving a bad and optionally good commits</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="990"/> - <source><b>Start (Extended)</b><p>This starts a bisect session giving a bad and optionally good commits.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="999"/> - <source>Mark as "good"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="999"/> - <source>Mark as "good"...</source> + <source>Start</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1003"/> - <source>Mark a selectable revision as good</source> + <source>Start a bisect session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1006"/> - <source><b>Mark as "good"</b><p>This marks a selectable revision as good.</p></source> + <source><b>Start</b><p>This starts a bisect session.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1013"/> - <source>Mark as "bad"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1013"/> - <source>Mark as "bad"...</source> + <source>Start (Extended)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1017"/> - <source>Mark a selectable revision as bad</source> + <source>Start a bisect session giving a bad and optionally good commits</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1020"/> + <source><b>Start (Extended)</b><p>This starts a bisect session giving a bad and optionally good commits.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1029"/> + <source>Mark as "good"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1029"/> + <source>Mark as "good"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1033"/> + <source>Mark a selectable revision as good</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1036"/> + <source><b>Mark as "good"</b><p>This marks a selectable revision as good.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1043"/> + <source>Mark as "bad"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1043"/> + <source>Mark as "bad"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1047"/> + <source>Mark a selectable revision as bad</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1050"/> <source><b>Mark as "bad"</b><p>This marks a selectable revision as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1057"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1057"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1031"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1061"/> <source>Skip a selectable revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1064"/> <source><b>Skip</b><p>This skips a selectable revision.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1071"/> <source>Reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1071"/> <source>Reset...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1075"/> <source>Reset the bisect session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1078"/> <source><b>Reset</b><p>This resets the bisect session.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1055"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1085"/> <source>Show bisect log browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1090"/> <source>Show a dialog to browse the bisect log of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1063"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1093"/> <source><b>Show bisect log browser</b><p>This shows a dialog to browse the bisect log of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1072"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1102"/> <source>Create replay file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1106"/> <source>Create a replay file to repeat the current bisect session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1109"/> <source><b>Create replay file</b><p>This creates a replay file to repeat the current bisect session.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1088"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1118"/> <source>Edit replay file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1092"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1122"/> <source>Edit a bisect replay file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1095"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1125"/> <source><b>Edit replay file</b><p>This edits a bisect replay file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1133"/> <source>Replay session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1107"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1137"/> <source>Replay a bisect session from file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1110"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1140"/> <source><b>Replay session</b><p>This replays a bisect session from file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1147"/> <source>Check patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1121"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1151"/> <source>Check a list of patch files, if they would apply cleanly</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1124"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1154"/> <source><b>Check patch files</b><p>This checks a list of patch files, if they would apply cleanly.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2323"/> <source>Apply patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1166"/> <source>Apply a list of patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1139"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1169"/> <source><b>Apply patch files</b><p>This applies a list of patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1146"/> - <source>Show patch statistics</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1150"/> - <source>Show some statistics for a list of patch files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1153"/> - <source><b>Show patch statistics</b><p>This shows some statistics for a list of patch files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1165"/> - <source>Add a submodule to the current project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1168"/> - <source><b>Add</b><p>This adds a submodule to the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1176"/> - <source>List</source> + <source>Show patch statistics</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1180"/> - <source>List the submodule of the current project</source> + <source>Show some statistics for a list of patch files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1183"/> - <source><b>List</b><p>This lists the submodules of the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1191"/> - <source>Initialize</source> + <source><b>Show patch statistics</b><p>This shows some statistics for a list of patch files.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1195"/> - <source>Initialize the submodules of the current project</source> + <source>Add a submodule to the current project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1198"/> + <source><b>Add</b><p>This adds a submodule to the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1206"/> + <source>List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1210"/> + <source>List the submodule of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1213"/> + <source><b>List</b><p>This lists the submodules of the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1221"/> + <source>Initialize</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1225"/> + <source>Initialize the submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1228"/> <source><b>Initialize</b><p>This initializes the submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1207"/> - <source>Unregister</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1211"/> - <source>Unregister submodules of the current project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1214"/> - <source><b>Unregister</b><p>This unregisters submodules of the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1222"/> - <source>Update</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1226"/> - <source>Update submodules of the current project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1229"/> - <source><b>Update</b><p>This updates submodules of the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1237"/> - <source>Initialize and Update</source> + <source>Unregister</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1241"/> - <source>Initialize and update submodules of the current project</source> + <source>Unregister submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1244"/> + <source><b>Unregister</b><p>This unregisters submodules of the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1252"/> + <source>Update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1256"/> + <source>Update submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1259"/> + <source><b>Update</b><p>This updates submodules of the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1267"/> + <source>Initialize and Update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1271"/> + <source>Initialize and update submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1274"/> <source><b>Initialize and Update</b><p>This initializes and updates submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1253"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1283"/> <source>Fetch and Update</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1257"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1287"/> <source>Fetch and update submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1260"/> - <source><b>Fetch and Update</b><p>This fetches and updates submodules of the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1269"/> - <source>Update with Options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1273"/> - <source>Update submodules of the current project offering a dialog to enter options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1277"/> - <source><b>Update with Options</b><p>This updates submodules of the current project offering a dialog to enter update options.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1286"/> - <source>Synchronize URLs</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1290"/> + <source><b>Fetch and Update</b><p>This fetches and updates submodules of the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1299"/> + <source>Update with Options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1303"/> + <source>Update submodules of the current project offering a dialog to enter options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1307"/> + <source><b>Update with Options</b><p>This updates submodules of the current project offering a dialog to enter update options.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1316"/> + <source>Synchronize URLs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1320"/> <source>Synchronize URLs of submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1293"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1323"/> <source><b>Synchronize URLs</b><p>This synchronizes URLs of submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1332"/> <source>Show Status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1306"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1336"/> <source>Show the status of submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1339"/> <source><b>Show Status</b><p>This shows a dialog with the status of submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1318"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1348"/> <source>Show Summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1322"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1352"/> <source>Show summary information for submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1325"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1355"/> <source><b>Show Summary</b><p>This shows some summary information for submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1344"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1374"/> <source>Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1360"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1390"/> <source>Bundle Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1401"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2237"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2299"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1397"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1427"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1405"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1435"/> <source>Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1418"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1448"/> <source>Manage Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1426"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1456"/> <source>Remote Repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1436"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1468"/> <source>Cherry-pick</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1444"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1476"/> <source>Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1459"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1491"/> <source>Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1541"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1573"/> <source>Git</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1646"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1678"/> <source>Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2323"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1690"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1722"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1715"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1747"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1734"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1766"/> <source>Unstage Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1874"/> <source>Select a remote repository:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1853"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1915"/> <source>Copy Commits (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1872"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1934"/> <source>Copy Commits (Quit)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1892"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1954"/> <source>Copy Commits (Cancel)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1911"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1973"/> <source>Save Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1961"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2023"/> <source>Restore Stash</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="604"/> + <source>Change URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="604"/> + <source>Change URL...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="608"/> + <source>Change the URL of a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="611"/> + <source><b>Change URL</b><p>This changes the URL of a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="618"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="618"/> + <source>Credentials...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="622"/> + <source>Change or set the user credentials of a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="625"/> + <source><b>Credentials</b><p>This changes or sets the user credentials of a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>GitPullDialog</name> @@ -22320,6 +22413,49 @@ </message> </context> <context> + <name>GitRemoteCredentialsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="14"/> + <source>Git Remote Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="40"/> + <source>URL:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="57"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="63"/> + <source>Username:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="70"/> + <source>Enter the user name for the remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="77"/> + <source>Password:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="87"/> + <source>Enter the password for the remote repository</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GitRemoteRepositoriesDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="14"/> @@ -22363,92 +22499,92 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="159"/> + <source>Press to rename the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="162"/> + <source>&Rename</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="92"/> - <source>Press to rename the selected repository</source> + <source>Press to remove the selected repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="95"/> - <source>&Rename</source> + <source>Re&move</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="102"/> - <source>Press to remove the selected repository</source> + <source>Press to delete stale tracking branches under the selected repository </source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="105"/> - <source>Re&move</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="112"/> - <source>Press to delete stale tracking branches under the selected repository </source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="115"/> <source>&Prune</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="129"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="119"/> <source>Press to show information about the selected repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="132"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="122"/> <source>Show &Info...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="160"/> - <source>Errors</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="166"/> - <source><b>Git log errors</b><p>This shows possible error messages of the git log command.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="182"/> - <source>Input</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="204"/> - <source>Press to send the input to the git process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="207"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="210"/> + <source>Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="216"/> + <source><b>Git log errors</b><p>This shows possible error messages of the git log command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="232"/> + <source>Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="254"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="257"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="260"/> <source>Alt+S</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="267"/> <source>Enter data to be sent to the git process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="224"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="274"/> <source>Select to switch the input field to password mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="227"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="277"/> <source>&Password Mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="280"/> <source>Alt+P</source> <translation type="unfinished"></translation> </message> @@ -22472,6 +22608,26 @@ <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/GitRemoteRepositoriesDialog.ui" line="169"/> + <source>Press to change the URL of the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="172"/> + <source>Change &URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="179"/> + <source>Press to set or change the user credentials of the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="182"/> + <source>&Credentials</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>GitRevisionSelectionDialog</name>
--- a/i18n/eric6_en.ts Sun Jun 03 11:30:57 2018 +0200 +++ b/i18n/eric6_en.ts Sun Jun 03 14:03:19 2018 +0200 @@ -1466,7 +1466,7 @@ </message> <message> <location filename="../Utilities/BackgroundService.py" line="422"/> - <source>Erics background client disconnected because of an unknown reason.</source> + <source>Eric's background client disconnected because of an unknown reason.</source> <translation type="unfinished"></translation> </message> <message> @@ -17834,182 +17834,182 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2972"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3070"/> <source>Show Remote Info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> <source>Rename Remote Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> <source>Enter new name for remote repository:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2996"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3094"/> <source>Show Shortlog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3054"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3152"/> <source>Cherry-pick</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3084"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3182"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3109"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3207"/> <source>Copy Changesets (Quit)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3233"/> <source>Copy Changesets (Cancel)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3215"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3313"/> <source>Saving stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3414"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> <source>Show Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3414"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> <source>Select a stash (empty for latest stash):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3326"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3424"/> <source>Restore Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3340"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3438"/> <source>Restoring stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3374"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3472"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3364"/> - <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="3389"/> - <source>Creating branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3423"/> - <source>Delete Stash</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3423"/> - <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="3434"/> - <source>Deleting stash</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3454"/> - <source>Delete All Stashes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3454"/> - <source>Do you really want to delete all stashes?</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> - <source>Deleting all stashes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3534"/> - <source>Showing the combined configuration settings</source> + <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="3487"/> + <source>Creating branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <source>Delete Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <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="3532"/> + <source>Deleting stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <source>Delete All Stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <source>Do you really want to delete all stashes?</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3560"/> - <source>Verifying the integrity of the Git repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3585"/> - <source>Performing Repository Housekeeping</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3629"/> - <source><tr><td><b>Statistics</b></td></tr></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3630"/> - <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="3634"/> - <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="3638"/> - <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="3642"/> - <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="3646"/> - <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="3650"/> - <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="3654"/> - <source><tr><td>Garbage files: </td><td>{0}</td></tr></source> + <source>Deleting all stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3632"/> + <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3658"/> + <source>Verifying the integrity of the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3683"/> + <source>Performing Repository Housekeeping</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3727"/> + <source><tr><td><b>Statistics</b></td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3728"/> + <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="3732"/> + <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="3736"/> + <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="3740"/> + <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="3744"/> + <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="3748"/> + <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="3752"/> + <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="3756"/> <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="3664"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3762"/> <source><p><b>No statistics available.</b></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3730"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3828"/> <source>Creating Archive</source> <translation type="unfinished"></translation> </message> @@ -18039,57 +18039,57 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3773"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3871"/> <source>Add Submodule</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> <source>List Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> <source>No submodules defined for the project.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3956"/> <source>All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> <source>Submodule Path</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> <source>Select a submodule path:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3914"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4012"/> <source>Initialize Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3951"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4049"/> <source>Unregister Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4031"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4129"/> <source>Update Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4065"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4163"/> <source>Synchronize Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4123"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4221"/> <source>Submodules Summary</source> <translation type="unfinished"></translation> </message> @@ -18121,6 +18121,31 @@ <source>Enter the remote URL</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="51"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="57"/> + <source>Username:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="64"/> + <source>Enter the user name for the remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="71"/> + <source>Password:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="81"/> + <source>Enter the password for the remote repository</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>GitApplyBundleDataDialog</name> @@ -18746,6 +18771,34 @@ </message> </context> <context> + <name>GitChangeRemoteUrlDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="14"/> + <source>Git Change Remote URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="40"/> + <source>URL:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="57"/> + <source>New URL:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="64"/> + <source>Enter the new remote URL</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GitCherryPickDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="14"/> @@ -20984,7 +21037,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1765"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1797"/> <source>Show Remote Info</source> <translation type="unfinished"></translation> </message> @@ -20999,7 +21052,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1161"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1191"/> <source>Add</source> <translation type="unfinished"></translation> </message> @@ -21019,7 +21072,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1785"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1817"/> <source>Remove</source> <translation type="unfinished"></translation> </message> @@ -21039,7 +21092,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1799"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1831"/> <source>Prune</source> <translation type="unfinished"></translation> </message> @@ -21059,7 +21112,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1874"/> <source>Rename</source> <translation type="unfinished"></translation> </message> @@ -21079,712 +21132,712 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1833"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1895"/> <source>Copy Commits</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="609"/> - <source>Copies commits into the current branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="612"/> - <source><b>Copy Commits</b><p>This copies commits on top of the current branch.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="619"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="623"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="626"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="635"/> - <source>Quit Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="639"/> - <source>Quit the current copying session</source> + <source>Copies commits into the current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="642"/> + <source><b>Copy Commits</b><p>This copies commits on top of the current branch.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="649"/> - <source>Cancel Copying Session</source> + <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="653"/> - <source>Cancel the current copying session and return to the previous state</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="657"/> - <source><b>Cancel Copying Session</b><p>This cancels the current copying session and returns to the previous state.</p></source> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="656"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="665"/> - <source>Stash changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="665"/> - <source>Stash changes...</source> + <source>Quit Copying Session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="669"/> - <source>Stash all current changes of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="672"/> - <source><b>Stash changes</b><p>This stashes all current changes of the project.</p></source> + <source>Quit the current copying session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="679"/> - <source>Show stash browser</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="679"/> - <source>Show stash browser...</source> + <source>Cancel Copying Session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="683"/> - <source>Show a dialog with all stashes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="686"/> - <source><b>Show stash browser...</b><p>This shows a dialog listing all available stashes. Actions on these stashes may be executed via the context menu.</p></source> + <source>Cancel the current copying session and return to the previous state</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="687"/> + <source><b>Cancel Copying Session</b><p>This cancels the current copying session and returns to the previous state.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> - <source>Show stash</source> + <source>Stash changes</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> - <source>Show stash...</source> + <source>Stash changes...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="699"/> - <source>Show a dialog with a patch of a stash</source> + <source>Stash all current changes of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="702"/> + <source><b>Stash changes</b><p>This stashes all current changes of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="709"/> + <source>Show stash browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="709"/> + <source>Show stash browser...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="713"/> + <source>Show a dialog with all stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="716"/> + <source><b>Show stash browser...</b><p>This shows a dialog listing all available stashes. Actions on these stashes may be executed via the context menu.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="725"/> + <source>Show stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="725"/> + <source>Show stash...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="729"/> + <source>Show a dialog with a patch of a stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="732"/> <source><b>Show stash...</b><p>This shows a dialog with a patch of a selectable stash.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="710"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="740"/> <source>Restore && Keep</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="714"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="744"/> <source>Restore a stash but keep it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="717"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="747"/> <source><b>Restore &amp; Keep</b><p>This restores a selectable stash and keeps it.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="724"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="754"/> <source>Restore && Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="758"/> <source>Restore a stash and delete it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="731"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="761"/> <source><b>Restore &amp; Delete</b><p>This restores a selectable stash and deletes it.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1980"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2042"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="772"/> <source>Create a new branch and restore a stash into it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="745"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="775"/> <source><b>Create Branch</b><p>This creates a new branch and restores a stash into it.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="753"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="783"/> <source>Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="787"/> <source>Delete a stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="760"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="790"/> <source><b>Delete</b><p>This deletes a stash.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="767"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="797"/> <source>Delete All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="771"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="801"/> <source>Delete all stashes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="774"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="804"/> <source><b>Delete All</b><p>This deletes all stashes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="811"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="811"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="785"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="815"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="788"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="818"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="825"/> <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="825"/> <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="829"/> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="802"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="810"/> - <source>Create .gitignore</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="814"/> - <source>Create a .gitignore file with default values</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="817"/> - <source><b>Create .gitignore</b><p>This creates a .gitignore file with default values.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="824"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="824"/> - <source>Show combined configuration settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="828"/> - <source>Show the combined configuration settings from all configuration files</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="832"/> - <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="840"/> - <source>Verify repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="840"/> - <source>Verify repository...</source> + <source>Create .gitignore</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="844"/> - <source>Verify the connectivity and validity of objects of the database</source> + <source>Create a .gitignore file with default values</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="847"/> - <source><b>Verify repository</b><p>This verifies the connectivity and validity of objects of the database.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="855"/> - <source>Optimize repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="855"/> - <source>Optimize repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="859"/> - <source>Cleanup and optimize the local repository</source> + <source><b>Create .gitignore</b><p>This creates a .gitignore file with default values.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="854"/> + <source>Show combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="854"/> + <source>Show combined configuration settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="858"/> + <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="862"/> + <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="870"/> + <source>Verify repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="870"/> + <source>Verify repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="874"/> + <source>Verify the connectivity and validity of objects of the database</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="877"/> + <source><b>Verify repository</b><p>This verifies the connectivity and validity of objects of the database.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="885"/> + <source>Optimize repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="885"/> + <source>Optimize repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="889"/> + <source>Cleanup and optimize the local repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="892"/> <source><b>Optimize repository</b><p>This cleans up and optimizes the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="899"/> <source>Repository Statistics</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="899"/> <source>Repository Statistics...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="903"/> <source>Show some statistics of the local repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="876"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="906"/> <source><b>Repository Statistics</b><p>This show some statistics of the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="883"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="913"/> <source>Create Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="887"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="917"/> <source>Create an archive from the local repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="890"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="920"/> <source><b>Create Archive</b><p>This creates an archive from the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="897"/> - <source>Create bundle</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="897"/> - <source>Create bundle...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="901"/> - <source>Create bundle file collecting changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="904"/> - <source><b>Create bundle</b><p>This creates a bundle file collecting selected changesets (git bundle create).</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="912"/> - <source>Verify bundle</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="912"/> - <source>Verify bundle...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="916"/> - <source>Verify the validity and applicability of a bundle file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="919"/> - <source><b>Verify bundle</b><p>This verifies that a bundle file is valid and will apply cleanly.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> - <source>List bundle heads</source> + <source>Create bundle</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> - <source>List bundle heads...</source> + <source>Create bundle...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="931"/> - <source>List all heads contained in a bundle file</source> + <source>Create bundle file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="934"/> + <source><b>Create bundle</b><p>This creates a bundle file collecting selected changesets (git bundle create).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="942"/> + <source>Verify bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="942"/> + <source>Verify bundle...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="946"/> + <source>Verify the validity and applicability of a bundle file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="949"/> + <source><b>Verify bundle</b><p>This verifies that a bundle file is valid and will apply cleanly.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="957"/> + <source>List bundle heads</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="957"/> + <source>List bundle heads...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="961"/> + <source>List all heads contained in a bundle file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="964"/> <source><b>List bundle heads</b><p>This lists all heads contained in a bundle file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="971"/> <source>Apply Bundle (fetch)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="971"/> <source>Apply Bundle (fetch)...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="945"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="975"/> <source>Apply a head of a bundle file using fetch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="948"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="978"/> <source><b>Apply Bundle (fetch)</b><p>This applies a head of a bundle file using fetch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2097"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2159"/> <source>Apply Bundle (pull)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="955"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="985"/> <source>Apply Bundle (pull)...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="959"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="989"/> <source>Apply a head of a bundle file using pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="962"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="992"/> <source><b>Apply Bundle (pull)</b><p>This applies a head of a bundle file using pull.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="969"/> - <source>Start</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="973"/> - <source>Start a bisect session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="976"/> - <source><b>Start</b><p>This starts a bisect session.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="983"/> - <source>Start (Extended)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="987"/> - <source>Start a bisect session giving a bad and optionally good commits</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="990"/> - <source><b>Start (Extended)</b><p>This starts a bisect session giving a bad and optionally good commits.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="999"/> - <source>Mark as "good"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="999"/> - <source>Mark as "good"...</source> + <source>Start</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1003"/> - <source>Mark a selectable revision as good</source> + <source>Start a bisect session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1006"/> - <source><b>Mark as "good"</b><p>This marks a selectable revision as good.</p></source> + <source><b>Start</b><p>This starts a bisect session.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1013"/> - <source>Mark as "bad"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1013"/> - <source>Mark as "bad"...</source> + <source>Start (Extended)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1017"/> - <source>Mark a selectable revision as bad</source> + <source>Start a bisect session giving a bad and optionally good commits</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1020"/> + <source><b>Start (Extended)</b><p>This starts a bisect session giving a bad and optionally good commits.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1029"/> + <source>Mark as "good"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1029"/> + <source>Mark as "good"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1033"/> + <source>Mark a selectable revision as good</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1036"/> + <source><b>Mark as "good"</b><p>This marks a selectable revision as good.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1043"/> + <source>Mark as "bad"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1043"/> + <source>Mark as "bad"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1047"/> + <source>Mark a selectable revision as bad</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1050"/> <source><b>Mark as "bad"</b><p>This marks a selectable revision as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1057"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1057"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1031"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1061"/> <source>Skip a selectable revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1064"/> <source><b>Skip</b><p>This skips a selectable revision.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1071"/> <source>Reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1071"/> <source>Reset...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1075"/> <source>Reset the bisect session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1078"/> <source><b>Reset</b><p>This resets the bisect session.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1055"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1085"/> <source>Show bisect log browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1090"/> <source>Show a dialog to browse the bisect log of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1063"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1093"/> <source><b>Show bisect log browser</b><p>This shows a dialog to browse the bisect log of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1072"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1102"/> <source>Create replay file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1106"/> <source>Create a replay file to repeat the current bisect session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1109"/> <source><b>Create replay file</b><p>This creates a replay file to repeat the current bisect session.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1088"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1118"/> <source>Edit replay file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1092"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1122"/> <source>Edit a bisect replay file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1095"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1125"/> <source><b>Edit replay file</b><p>This edits a bisect replay file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1133"/> <source>Replay session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1107"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1137"/> <source>Replay a bisect session from file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1110"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1140"/> <source><b>Replay session</b><p>This replays a bisect session from file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1344"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1374"/> <source>Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1360"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1390"/> <source>Bundle Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1690"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1722"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2237"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2299"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1397"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1427"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1405"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1435"/> <source>Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1418"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1448"/> <source>Manage Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1426"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1456"/> <source>Remote Repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1436"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1468"/> <source>Cherry-pick</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1444"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1476"/> <source>Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1646"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1678"/> <source>Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2323"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1715"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1747"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1734"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1766"/> <source>Unstage Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1874"/> <source>Select a remote repository:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1853"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1915"/> <source>Copy Commits (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1872"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1934"/> <source>Copy Commits (Quit)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1892"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1954"/> <source>Copy Commits (Cancel)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1911"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1973"/> <source>Save Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1961"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2023"/> <source>Restore Stash</source> <translation type="unfinished"></translation> </message> @@ -21794,7 +21847,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="672"/> <source><b>Quit Copying Session</b><p>This quits the current copying session.</p></source> <translation type="unfinished"></translation> </message> @@ -21819,225 +21872,265 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1541"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1573"/> <source>Git</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1147"/> <source>Check patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1121"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1151"/> <source>Check a list of patch files, if they would apply cleanly</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1124"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1154"/> <source><b>Check patch files</b><p>This checks a list of patch files, if they would apply cleanly.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2323"/> <source>Apply patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1166"/> <source>Apply a list of patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1139"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1169"/> <source><b>Apply patch files</b><p>This applies a list of patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1146"/> - <source>Show patch statistics</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1150"/> - <source>Show some statistics for a list of patch files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1153"/> - <source><b>Show patch statistics</b><p>This shows some statistics for a list of patch files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1371"/> - <source>Patch Management</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1165"/> - <source>Add a submodule to the current project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1168"/> - <source><b>Add</b><p>This adds a submodule to the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1176"/> - <source>List</source> + <source>Show patch statistics</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1180"/> - <source>List the submodule of the current project</source> + <source>Show some statistics for a list of patch files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1183"/> - <source><b>List</b><p>This lists the submodules of the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1191"/> - <source>Initialize</source> + <source><b>Show patch statistics</b><p>This shows some statistics for a list of patch files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1401"/> + <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1195"/> - <source>Initialize the submodules of the current project</source> + <source>Add a submodule to the current project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1198"/> + <source><b>Add</b><p>This adds a submodule to the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1206"/> + <source>List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1210"/> + <source>List the submodule of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1213"/> + <source><b>List</b><p>This lists the submodules of the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1221"/> + <source>Initialize</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1225"/> + <source>Initialize the submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1228"/> <source><b>Initialize</b><p>This initializes the submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1207"/> - <source>Unregister</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1211"/> - <source>Unregister submodules of the current project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1214"/> - <source><b>Unregister</b><p>This unregisters submodules of the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1222"/> - <source>Update</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1226"/> - <source>Update submodules of the current project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1229"/> - <source><b>Update</b><p>This updates submodules of the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1237"/> - <source>Initialize and Update</source> + <source>Unregister</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1241"/> - <source>Initialize and update submodules of the current project</source> + <source>Unregister submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1244"/> + <source><b>Unregister</b><p>This unregisters submodules of the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1252"/> + <source>Update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1256"/> + <source>Update submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1259"/> + <source><b>Update</b><p>This updates submodules of the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1267"/> + <source>Initialize and Update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1271"/> + <source>Initialize and update submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1274"/> <source><b>Initialize and Update</b><p>This initializes and updates submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1253"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1283"/> <source>Fetch and Update</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1257"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1287"/> <source>Fetch and update submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1260"/> - <source><b>Fetch and Update</b><p>This fetches and updates submodules of the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1269"/> - <source>Update with Options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1273"/> - <source>Update submodules of the current project offering a dialog to enter options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1277"/> - <source><b>Update with Options</b><p>This updates submodules of the current project offering a dialog to enter update options.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1286"/> - <source>Synchronize URLs</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1290"/> + <source><b>Fetch and Update</b><p>This fetches and updates submodules of the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1299"/> + <source>Update with Options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1303"/> + <source>Update submodules of the current project offering a dialog to enter options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1307"/> + <source><b>Update with Options</b><p>This updates submodules of the current project offering a dialog to enter update options.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1316"/> + <source>Synchronize URLs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1320"/> <source>Synchronize URLs of submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1293"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1323"/> <source><b>Synchronize URLs</b><p>This synchronizes URLs of submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1332"/> <source>Show Status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1306"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1336"/> <source>Show the status of submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1339"/> <source><b>Show Status</b><p>This shows a dialog with the status of submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1318"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1348"/> <source>Show Summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1322"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1352"/> <source>Show summary information for submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1325"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1355"/> <source><b>Show Summary</b><p>This shows some summary information for submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1459"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1491"/> <source>Submodules</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="604"/> + <source>Change URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="604"/> + <source>Change URL...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="608"/> + <source>Change the URL of a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="611"/> + <source><b>Change URL</b><p>This changes the URL of a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="618"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="618"/> + <source>Credentials...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="622"/> + <source>Change or set the user credentials of a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="625"/> + <source><b>Credentials</b><p>This changes or sets the user credentials of a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>GitPullDialog</name> @@ -22339,6 +22432,49 @@ </message> </context> <context> + <name>GitRemoteCredentialsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="14"/> + <source>Git Remote Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="40"/> + <source>URL:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="57"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="63"/> + <source>Username:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="70"/> + <source>Enter the user name for the remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="77"/> + <source>Password:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="87"/> + <source>Enter the password for the remote repository</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GitRemoteRepositoriesDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="14"/> @@ -22382,92 +22518,92 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="159"/> + <source>Press to rename the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="162"/> + <source>&Rename</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="92"/> - <source>Press to rename the selected repository</source> + <source>Press to remove the selected repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="95"/> - <source>&Rename</source> + <source>Re&move</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="102"/> - <source>Press to remove the selected repository</source> + <source>Press to delete stale tracking branches under the selected repository </source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="105"/> - <source>Re&move</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="112"/> - <source>Press to delete stale tracking branches under the selected repository </source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="115"/> <source>&Prune</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="129"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="119"/> <source>Press to show information about the selected repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="132"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="122"/> <source>Show &Info...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="160"/> - <source>Errors</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="166"/> - <source><b>Git log errors</b><p>This shows possible error messages of the git log command.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="182"/> - <source>Input</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="204"/> - <source>Press to send the input to the git process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="207"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="210"/> + <source>Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="216"/> + <source><b>Git log errors</b><p>This shows possible error messages of the git log command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="232"/> + <source>Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="254"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="257"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="260"/> <source>Alt+S</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="267"/> <source>Enter data to be sent to the git process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="224"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="274"/> <source>Select to switch the input field to password mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="227"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="277"/> <source>&Password Mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="280"/> <source>Alt+P</source> <translation type="unfinished"></translation> </message> @@ -22491,6 +22627,26 @@ <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/GitRemoteRepositoriesDialog.ui" line="169"/> + <source>Press to change the URL of the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="172"/> + <source>Change &URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="179"/> + <source>Press to set or change the user credentials of the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="182"/> + <source>&Credentials</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>GitRevisionSelectionDialog</name>
--- a/i18n/eric6_es.ts Sun Jun 03 11:30:57 2018 +0200 +++ b/i18n/eric6_es.ts Sun Jun 03 14:03:19 2018 +0200 @@ -1479,8 +1479,8 @@ </message> <message> <location filename="../Utilities/BackgroundService.py" line="422"/> - <source>Erics background client disconnected because of an unknown reason.</source> - <translation>El cliente en background de Eric ha desconectado debido a una razón desconocida.</translation> + <source>Eric's background client disconnected because of an unknown reason.</source> + <translation type="unfinished">El cliente en background de Eric ha desconectado debido a una razón desconocida.</translation> </message> <message> <location filename="../Utilities/BackgroundService.py" line="211"/> @@ -17953,182 +17953,182 @@ <translation>Repetir Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2972"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3070"/> <source>Show Remote Info</source> <translation>Mostrar Info Remota</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> <source>Rename Remote Repository</source> <translation>Renombrar Repositorio Remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> <source>Enter new name for remote repository:</source> <translation>Introducir el nuevo nombre para el repositorio remoto:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2996"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3094"/> <source>Show Shortlog</source> <translation>Mostrar Shortlog</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3054"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3152"/> <source>Cherry-pick</source> <translation>Cherry-pick</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3084"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3182"/> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3109"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3207"/> <source>Copy Changesets (Quit)</source> <translation>Copiar Changesets (Salir)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3233"/> <source>Copy Changesets (Cancel)</source> <translation>Copiar Changesets (Cancelar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3215"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3313"/> <source>Saving stash</source> <translation>Guardando stash (guardado rápido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3414"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> <source>Show Stash</source> <translation>Mostrar Stash</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3414"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> <source>Select a stash (empty for latest stash):</source> <translation>Seleccionar un stash (dejar en blanco para el último stash):</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3326"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3424"/> <source>Restore Stash</source> <translation>Restaurar Stash</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3340"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3438"/> <source>Restoring stash</source> <translation>Restaurando Stash</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3374"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3472"/> <source>Create Branch</source> <translation>Crear Branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3364"/> - <source>Enter a branch name to restore a stash to:</source> - <translation>Introducir un nombre de branch sobre la que restaurar un stash:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3389"/> - <source>Creating branch</source> - <translation>Creando branch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3423"/> - <source>Delete Stash</source> - <translation>Borrar Stash</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3423"/> - <source>Do you really want to delete the stash <b>{0}</b>?</source> - <translation>¿Desea realmente borrar el stash <b>{0}</b>?</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3434"/> - <source>Deleting stash</source> - <translation>Borrando stash</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3454"/> - <source>Delete All Stashes</source> - <translation>Borrar todos los Stashes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3454"/> - <source>Do you really want to delete all stashes?</source> - <translation>¿Desea realmente borrar todos los stashes?</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> - <source>Deleting all stashes</source> - <translation>Borrando todos los stashes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3534"/> - <source>Showing the combined configuration settings</source> - <translation>Mostrando los ajustes de configuración combinados</translation> + <source>Enter a branch name to restore a stash to:</source> + <translation>Introducir un nombre de branch sobre la que restaurar un stash:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3487"/> + <source>Creating branch</source> + <translation>Creando branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <source>Delete Stash</source> + <translation>Borrar Stash</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <source>Do you really want to delete the stash <b>{0}</b>?</source> + <translation>¿Desea realmente borrar el stash <b>{0}</b>?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3532"/> + <source>Deleting stash</source> + <translation>Borrando stash</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <source>Delete All Stashes</source> + <translation>Borrar todos los Stashes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <source>Do you really want to delete all stashes?</source> + <translation>¿Desea realmente borrar todos los stashes?</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3560"/> - <source>Verifying the integrity of the Git repository</source> - <translation>Verificando la integridad del repositorio Git</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3585"/> - <source>Performing Repository Housekeeping</source> - <translation>Llevando a cabo Reorganización del Repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3629"/> - <source><tr><td><b>Statistics</b></td></tr></source> - <translation><tr><td><b>Estadísticas</b></td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3630"/> - <source><tr><td>Number of loose objects: </td><td>{0}</td></tr></source> - <translation><tr><td>Número de objetos sueltos: </td><td>{0}</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3634"/> - <source><tr><td>Disk space used by loose objects: </td><td>{0} KiB</td></tr></source> - <translation><tr><td>Espacio en disco utilizado por objetos sueltos: </td><td>{0} KiB</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3638"/> - <source><tr><td>Number of packed objects: </td><td>{0}</td></tr></source> - <translation><tr><td>Número de objetos empaquetados: </td><td>{0}</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3642"/> - <source><tr><td>Number of packs: </td><td>{0}</td></tr></source> - <translation><tr><td>Número de paquetes: </td><td>{0}</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3646"/> - <source><tr><td>Disk space used by packed objects: </td><td>{0} KiB</td></tr></source> - <translation><tr><td>Espacio en disco utilizado por objetos empaquetados: </td><td>{0} KiB</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3650"/> - <source><tr><td>Packed objects waiting for pruning: </td><td>{0}</td></tr></source> - <translation><tr><td>Objetos empaquetados en espera de pruning: </td><td>{0}</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3654"/> - <source><tr><td>Garbage files: </td><td>{0}</td></tr></source> - <translation><tr><td>Archivos basura: </td><td>{0}</td></tr></translation> + <source>Deleting all stashes</source> + <translation>Borrando todos los stashes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3632"/> + <source>Showing the combined configuration settings</source> + <translation>Mostrando los ajustes de configuración combinados</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3658"/> + <source>Verifying the integrity of the Git repository</source> + <translation>Verificando la integridad del repositorio Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3683"/> + <source>Performing Repository Housekeeping</source> + <translation>Llevando a cabo Reorganización del Repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3727"/> + <source><tr><td><b>Statistics</b></td></tr></source> + <translation><tr><td><b>Estadísticas</b></td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3728"/> + <source><tr><td>Number of loose objects: </td><td>{0}</td></tr></source> + <translation><tr><td>Número de objetos sueltos: </td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3732"/> + <source><tr><td>Disk space used by loose objects: </td><td>{0} KiB</td></tr></source> + <translation><tr><td>Espacio en disco utilizado por objetos sueltos: </td><td>{0} KiB</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3736"/> + <source><tr><td>Number of packed objects: </td><td>{0}</td></tr></source> + <translation><tr><td>Número de objetos empaquetados: </td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3740"/> + <source><tr><td>Number of packs: </td><td>{0}</td></tr></source> + <translation><tr><td>Número de paquetes: </td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3744"/> + <source><tr><td>Disk space used by packed objects: </td><td>{0} KiB</td></tr></source> + <translation><tr><td>Espacio en disco utilizado por objetos empaquetados: </td><td>{0} KiB</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3748"/> + <source><tr><td>Packed objects waiting for pruning: </td><td>{0}</td></tr></source> + <translation><tr><td>Objetos empaquetados en espera de pruning: </td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3752"/> + <source><tr><td>Garbage files: </td><td>{0}</td></tr></source> + <translation><tr><td>Archivos basura: </td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3756"/> <source><tr><td>Disk space used by garbage files: </td><td>{0} KiB</td></tr></source> <translation><tr><td>Espacio en disco utilizado por archivos basura: </td><td>{0} KiB</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3664"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3762"/> <source><p><b>No statistics available.</b></p></source> <translation><p><b>No hay estadísticas disponibles.</b></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3730"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3828"/> <source>Creating Archive</source> <translation>Creando Archivo</translation> </message> @@ -18158,57 +18158,57 @@ <translation>Aplicar archivos de parche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3773"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3871"/> <source>Add Submodule</source> <translation>Añadir Submódulo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> <source>List Submodules</source> <translation>Listar Submódulos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> <source>No submodules defined for the project.</source> <translation>El proyecto no tiene submódulos definidos.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3956"/> <source>All</source> <translation>Todo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> <source>Submodule Path</source> <translation>Ruta del Submódulo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> <source>Select a submodule path:</source> <translation>Seleccionar ruta del submódulo:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3914"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4012"/> <source>Initialize Submodules</source> <translation>Inicializar Submódulos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3951"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4049"/> <source>Unregister Submodules</source> <translation>Desregistrar Submódulos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4031"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4129"/> <source>Update Submodules</source> <translation>Actualizar Submódulos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4065"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4163"/> <source>Synchronize Submodules</source> <translation>Sincronizar Submódulos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4123"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4221"/> <source>Submodules Summary</source> <translation>Resumen de Submódulos</translation> </message> @@ -18240,6 +18240,31 @@ <source>Enter the remote URL</source> <translation>Introducir la URL remota</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="51"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="57"/> + <source>Username:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="64"/> + <source>Enter the user name for the remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="71"/> + <source>Password:</source> + <translation type="unfinished">Contraseña:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="81"/> + <source>Enter the password for the remote repository</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>GitApplyBundleDataDialog</name> @@ -18869,6 +18894,34 @@ </message> </context> <context> + <name>GitChangeRemoteUrlDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="14"/> + <source>Git Change Remote URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished">Nombre:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="40"/> + <source>URL:</source> + <translation type="unfinished">URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="57"/> + <source>New URL:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="64"/> + <source>Enter the new remote URL</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GitCherryPickDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="14"/> @@ -21126,7 +21179,7 @@ <translation><b>Mostrar Remotos</b><p>Muestra los repositorios remotos disponibles para pull, fetch y push.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1765"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1797"/> <source>Show Remote Info</source> <translation>Mostrar Info Remota</translation> </message> @@ -21141,7 +21194,7 @@ <translation>Mostrar información sobre un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1161"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1191"/> <source>Add</source> <translation>Añadir</translation> </message> @@ -21161,7 +21214,7 @@ <translation><b>Añadir</b><p>Añade un repositorio remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1785"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1817"/> <source>Remove</source> <translation>Eliminar</translation> </message> @@ -21181,7 +21234,7 @@ <translation><b>Eliminar</b><p>Elimina un repositorio remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1799"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1831"/> <source>Prune</source> <translation>Prune</translation> </message> @@ -21201,7 +21254,7 @@ <translation><b>Prune</b><p>Elimina (prune) las tracking branches remotas que han quedado fuera de alcance en un repositorio remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1874"/> <source>Rename</source> <translation>Renombrar</translation> </message> @@ -21221,717 +21274,717 @@ <translation><b>Renombrar</b><p>Renombra un repositorio remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1833"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1895"/> <source>Copy Commits</source> <translation>Copiar Commits</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="609"/> - <source>Copies commits into the current branch</source> - <translation>Copiar commits dentro de la branch actual</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="612"/> - <source><b>Copy Commits</b><p>This copies commits on top of the current branch.</p></source> - <translation><b>Copiar Commits</b><p>Copia commits en la parte superior de la branch actual.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="619"/> - <source>Continue Copying Session</source> - <translation>Continuar Sesión de Copia</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="623"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation>Continuar la última sesión de copia despues de resolver los conflictos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="626"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation><b>Continuar Sesión de Copia</b><p>Continua la última sesión de copia despues de resolver los conflictos.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="635"/> - <source>Quit Copying Session</source> - <translation>Abandonar Sesión de Copia</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="639"/> - <source>Quit the current copying session</source> - <translation>Abandonar la sesión de copia actual</translation> + <source>Copies commits into the current branch</source> + <translation>Copiar commits dentro de la branch actual</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="642"/> + <source><b>Copy Commits</b><p>This copies commits on top of the current branch.</p></source> + <translation><b>Copiar Commits</b><p>Copia commits en la parte superior de la branch actual.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="649"/> - <source>Cancel Copying Session</source> - <translation>Cancelar Sesión de Copia</translation> + <source>Continue Copying Session</source> + <translation>Continuar Sesión de Copia</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="653"/> - <source>Cancel the current copying session and return to the previous state</source> - <translation>Cancelar la copia de sesión actual y volver al estado previo</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="657"/> - <source><b>Cancel Copying Session</b><p>This cancels the current copying session and returns to the previous state.</p></source> - <translation><b>Cancelar Sesión de copia</b><p>Cancela la sesión de copia actual y vuelve al estado previo.</p></translation> + <source>Continue the last copying session after conflicts were resolved</source> + <translation>Continuar la última sesión de copia despues de resolver los conflictos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="656"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation><b>Continuar Sesión de Copia</b><p>Continua la última sesión de copia despues de resolver los conflictos.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="665"/> - <source>Stash changes</source> - <translation>Guardado rápido de cambios (stash)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="665"/> - <source>Stash changes...</source> - <translation>Guardado rápido de cambios (stash)...</translation> + <source>Quit Copying Session</source> + <translation>Abandonar Sesión de Copia</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="669"/> - <source>Stash all current changes of the project</source> - <translation>Hacer guardado rápido de todos los cambios actuales en el proyecto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="672"/> - <source><b>Stash changes</b><p>This stashes all current changes of the project.</p></source> - <translation><b>Guardado rápido de cambios (stash)</b><p>Hace un guardado rápido de todos los cambios actuales en el proyecto.</p></translation> + <source>Quit the current copying session</source> + <translation>Abandonar la sesión de copia actual</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="679"/> - <source>Show stash browser</source> - <translation>Mostrar navegador de stash (guardado rápido)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="679"/> - <source>Show stash browser...</source> - <translation>Mostrar navegador de stash (guardado rápido)...</translation> + <source>Cancel Copying Session</source> + <translation>Cancelar Sesión de Copia</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="683"/> - <source>Show a dialog with all stashes</source> - <translation>Mostrar un diálogo con todos los stashes (guardado rápido)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="686"/> - <source><b>Show stash browser...</b><p>This shows a dialog listing all available stashes. Actions on these stashes may be executed via the context menu.</p></source> - <translation><b>Mostrar navegador de stash...</b><p>Muestra un diálogo listando todos los elementos disponibles en stash (guardado rápido). Se pueden ejecutar acciones sobre estos elementos vía menú de context.</p></translation> + <source>Cancel the current copying session and return to the previous state</source> + <translation>Cancelar la copia de sesión actual y volver al estado previo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="687"/> + <source><b>Cancel Copying Session</b><p>This cancels the current copying session and returns to the previous state.</p></source> + <translation><b>Cancelar Sesión de copia</b><p>Cancela la sesión de copia actual y vuelve al estado previo.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> - <source>Show stash</source> - <translation>Mostrar stash</translation> + <source>Stash changes</source> + <translation>Guardado rápido de cambios (stash)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> - <source>Show stash...</source> - <translation>Mostrar stash...</translation> + <source>Stash changes...</source> + <translation>Guardado rápido de cambios (stash)...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="699"/> - <source>Show a dialog with a patch of a stash</source> - <translation>Muestra un diálogo con un patch de un stash (guardado rápido)</translation> + <source>Stash all current changes of the project</source> + <translation>Hacer guardado rápido de todos los cambios actuales en el proyecto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="702"/> + <source><b>Stash changes</b><p>This stashes all current changes of the project.</p></source> + <translation><b>Guardado rápido de cambios (stash)</b><p>Hace un guardado rápido de todos los cambios actuales en el proyecto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="709"/> + <source>Show stash browser</source> + <translation>Mostrar navegador de stash (guardado rápido)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="709"/> + <source>Show stash browser...</source> + <translation>Mostrar navegador de stash (guardado rápido)...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="713"/> + <source>Show a dialog with all stashes</source> + <translation>Mostrar un diálogo con todos los stashes (guardado rápido)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="716"/> + <source><b>Show stash browser...</b><p>This shows a dialog listing all available stashes. Actions on these stashes may be executed via the context menu.</p></source> + <translation><b>Mostrar navegador de stash...</b><p>Muestra un diálogo listando todos los elementos disponibles en stash (guardado rápido). Se pueden ejecutar acciones sobre estos elementos vía menú de context.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="725"/> + <source>Show stash</source> + <translation>Mostrar stash</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="725"/> + <source>Show stash...</source> + <translation>Mostrar stash...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="729"/> + <source>Show a dialog with a patch of a stash</source> + <translation>Muestra un diálogo con un patch de un stash (guardado rápido)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="732"/> <source><b>Show stash...</b><p>This shows a dialog with a patch of a selectable stash.</p></source> <translation><b>Mostrar stash (guardado rápido)...</b><p>Muestra un diálogo con un patch de un stash seleccionable.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="710"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="740"/> <source>Restore && Keep</source> <translation>Restaurar && Conservar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="714"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="744"/> <source>Restore a stash but keep it</source> <translation>Restaurar un stash (guardado rápido) pero conservarlo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="717"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="747"/> <source><b>Restore &amp; Keep</b><p>This restores a selectable stash and keeps it.</p></source> <translation><b>Restaurar &amp; Conservar</b><p>Restaura un stash (guardado rápido) seleccionable pero éste es conservado.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="724"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="754"/> <source>Restore && Delete</source> <translation>Restaurar && Borrar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="758"/> <source>Restore a stash and delete it</source> <translation>Restaurar un stash (guardado rápido) y borrarlo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="731"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="761"/> <source><b>Restore &amp; Delete</b><p>This restores a selectable stash and deletes it.</p></source> <translation><b>Restaurar &amp; Borrar</b><p>Restaura un stash (guardado rápido) seleccionable y luego lo borra.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1980"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2042"/> <source>Create Branch</source> <translation>Crear Branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="772"/> <source>Create a new branch and restore a stash into it</source> <translation>Crear una nueva branch y restaurar un stash (guardado rápido) en ella</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="745"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="775"/> <source><b>Create Branch</b><p>This creates a new branch and restores a stash into it.</p></source> <translation><b>Crear branch</b><p>Crea una nueva branch y restaura un stash (guardado rápido) en ella.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="753"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="783"/> <source>Delete</source> <translation>Borrar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="787"/> <source>Delete a stash</source> <translation>Borrar un stash (guardado rápido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="760"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="790"/> <source><b>Delete</b><p>This deletes a stash.</p></source> <translation><b>Borrar</b><p>Borra un stash (guardado rápido).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="767"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="797"/> <source>Delete All</source> <translation>Borrar todos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="771"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="801"/> <source>Delete all stashes</source> <translation>Borrar todos los stashes (guardado rápido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="774"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="804"/> <source><b>Delete All</b><p>This deletes all stashes.</p></source> <translation><b>Borrar Todos</b><p>Borra todos los stashes (guardado rápido).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="811"/> <source>Edit user configuration</source> <translation>Editar configuración de usuario</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="811"/> <source>Edit user configuration...</source> <translation>Editar configuración de usuario...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="785"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="815"/> <source>Show an editor to edit the user configuration file</source> <translation>Mostrar un editor para editar el archivo de configuración de usuario</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="788"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="818"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation><b>Editar configuración de usuario</b><p>Mostrar un editor para editar el archivo de configuración de usuario.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="825"/> <source>Edit repository configuration</source> <translation>Editar configuración del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="825"/> <source>Edit repository configuration...</source> <translation>Editar configuración del repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="829"/> <source>Show an editor to edit the repository configuration file</source> <translation>Mostrar un editor para editar el archivo de configuración del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="802"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation><b>Editar configuración del repositorio</b><p>Mostrar un editor para editar el archivo de configuración del repositorio.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="810"/> - <source>Create .gitignore</source> - <translation>Crear .gitignore</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="814"/> - <source>Create a .gitignore file with default values</source> - <translation>Crear un archivo .gitignore con valores por defecto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="817"/> - <source><b>Create .gitignore</b><p>This creates a .gitignore file with default values.</p></source> - <translation><b>Crear .gitignore</b><p>Crea un archivo .gitignore con valores por defecto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="824"/> - <source>Show combined configuration settings</source> - <translation>Mostrar ajustes de configuración combinados</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="824"/> - <source>Show combined configuration settings...</source> - <translation>Mostrar ajustes de configuración combinados...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="828"/> - <source>Show the combined configuration settings from all configuration files</source> - <translation>Mostrar los ajustes de configuración combinados de todos los archivos de configuración</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="832"/> - <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> - <translation><b>Mostrar ajustes de configuración combinados</b><p>Muestra los ajustes de configuración combinados de todos los archivos de configuración.</p></translation> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> + <translation><b>Editar configuración del repositorio</b><p>Mostrar un editor para editar el archivo de configuración del repositorio.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="840"/> - <source>Verify repository</source> - <translation>Verificar repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="840"/> - <source>Verify repository...</source> - <translation>Verificar repositorio...</translation> + <source>Create .gitignore</source> + <translation>Crear .gitignore</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="844"/> - <source>Verify the connectivity and validity of objects of the database</source> - <translation>Verificar la conectividad y validez de los objetos de la base de datos</translation> + <source>Create a .gitignore file with default values</source> + <translation>Crear un archivo .gitignore con valores por defecto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="847"/> - <source><b>Verify repository</b><p>This verifies the connectivity and validity of objects of the database.</p></source> - <translation><b>Verificar repositorio</b><p>Verifica la conectividad y validez de los objetos de la base de datos.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="855"/> - <source>Optimize repository</source> - <translation>Optimizar repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="855"/> - <source>Optimize repository...</source> - <translation>Optimizar repositorio...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="859"/> - <source>Cleanup and optimize the local repository</source> - <translation>Limpiar y optimizar el repositorio local</translation> + <source><b>Create .gitignore</b><p>This creates a .gitignore file with default values.</p></source> + <translation><b>Crear .gitignore</b><p>Crea un archivo .gitignore con valores por defecto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="854"/> + <source>Show combined configuration settings</source> + <translation>Mostrar ajustes de configuración combinados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="854"/> + <source>Show combined configuration settings...</source> + <translation>Mostrar ajustes de configuración combinados...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="858"/> + <source>Show the combined configuration settings from all configuration files</source> + <translation>Mostrar los ajustes de configuración combinados de todos los archivos de configuración</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="862"/> + <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> + <translation><b>Mostrar ajustes de configuración combinados</b><p>Muestra los ajustes de configuración combinados de todos los archivos de configuración.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="870"/> + <source>Verify repository</source> + <translation>Verificar repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="870"/> + <source>Verify repository...</source> + <translation>Verificar repositorio...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="874"/> + <source>Verify the connectivity and validity of objects of the database</source> + <translation>Verificar la conectividad y validez de los objetos de la base de datos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="877"/> + <source><b>Verify repository</b><p>This verifies the connectivity and validity of objects of the database.</p></source> + <translation><b>Verificar repositorio</b><p>Verifica la conectividad y validez de los objetos de la base de datos.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="885"/> + <source>Optimize repository</source> + <translation>Optimizar repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="885"/> + <source>Optimize repository...</source> + <translation>Optimizar repositorio...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="889"/> + <source>Cleanup and optimize the local repository</source> + <translation>Limpiar y optimizar el repositorio local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="892"/> <source><b>Optimize repository</b><p>This cleans up and optimizes the local repository.</p></source> <translation><b>Optimizar repositorio</b><p>Limpia y optimiza el repositorio local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="899"/> <source>Repository Statistics</source> <translation>Estadísticas del Repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="899"/> <source>Repository Statistics...</source> <translation>Estadísticas del Repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="903"/> <source>Show some statistics of the local repository</source> <translation>Mostrar estadísticas del repositorio local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="876"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="906"/> <source><b>Repository Statistics</b><p>This show some statistics of the local repository.</p></source> <translation><b>Estadísticas del Repositorio</b><p>Muestra una serie de estadísticas del repositorio local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="883"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="913"/> <source>Create Archive</source> <translation>Crear Archivo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="887"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="917"/> <source>Create an archive from the local repository</source> <translation>Crear un archivo a partir del repositorio local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="890"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="920"/> <source><b>Create Archive</b><p>This creates an archive from the local repository.</p></source> <translation><b>Crear Archivo</b><p>Crea un archivo a partir del repositorio local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="897"/> - <source>Create bundle</source> - <translation>Crear bundle</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="897"/> - <source>Create bundle...</source> - <translation>Crear bundle...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="901"/> - <source>Create bundle file collecting changesets</source> - <translation>Crear archivo de bundle recopilando changesets</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="904"/> - <source><b>Create bundle</b><p>This creates a bundle file collecting selected changesets (git bundle create).</p></source> - <translation><b>Crear bundle</b><p>Crea un archivo de bundle recolectando los changesets seleccionados (git bundle create).</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="912"/> - <source>Verify bundle</source> - <translation>Verificar bundle</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="912"/> - <source>Verify bundle...</source> - <translation>Verificar bundle...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="916"/> - <source>Verify the validity and applicability of a bundle file</source> - <translation>Verificar la validez y aplicabilidad de un archivo de bundle</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="919"/> - <source><b>Verify bundle</b><p>This verifies that a bundle file is valid and will apply cleanly.</p></source> - <translation><b>Verificar bundle</b><p>Verifica que un archivo de bundle es válido y que se puede aplicar limpiamente.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> - <source>List bundle heads</source> - <translation>Listar bundle heads</translation> + <source>Create bundle</source> + <translation>Crear bundle</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> - <source>List bundle heads...</source> - <translation>Listar bundle heads...</translation> + <source>Create bundle...</source> + <translation>Crear bundle...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="931"/> - <source>List all heads contained in a bundle file</source> - <translation>Lista todos los heads contenidos en un archivo de bundle</translation> + <source>Create bundle file collecting changesets</source> + <translation>Crear archivo de bundle recopilando changesets</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="934"/> + <source><b>Create bundle</b><p>This creates a bundle file collecting selected changesets (git bundle create).</p></source> + <translation><b>Crear bundle</b><p>Crea un archivo de bundle recolectando los changesets seleccionados (git bundle create).</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="942"/> + <source>Verify bundle</source> + <translation>Verificar bundle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="942"/> + <source>Verify bundle...</source> + <translation>Verificar bundle...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="946"/> + <source>Verify the validity and applicability of a bundle file</source> + <translation>Verificar la validez y aplicabilidad de un archivo de bundle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="949"/> + <source><b>Verify bundle</b><p>This verifies that a bundle file is valid and will apply cleanly.</p></source> + <translation><b>Verificar bundle</b><p>Verifica que un archivo de bundle es válido y que se puede aplicar limpiamente.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="957"/> + <source>List bundle heads</source> + <translation>Listar bundle heads</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="957"/> + <source>List bundle heads...</source> + <translation>Listar bundle heads...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="961"/> + <source>List all heads contained in a bundle file</source> + <translation>Lista todos los heads contenidos en un archivo de bundle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="964"/> <source><b>List bundle heads</b><p>This lists all heads contained in a bundle file.</p></source> <translation><b>Listar bundle heads</b><p>Lista todos los all heads contenidos en un archivo de bundle.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="971"/> <source>Apply Bundle (fetch)</source> <translation>Aplicar Bundle (fetch)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="971"/> <source>Apply Bundle (fetch)...</source> <translation>Aplicar Bundle (fetch)...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="945"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="975"/> <source>Apply a head of a bundle file using fetch</source> <translation>Aplicar un head de un archivo de bundle utilizando fetch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="948"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="978"/> <source><b>Apply Bundle (fetch)</b><p>This applies a head of a bundle file using fetch.</p></source> <translation><b>Applicar Bundle (fetch)</b><p>Aplica un head de un archivo de bundle usando fetch.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2097"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2159"/> <source>Apply Bundle (pull)</source> <translation>Aplicar Bundle (pull)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="955"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="985"/> <source>Apply Bundle (pull)...</source> <translation>Aplicar Bundle (pull)...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="959"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="989"/> <source>Apply a head of a bundle file using pull</source> <translation>Aplicar un head de un archivo de bundle utilizando pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="962"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="992"/> <source><b>Apply Bundle (pull)</b><p>This applies a head of a bundle file using pull.</p></source> <translation><b>Applicar Bundle (pull)</b><p>Aplica un head de un archivo de bundle usando pull.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="969"/> - <source>Start</source> - <translation>Iniciar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="973"/> - <source>Start a bisect session</source> - <translation>Iniciar una sesión de bisect</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="976"/> - <source><b>Start</b><p>This starts a bisect session.</p></source> - <translation><b>Iniciar</b><p>Inicia una sesión de bisect.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="983"/> - <source>Start (Extended)</source> - <translation>Iniciar (Extendido)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="987"/> - <source>Start a bisect session giving a bad and optionally good commits</source> - <translation>Iniciar una sesión de bisect dando un commit malo y opcionalmente un commit bueno</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="990"/> - <source><b>Start (Extended)</b><p>This starts a bisect session giving a bad and optionally good commits.</p></source> - <translation><b>Iniciar (Extendido)</b><p>Inicia una sesión de bisect dando un commit malo y opcionalmente un commit bueno.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="999"/> - <source>Mark as "good"</source> - <translation>Marcar como "buena"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="999"/> - <source>Mark as "good"...</source> - <translation>Marcar como "buena"...</translation> + <source>Start</source> + <translation>Iniciar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1003"/> - <source>Mark a selectable revision as good</source> - <translation>Marcar una revisión seleccionable como buena</translation> + <source>Start a bisect session</source> + <translation>Iniciar una sesión de bisect</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1006"/> - <source><b>Mark as "good"</b><p>This marks a selectable revision as good.</p></source> - <translation><b>Marcar como "buena"</b><p>Marca una revisión seleccionable dándola por buena.</p></translation> + <source><b>Start</b><p>This starts a bisect session.</p></source> + <translation><b>Iniciar</b><p>Inicia una sesión de bisect.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1013"/> - <source>Mark as "bad"</source> - <translation>Marcar como "mala"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1013"/> - <source>Mark as "bad"...</source> - <translation>Marcar como "mala"...</translation> + <source>Start (Extended)</source> + <translation>Iniciar (Extendido)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1017"/> - <source>Mark a selectable revision as bad</source> - <translation>Marcar una revisión seleccionable como mala</translation> + <source>Start a bisect session giving a bad and optionally good commits</source> + <translation>Iniciar una sesión de bisect dando un commit malo y opcionalmente un commit bueno</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1020"/> + <source><b>Start (Extended)</b><p>This starts a bisect session giving a bad and optionally good commits.</p></source> + <translation><b>Iniciar (Extendido)</b><p>Inicia una sesión de bisect dando un commit malo y opcionalmente un commit bueno.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1029"/> + <source>Mark as "good"</source> + <translation>Marcar como "buena"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1029"/> + <source>Mark as "good"...</source> + <translation>Marcar como "buena"...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1033"/> + <source>Mark a selectable revision as good</source> + <translation>Marcar una revisión seleccionable como buena</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1036"/> + <source><b>Mark as "good"</b><p>This marks a selectable revision as good.</p></source> + <translation><b>Marcar como "buena"</b><p>Marca una revisión seleccionable dándola por buena.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1043"/> + <source>Mark as "bad"</source> + <translation>Marcar como "mala"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1043"/> + <source>Mark as "bad"...</source> + <translation>Marcar como "mala"...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1047"/> + <source>Mark a selectable revision as bad</source> + <translation>Marcar una revisión seleccionable como mala</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1050"/> <source><b>Mark as "bad"</b><p>This marks a selectable revision as bad.</p></source> <translation><b>Marcar como "mala"</b><p>Marca una revisión seleccionable no dándola por buena.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1057"/> <source>Skip</source> <translation>Saltar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1057"/> <source>Skip...</source> <translation>Ignorar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1031"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1061"/> <source>Skip a selectable revision</source> <translation>Saltarse una revisión seleccionable</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1064"/> <source><b>Skip</b><p>This skips a selectable revision.</p></source> <translation><b>Saltar</b><p>Se salta una revisión seleccionable.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1071"/> <source>Reset</source> <translation>Resetear</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1071"/> <source>Reset...</source> <translation>Resetear...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1075"/> <source>Reset the bisect session</source> <translation>Resetear la sesión de bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1078"/> <source><b>Reset</b><p>This resets the bisect session.</p></source> <translation><b>Resetear</b><p>Resetea la sesión de bisect.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1055"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1085"/> <source>Show bisect log browser</source> <translation>Mostrar navegador de log de bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1090"/> <source>Show a dialog to browse the bisect log of the local project</source> <translation>Mostrar un diálogo para navegar el log de bisect del proyecto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1063"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1093"/> <source><b>Show bisect log browser</b><p>This shows a dialog to browse the bisect log of the local project.</p></source> <translation><b>Mostrar navegador de log de bisect</b><p>Muestra un diálogo para navegar el log de bisect del proyecto local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1072"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1102"/> <source>Create replay file</source> <translation>Crear archivo de replay</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1106"/> <source>Create a replay file to repeat the current bisect session</source> <translation>Crear un archivo de replay para poder repetir la sesión de bisect actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1109"/> <source><b>Create replay file</b><p>This creates a replay file to repeat the current bisect session.</p></source> <translation><b>Crear archivo de replay</b><p>Crea un archivo de replay para poder repetir la sesión de bisect actual.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1088"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1118"/> <source>Edit replay file</source> <translation>Editar archivo de replay</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1092"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1122"/> <source>Edit a bisect replay file</source> <translation>Editar un archivo de replay bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1095"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1125"/> <source><b>Edit replay file</b><p>This edits a bisect replay file.</p></source> <translation><b>Editar archivo replay</b><p>Edita un archivo de replay bisect.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1133"/> <source>Replay session</source> <translation>Replay de sesión</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1107"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1137"/> <source>Replay a bisect session from file</source> <translation>Replay de una sesión bisect desde archivo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1110"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1140"/> <source><b>Replay session</b><p>This replays a bisect session from file.</p></source> <translation><b>Replay de sesión</b><p>Hace un replay de una sesión de bisect a partir de un archivo.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1344"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1374"/> <source>Administration</source> <translation>Administración</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1360"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1390"/> <source>Bundle Management</source> <translation>Gestión de Bundles</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1690"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1722"/> <source>Pull</source> <translation>Hacer Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2237"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2299"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1397"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1427"/> <source>Tags</source> <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1405"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1435"/> <source>Branches</source> <translation>Branches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1418"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1448"/> <source>Manage Changes</source> <translation>Gestionar Cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1426"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1456"/> <source>Remote Repositories</source> <translation>Repositorios Remotos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1436"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1468"/> <source>Cherry-pick</source> <translation>Cherry-pick</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1444"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1476"/> <source>Stash</source> <translation>Stash (guardado rápido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1646"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1678"/> <source>Branch</source> <translation>Branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2323"/> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1715"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1747"/> <source>Revert Changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1734"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1766"/> <source>Unstage Changes</source> <translation>Sacar cambios del área de preparación (unstage)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1874"/> <source>Select a remote repository:</source> <translation>Seleccionar repositorio-remoto:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1853"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1915"/> <source>Copy Commits (Continue)</source> <translation>Copiar Commits (Continuar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1872"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1934"/> <source>Copy Commits (Quit)</source> <translation>Copiar Commits (Salir)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1892"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1954"/> <source>Copy Commits (Cancel)</source> <translation>Copiar Commits (Cancelar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1911"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1973"/> <source>Save Stash</source> <translation>Guardar Stash (guardado rápido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1961"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2023"/> <source>Restore Stash</source> <translation>Restaurar Stash (guardado rápido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="672"/> <source><b>Quit Copying Session</b><p>This quits the current copying session.</p></source> <translation><b>Abandonar Sesión de Copia</b><p>Abandona la sesión de copia actual.</p></translation> </message> @@ -21956,225 +22009,265 @@ <translation><b>Hacer commit de los cambios al repositorio</b>Envia los cambios del proyecto local al repositorio Git.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1541"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1573"/> <source>Git</source> <translation>Git</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1147"/> <source>Check patch files</source> <translation>Comprobar archivos de parche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1121"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1151"/> <source>Check a list of patch files, if they would apply cleanly</source> <translation>Comprobar si los archivos de parche de una lista se van a aplicar limpiamente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1124"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1154"/> <source><b>Check patch files</b><p>This checks a list of patch files, if they would apply cleanly.</p></source> <translation><b>Comprobar archivos de parche</b><p>Comprueba si los archivos de parche de una lista se van a aplicar limpiamente.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2323"/> <source>Apply patch files</source> <translation>Aplicar archivos de parche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1166"/> <source>Apply a list of patch files</source> <translation>Aplicar una lista de archivos de parche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1139"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1169"/> <source><b>Apply patch files</b><p>This applies a list of patch files.</p></source> <translation><b>Aplciar archivos de parche</b><p>Aplica una lista de archivos de parche.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1146"/> - <source>Show patch statistics</source> - <translation>Mostrar estadísticas del parche</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1150"/> - <source>Show some statistics for a list of patch files</source> - <translation>Mostrar algunas estadísticas para una lista de archivos de parche</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1153"/> - <source><b>Show patch statistics</b><p>This shows some statistics for a list of patch files.</p></source> - <translation><b>Mostrar estadísticas de parche</b><p>Muestra algunas estadísticas para una lista de archivos de parche.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1371"/> - <source>Patch Management</source> - <translation>Gestión de Parches</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1165"/> - <source>Add a submodule to the current project</source> - <translation>Añadir un submódulo al proyecto actual</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1168"/> - <source><b>Add</b><p>This adds a submodule to the current project.</p></source> - <translation><b>Añadir</b><p>Añade un submódulo al proyecto actual.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1176"/> - <source>List</source> - <translation>Listar</translation> + <source>Show patch statistics</source> + <translation>Mostrar estadísticas del parche</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1180"/> - <source>List the submodule of the current project</source> - <translation>Listar submódulos del proyecto actual</translation> + <source>Show some statistics for a list of patch files</source> + <translation>Mostrar algunas estadísticas para una lista de archivos de parche</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1183"/> - <source><b>List</b><p>This lists the submodules of the current project.</p></source> - <translation><b>Listar</b><p>Lista los submódulos del proyecto actual.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1191"/> - <source>Initialize</source> - <translation>Inicializar</translation> + <source><b>Show patch statistics</b><p>This shows some statistics for a list of patch files.</p></source> + <translation><b>Mostrar estadísticas de parche</b><p>Muestra algunas estadísticas para una lista de archivos de parche.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1401"/> + <source>Patch Management</source> + <translation>Gestión de Parches</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1195"/> - <source>Initialize the submodules of the current project</source> - <translation>Inicializar los submódulos del proyecto actual</translation> + <source>Add a submodule to the current project</source> + <translation>Añadir un submódulo al proyecto actual</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1198"/> + <source><b>Add</b><p>This adds a submodule to the current project.</p></source> + <translation><b>Añadir</b><p>Añade un submódulo al proyecto actual.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1206"/> + <source>List</source> + <translation>Listar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1210"/> + <source>List the submodule of the current project</source> + <translation>Listar submódulos del proyecto actual</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1213"/> + <source><b>List</b><p>This lists the submodules of the current project.</p></source> + <translation><b>Listar</b><p>Lista los submódulos del proyecto actual.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1221"/> + <source>Initialize</source> + <translation>Inicializar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1225"/> + <source>Initialize the submodules of the current project</source> + <translation>Inicializar los submódulos del proyecto actual</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1228"/> <source><b>Initialize</b><p>This initializes the submodules of the current project.</p></source> <translation><b>Inicializar</b><p>Inicializa los submódulos del proyecto actual.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1207"/> - <source>Unregister</source> - <translation>Desregistrar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1211"/> - <source>Unregister submodules of the current project</source> - <translation>Desregistrar submódulos del proyecto actual</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1214"/> - <source><b>Unregister</b><p>This unregisters submodules of the current project.</p></source> - <translation><b>Desregistrar</b><p>Desregistra submódulos del proyecto actual.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1222"/> - <source>Update</source> - <translation>Actualizar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1226"/> - <source>Update submodules of the current project</source> - <translation>Actualizar submódulos del proyecto actual</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1229"/> - <source><b>Update</b><p>This updates submodules of the current project.</p></source> - <translation><b>Actualizar</b><p>Actualiza submódulos del proyecto actual.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1237"/> - <source>Initialize and Update</source> - <translation>Inicializar y Actualizar</translation> + <source>Unregister</source> + <translation>Desregistrar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1241"/> - <source>Initialize and update submodules of the current project</source> - <translation>Inicializar y actualizar los submódulos del proyecto actual</translation> + <source>Unregister submodules of the current project</source> + <translation>Desregistrar submódulos del proyecto actual</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1244"/> + <source><b>Unregister</b><p>This unregisters submodules of the current project.</p></source> + <translation><b>Desregistrar</b><p>Desregistra submódulos del proyecto actual.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1252"/> + <source>Update</source> + <translation>Actualizar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1256"/> + <source>Update submodules of the current project</source> + <translation>Actualizar submódulos del proyecto actual</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1259"/> + <source><b>Update</b><p>This updates submodules of the current project.</p></source> + <translation><b>Actualizar</b><p>Actualiza submódulos del proyecto actual.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1267"/> + <source>Initialize and Update</source> + <translation>Inicializar y Actualizar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1271"/> + <source>Initialize and update submodules of the current project</source> + <translation>Inicializar y actualizar los submódulos del proyecto actual</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1274"/> <source><b>Initialize and Update</b><p>This initializes and updates submodules of the current project.</p></source> <translation><b>Inicializar y actualizar</b><p>Inicializa y actualiza los submódulos del proyecto actual.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1253"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1283"/> <source>Fetch and Update</source> <translation>Fetch y Actualizar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1257"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1287"/> <source>Fetch and update submodules of the current project</source> <translation>Fetch y actualizar los módulos del proyecto actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1260"/> - <source><b>Fetch and Update</b><p>This fetches and updates submodules of the current project.</p></source> - <translation><b>Fetch y actualizar</b><p>Hace fetch y y actualiza los submódulos del proyecto actual.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1269"/> - <source>Update with Options</source> - <translation>Actualizar con Opciones</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1273"/> - <source>Update submodules of the current project offering a dialog to enter options</source> - <translation>Actualizar submódulos del proyecto actual ofreciendo un diálogo para introducir opciones</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1277"/> - <source><b>Update with Options</b><p>This updates submodules of the current project offering a dialog to enter update options.</p></source> - <translation><b>Actualizar con Opciones</b><p>Actualiza submódulos del proyecto actual ofreciendo un diálogo para introducir opciones de actualización.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1286"/> - <source>Synchronize URLs</source> - <translation>Sincronizar URLs</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1290"/> + <source><b>Fetch and Update</b><p>This fetches and updates submodules of the current project.</p></source> + <translation><b>Fetch y actualizar</b><p>Hace fetch y y actualiza los submódulos del proyecto actual.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1299"/> + <source>Update with Options</source> + <translation>Actualizar con Opciones</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1303"/> + <source>Update submodules of the current project offering a dialog to enter options</source> + <translation>Actualizar submódulos del proyecto actual ofreciendo un diálogo para introducir opciones</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1307"/> + <source><b>Update with Options</b><p>This updates submodules of the current project offering a dialog to enter update options.</p></source> + <translation><b>Actualizar con Opciones</b><p>Actualiza submódulos del proyecto actual ofreciendo un diálogo para introducir opciones de actualización.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1316"/> + <source>Synchronize URLs</source> + <translation>Sincronizar URLs</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1320"/> <source>Synchronize URLs of submodules of the current project</source> <translation>Sincronizar URLs de los submódulos del proyecto actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1293"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1323"/> <source><b>Synchronize URLs</b><p>This synchronizes URLs of submodules of the current project.</p></source> <translation><b>Sincronizar URLs</b><p>Sincroniza URLs de submódulos del proyecto actual.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1332"/> <source>Show Status</source> <translation>Mostrar estado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1306"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1336"/> <source>Show the status of submodules of the current project</source> <translation>Mostrar status de los submódulos del proyecto actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1339"/> <source><b>Show Status</b><p>This shows a dialog with the status of submodules of the current project.</p></source> <translation><b>Mostrar Status</b><p>Muestra un diálogo con el estado de los submódulos del proyecto actual.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1318"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1348"/> <source>Show Summary</source> <translation>Mostrar Resumen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1322"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1352"/> <source>Show summary information for submodules of the current project</source> <translation>Mostrar información de resumen para los submódulos del proyecto actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1325"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1355"/> <source><b>Show Summary</b><p>This shows some summary information for submodules of the current project.</p></source> <translation><b>Mostrar Resumen</b><p>Muestra información de resumen para los submódulos del proyecto actual.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1459"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1491"/> <source>Submodules</source> <translation>Submódulos</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="604"/> + <source>Change URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="604"/> + <source>Change URL...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="608"/> + <source>Change the URL of a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="611"/> + <source><b>Change URL</b><p>This changes the URL of a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="618"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="618"/> + <source>Credentials...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="622"/> + <source>Change or set the user credentials of a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="625"/> + <source><b>Credentials</b><p>This changes or sets the user credentials of a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>GitPullDialog</name> @@ -22476,6 +22569,49 @@ </message> </context> <context> + <name>GitRemoteCredentialsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="14"/> + <source>Git Remote Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished">Nombre:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="40"/> + <source>URL:</source> + <translation type="unfinished">URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="57"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="63"/> + <source>Username:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="70"/> + <source>Enter the user name for the remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="77"/> + <source>Password:</source> + <translation type="unfinished">Contraseña:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="87"/> + <source>Enter the password for the remote repository</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GitRemoteRepositoriesDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="14"/> @@ -22520,92 +22656,92 @@ <translation>&Añadir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="159"/> <source>Press to rename the selected repository</source> <translation>Pulsar para renombrar el repositorio seleccionado</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="162"/> + <source>&Rename</source> + <translation>&Renombrar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="92"/> + <source>Press to remove the selected repository</source> + <translation>Pulsar para eliminar el repositorio seleccionado</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="95"/> - <source>&Rename</source> - <translation>&Renombrar</translation> + <source>Re&move</source> + <translation>Eli&minar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="102"/> - <source>Press to remove the selected repository</source> - <translation>Pulsar para eliminar el repositorio seleccionado</translation> + <source>Press to delete stale tracking branches under the selected repository </source> + <translation>Pulsar para eliminar las tracking branches que han quedado fuera de alcance en el repositorio seleccionado </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="105"/> - <source>Re&move</source> - <translation>Eli&minar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="112"/> - <source>Press to delete stale tracking branches under the selected repository </source> - <translation>Pulsar para eliminar las tracking branches que han quedado fuera de alcance en el repositorio seleccionado </translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="115"/> <source>&Prune</source> <translation>&Prune</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="129"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="119"/> <source>Press to show information about the selected repository</source> <translation>Pulsar para mostrar información acerca del repositorio seleccionado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="132"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="122"/> <source>Show &Info...</source> <translation>Mostrar &Info...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="160"/> - <source>Errors</source> - <translation>Errores</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="166"/> - <source><b>Git log errors</b><p>This shows possible error messages of the git log command.</p></source> - <translation><b>Errores de Git log</b><p>Muestra posibles mensajes de error del comando git log.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="182"/> - <source>Input</source> - <translation>Input</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="204"/> - <source>Press to send the input to the git process</source> - <translation>Pulsar para enviar el input al proceso git</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="207"/> - <source>&Send</source> - <translation>&Enviar</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="210"/> + <source>Errors</source> + <translation>Errores</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="216"/> + <source><b>Git log errors</b><p>This shows possible error messages of the git log command.</p></source> + <translation><b>Errores de Git log</b><p>Muestra posibles mensajes de error del comando git log.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="232"/> + <source>Input</source> + <translation>Input</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="254"/> + <source>Press to send the input to the git process</source> + <translation>Pulsar para enviar el input al proceso git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="257"/> + <source>&Send</source> + <translation>&Enviar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="260"/> <source>Alt+S</source> <translation>Alt+S</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="267"/> <source>Enter data to be sent to the git process</source> <translation>Introduzca los datos a enviar al proceso de git</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="224"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="274"/> <source>Select to switch the input field to password mode</source> <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="227"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="277"/> <source>&Password Mode</source> <translation>&Modo de contraseña</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="280"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> @@ -22629,6 +22765,26 @@ <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="169"/> + <source>Press to change the URL of the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="172"/> + <source>Change &URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="179"/> + <source>Press to set or change the user credentials of the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="182"/> + <source>&Credentials</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>GitRevisionSelectionDialog</name>
--- a/i18n/eric6_fr.ts Sun Jun 03 11:30:57 2018 +0200 +++ b/i18n/eric6_fr.ts Sun Jun 03 14:03:19 2018 +0200 @@ -1546,7 +1546,7 @@ </message> <message> <location filename="../Utilities/BackgroundService.py" line="422"/> - <source>Erics background client disconnected because of an unknown reason.</source> + <source>Eric's background client disconnected because of an unknown reason.</source> <translation type="unfinished"></translation> </message> <message> @@ -18487,237 +18487,237 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2972"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3070"/> <source>Show Remote Info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> <source>Rename Remote Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> <source>Enter new name for remote repository:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2996"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3094"/> <source>Show Shortlog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3054"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3152"/> <source>Cherry-pick</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3084"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3182"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3109"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3207"/> <source>Copy Changesets (Quit)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3233"/> <source>Copy Changesets (Cancel)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3215"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3313"/> <source>Saving stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3414"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> <source>Show Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3414"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> <source>Select a stash (empty for latest stash):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3326"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3424"/> <source>Restore Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3340"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3438"/> <source>Restoring stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3374"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3472"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3364"/> - <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="3389"/> - <source>Creating branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3423"/> - <source>Delete Stash</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3423"/> - <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="3434"/> - <source>Deleting stash</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3454"/> - <source>Delete All Stashes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3454"/> - <source>Do you really want to delete all stashes?</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> - <source>Deleting all stashes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3534"/> - <source>Showing the combined configuration settings</source> + <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="3487"/> + <source>Creating branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <source>Delete Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <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="3532"/> + <source>Deleting stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <source>Delete All Stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <source>Do you really want to delete all stashes?</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3560"/> - <source>Verifying the integrity of the Git repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3585"/> - <source>Performing Repository Housekeeping</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3629"/> - <source><tr><td><b>Statistics</b></td></tr></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3630"/> - <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="3634"/> - <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="3638"/> - <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="3642"/> - <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="3646"/> - <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="3650"/> - <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="3654"/> - <source><tr><td>Garbage files: </td><td>{0}</td></tr></source> + <source>Deleting all stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3632"/> + <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3658"/> + <source>Verifying the integrity of the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3683"/> + <source>Performing Repository Housekeeping</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3727"/> + <source><tr><td><b>Statistics</b></td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3728"/> + <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="3732"/> + <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="3736"/> + <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="3740"/> + <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="3744"/> + <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="3748"/> + <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="3752"/> + <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="3756"/> <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="3664"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3762"/> <source><p><b>No statistics available.</b></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3730"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3828"/> <source>Creating Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3773"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3871"/> <source>Add Submodule</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> <source>List Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> <source>No submodules defined for the project.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3956"/> <source>All</source> <translation type="unfinished">Tous</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> <source>Submodule Path</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> <source>Select a submodule path:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3914"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4012"/> <source>Initialize Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3951"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4049"/> <source>Unregister Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4031"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4129"/> <source>Update Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4065"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4163"/> <source>Synchronize Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4123"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4221"/> <source>Submodules Summary</source> <translation type="unfinished"></translation> </message> @@ -18749,6 +18749,31 @@ <source>Enter the remote URL</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="51"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="57"/> + <source>Username:</source> + <translation type="unfinished">Nom d'utilisateur:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="64"/> + <source>Enter the user name for the remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="71"/> + <source>Password:</source> + <translation type="unfinished">Mot de passe:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="81"/> + <source>Enter the password for the remote repository</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>GitApplyBundleDataDialog</name> @@ -19374,6 +19399,34 @@ </message> </context> <context> + <name>GitChangeRemoteUrlDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="14"/> + <source>Git Change Remote URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished">Nom:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="40"/> + <source>URL:</source> + <translation type="unfinished">URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="57"/> + <source>New URL:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="64"/> + <source>Enter the new remote URL</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GitCherryPickDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="14"/> @@ -21642,7 +21695,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1765"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1797"/> <source>Show Remote Info</source> <translation type="unfinished"></translation> </message> @@ -21657,7 +21710,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1161"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1191"/> <source>Add</source> <translation type="unfinished">Ajouter</translation> </message> @@ -21677,7 +21730,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1785"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1817"/> <source>Remove</source> <translation type="unfinished">Supprimer</translation> </message> @@ -21697,7 +21750,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1799"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1831"/> <source>Prune</source> <translation type="unfinished"></translation> </message> @@ -21717,7 +21770,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1874"/> <source>Rename</source> <translation type="unfinished"></translation> </message> @@ -21737,940 +21790,980 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1833"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1895"/> <source>Copy Commits</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="609"/> - <source>Copies commits into the current branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="612"/> - <source><b>Copy Commits</b><p>This copies commits on top of the current branch.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="619"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="623"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="626"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="635"/> - <source>Quit Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="639"/> - <source>Quit the current copying session</source> + <source>Copies commits into the current branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="642"/> - <source><b>Quit Copying Session</b><p>This quits the current copying session.</p></source> + <source><b>Copy Commits</b><p>This copies commits on top of the current branch.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="649"/> - <source>Cancel Copying Session</source> + <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="653"/> - <source>Cancel the current copying session and return to the previous state</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="657"/> - <source><b>Cancel Copying Session</b><p>This cancels the current copying session and returns to the previous state.</p></source> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="656"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="665"/> - <source>Stash changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="665"/> - <source>Stash changes...</source> + <source>Quit Copying Session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="669"/> - <source>Stash all current changes of the project</source> + <source>Quit the current copying session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="672"/> - <source><b>Stash changes</b><p>This stashes all current changes of the project.</p></source> + <source><b>Quit Copying Session</b><p>This quits the current copying session.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="679"/> - <source>Show stash browser</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="679"/> - <source>Show stash browser...</source> + <source>Cancel Copying Session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="683"/> - <source>Show a dialog with all stashes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="686"/> - <source><b>Show stash browser...</b><p>This shows a dialog listing all available stashes. Actions on these stashes may be executed via the context menu.</p></source> + <source>Cancel the current copying session and return to the previous state</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="687"/> + <source><b>Cancel Copying Session</b><p>This cancels the current copying session and returns to the previous state.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> - <source>Show stash</source> + <source>Stash changes</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> - <source>Show stash...</source> + <source>Stash changes...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="699"/> - <source>Show a dialog with a patch of a stash</source> + <source>Stash all current changes of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="702"/> + <source><b>Stash changes</b><p>This stashes all current changes of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="709"/> + <source>Show stash browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="709"/> + <source>Show stash browser...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="713"/> + <source>Show a dialog with all stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="716"/> + <source><b>Show stash browser...</b><p>This shows a dialog listing all available stashes. Actions on these stashes may be executed via the context menu.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="725"/> + <source>Show stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="725"/> + <source>Show stash...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="729"/> + <source>Show a dialog with a patch of a stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="732"/> <source><b>Show stash...</b><p>This shows a dialog with a patch of a selectable stash.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="710"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="740"/> <source>Restore && Keep</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="714"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="744"/> <source>Restore a stash but keep it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="717"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="747"/> <source><b>Restore &amp; Keep</b><p>This restores a selectable stash and keeps it.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="724"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="754"/> <source>Restore && Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="758"/> <source>Restore a stash and delete it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="731"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="761"/> <source><b>Restore &amp; Delete</b><p>This restores a selectable stash and deletes it.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1980"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2042"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="772"/> <source>Create a new branch and restore a stash into it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="745"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="775"/> <source><b>Create Branch</b><p>This creates a new branch and restores a stash into it.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="753"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="783"/> <source>Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="787"/> <source>Delete a stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="760"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="790"/> <source><b>Delete</b><p>This deletes a stash.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="767"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="797"/> <source>Delete All</source> <translation type="unfinished">Tous supprimer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="771"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="801"/> <source>Delete all stashes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="774"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="804"/> <source><b>Delete All</b><p>This deletes all stashes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="811"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="811"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="785"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="815"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="788"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="818"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="825"/> <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="825"/> <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="829"/> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="802"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="810"/> - <source>Create .gitignore</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="814"/> - <source>Create a .gitignore file with default values</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="817"/> - <source><b>Create .gitignore</b><p>This creates a .gitignore file with default values.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="824"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="824"/> - <source>Show combined configuration settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="828"/> - <source>Show the combined configuration settings from all configuration files</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="832"/> - <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="840"/> - <source>Verify repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="840"/> - <source>Verify repository...</source> + <source>Create .gitignore</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="844"/> - <source>Verify the connectivity and validity of objects of the database</source> + <source>Create a .gitignore file with default values</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="847"/> - <source><b>Verify repository</b><p>This verifies the connectivity and validity of objects of the database.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="855"/> - <source>Optimize repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="855"/> - <source>Optimize repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="859"/> - <source>Cleanup and optimize the local repository</source> + <source><b>Create .gitignore</b><p>This creates a .gitignore file with default values.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="854"/> + <source>Show combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="854"/> + <source>Show combined configuration settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="858"/> + <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="862"/> + <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="870"/> + <source>Verify repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="870"/> + <source>Verify repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="874"/> + <source>Verify the connectivity and validity of objects of the database</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="877"/> + <source><b>Verify repository</b><p>This verifies the connectivity and validity of objects of the database.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="885"/> + <source>Optimize repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="885"/> + <source>Optimize repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="889"/> + <source>Cleanup and optimize the local repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="892"/> <source><b>Optimize repository</b><p>This cleans up and optimizes the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="899"/> <source>Repository Statistics</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="899"/> <source>Repository Statistics...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="903"/> <source>Show some statistics of the local repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="876"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="906"/> <source><b>Repository Statistics</b><p>This show some statistics of the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="883"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="913"/> <source>Create Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="887"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="917"/> <source>Create an archive from the local repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="890"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="920"/> <source><b>Create Archive</b><p>This creates an archive from the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="897"/> - <source>Create bundle</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="897"/> - <source>Create bundle...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="901"/> - <source>Create bundle file collecting changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="904"/> - <source><b>Create bundle</b><p>This creates a bundle file collecting selected changesets (git bundle create).</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="912"/> - <source>Verify bundle</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="912"/> - <source>Verify bundle...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="916"/> - <source>Verify the validity and applicability of a bundle file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="919"/> - <source><b>Verify bundle</b><p>This verifies that a bundle file is valid and will apply cleanly.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> - <source>List bundle heads</source> + <source>Create bundle</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> - <source>List bundle heads...</source> + <source>Create bundle...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="931"/> - <source>List all heads contained in a bundle file</source> + <source>Create bundle file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="934"/> + <source><b>Create bundle</b><p>This creates a bundle file collecting selected changesets (git bundle create).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="942"/> + <source>Verify bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="942"/> + <source>Verify bundle...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="946"/> + <source>Verify the validity and applicability of a bundle file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="949"/> + <source><b>Verify bundle</b><p>This verifies that a bundle file is valid and will apply cleanly.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="957"/> + <source>List bundle heads</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="957"/> + <source>List bundle heads...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="961"/> + <source>List all heads contained in a bundle file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="964"/> <source><b>List bundle heads</b><p>This lists all heads contained in a bundle file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="971"/> <source>Apply Bundle (fetch)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="971"/> <source>Apply Bundle (fetch)...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="945"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="975"/> <source>Apply a head of a bundle file using fetch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="948"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="978"/> <source><b>Apply Bundle (fetch)</b><p>This applies a head of a bundle file using fetch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2097"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2159"/> <source>Apply Bundle (pull)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="955"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="985"/> <source>Apply Bundle (pull)...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="959"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="989"/> <source>Apply a head of a bundle file using pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="962"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="992"/> <source><b>Apply Bundle (pull)</b><p>This applies a head of a bundle file using pull.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="969"/> - <source>Start</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="973"/> - <source>Start a bisect session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="976"/> - <source><b>Start</b><p>This starts a bisect session.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="983"/> - <source>Start (Extended)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="987"/> - <source>Start a bisect session giving a bad and optionally good commits</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="990"/> - <source><b>Start (Extended)</b><p>This starts a bisect session giving a bad and optionally good commits.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="999"/> - <source>Mark as "good"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="999"/> - <source>Mark as "good"...</source> + <source>Start</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1003"/> - <source>Mark a selectable revision as good</source> + <source>Start a bisect session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1006"/> - <source><b>Mark as "good"</b><p>This marks a selectable revision as good.</p></source> + <source><b>Start</b><p>This starts a bisect session.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1013"/> - <source>Mark as "bad"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1013"/> - <source>Mark as "bad"...</source> + <source>Start (Extended)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1017"/> - <source>Mark a selectable revision as bad</source> + <source>Start a bisect session giving a bad and optionally good commits</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1020"/> + <source><b>Start (Extended)</b><p>This starts a bisect session giving a bad and optionally good commits.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1029"/> + <source>Mark as "good"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1029"/> + <source>Mark as "good"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1033"/> + <source>Mark a selectable revision as good</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1036"/> + <source><b>Mark as "good"</b><p>This marks a selectable revision as good.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1043"/> + <source>Mark as "bad"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1043"/> + <source>Mark as "bad"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1047"/> + <source>Mark a selectable revision as bad</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1050"/> <source><b>Mark as "bad"</b><p>This marks a selectable revision as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1057"/> <source>Skip</source> <translation type="unfinished">Passer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1057"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1031"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1061"/> <source>Skip a selectable revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1064"/> <source><b>Skip</b><p>This skips a selectable revision.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1071"/> <source>Reset</source> <translation type="unfinished">Réinitialiser</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1071"/> <source>Reset...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1075"/> <source>Reset the bisect session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1078"/> <source><b>Reset</b><p>This resets the bisect session.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1055"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1085"/> <source>Show bisect log browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1090"/> <source>Show a dialog to browse the bisect log of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1063"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1093"/> <source><b>Show bisect log browser</b><p>This shows a dialog to browse the bisect log of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1072"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1102"/> <source>Create replay file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1106"/> <source>Create a replay file to repeat the current bisect session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1109"/> <source><b>Create replay file</b><p>This creates a replay file to repeat the current bisect session.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1088"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1118"/> <source>Edit replay file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1092"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1122"/> <source>Edit a bisect replay file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1095"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1125"/> <source><b>Edit replay file</b><p>This edits a bisect replay file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1133"/> <source>Replay session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1107"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1137"/> <source>Replay a bisect session from file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1110"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1140"/> <source><b>Replay session</b><p>This replays a bisect session from file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1147"/> <source>Check patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1121"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1151"/> <source>Check a list of patch files, if they would apply cleanly</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1124"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1154"/> <source><b>Check patch files</b><p>This checks a list of patch files, if they would apply cleanly.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2323"/> <source>Apply patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1166"/> <source>Apply a list of patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1139"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1169"/> <source><b>Apply patch files</b><p>This applies a list of patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1146"/> - <source>Show patch statistics</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1150"/> - <source>Show some statistics for a list of patch files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1153"/> - <source><b>Show patch statistics</b><p>This shows some statistics for a list of patch files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1165"/> - <source>Add a submodule to the current project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1168"/> - <source><b>Add</b><p>This adds a submodule to the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1176"/> - <source>List</source> + <source>Show patch statistics</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1180"/> - <source>List the submodule of the current project</source> + <source>Show some statistics for a list of patch files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1183"/> - <source><b>List</b><p>This lists the submodules of the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1191"/> - <source>Initialize</source> + <source><b>Show patch statistics</b><p>This shows some statistics for a list of patch files.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1195"/> - <source>Initialize the submodules of the current project</source> + <source>Add a submodule to the current project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1198"/> + <source><b>Add</b><p>This adds a submodule to the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1206"/> + <source>List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1210"/> + <source>List the submodule of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1213"/> + <source><b>List</b><p>This lists the submodules of the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1221"/> + <source>Initialize</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1225"/> + <source>Initialize the submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1228"/> <source><b>Initialize</b><p>This initializes the submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1207"/> - <source>Unregister</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1211"/> - <source>Unregister submodules of the current project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1214"/> - <source><b>Unregister</b><p>This unregisters submodules of the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1222"/> - <source>Update</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1226"/> - <source>Update submodules of the current project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1229"/> - <source><b>Update</b><p>This updates submodules of the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1237"/> - <source>Initialize and Update</source> + <source>Unregister</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1241"/> - <source>Initialize and update submodules of the current project</source> + <source>Unregister submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1244"/> + <source><b>Unregister</b><p>This unregisters submodules of the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1252"/> + <source>Update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1256"/> + <source>Update submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1259"/> + <source><b>Update</b><p>This updates submodules of the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1267"/> + <source>Initialize and Update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1271"/> + <source>Initialize and update submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1274"/> <source><b>Initialize and Update</b><p>This initializes and updates submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1253"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1283"/> <source>Fetch and Update</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1257"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1287"/> <source>Fetch and update submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1260"/> - <source><b>Fetch and Update</b><p>This fetches and updates submodules of the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1269"/> - <source>Update with Options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1273"/> - <source>Update submodules of the current project offering a dialog to enter options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1277"/> - <source><b>Update with Options</b><p>This updates submodules of the current project offering a dialog to enter update options.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1286"/> - <source>Synchronize URLs</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1290"/> + <source><b>Fetch and Update</b><p>This fetches and updates submodules of the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1299"/> + <source>Update with Options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1303"/> + <source>Update submodules of the current project offering a dialog to enter options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1307"/> + <source><b>Update with Options</b><p>This updates submodules of the current project offering a dialog to enter update options.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1316"/> + <source>Synchronize URLs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1320"/> <source>Synchronize URLs of submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1293"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1323"/> <source><b>Synchronize URLs</b><p>This synchronizes URLs of submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1332"/> <source>Show Status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1306"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1336"/> <source>Show the status of submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1339"/> <source><b>Show Status</b><p>This shows a dialog with the status of submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1318"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1348"/> <source>Show Summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1322"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1352"/> <source>Show summary information for submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1325"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1355"/> <source><b>Show Summary</b><p>This shows some summary information for submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1344"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1374"/> <source>Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1360"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1390"/> <source>Bundle Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1401"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2237"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2299"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1397"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1427"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1405"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1435"/> <source>Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1418"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1448"/> <source>Manage Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1426"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1456"/> <source>Remote Repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1436"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1468"/> <source>Cherry-pick</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1444"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1476"/> <source>Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1459"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1491"/> <source>Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1541"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1573"/> <source>Git</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1646"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1678"/> <source>Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2323"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1690"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1722"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1715"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1747"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1734"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1766"/> <source>Unstage Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1874"/> <source>Select a remote repository:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1853"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1915"/> <source>Copy Commits (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1872"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1934"/> <source>Copy Commits (Quit)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1892"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1954"/> <source>Copy Commits (Cancel)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1911"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1973"/> <source>Save Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1961"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2023"/> <source>Restore Stash</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="604"/> + <source>Change URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="604"/> + <source>Change URL...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="608"/> + <source>Change the URL of a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="611"/> + <source><b>Change URL</b><p>This changes the URL of a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="618"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="618"/> + <source>Credentials...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="622"/> + <source>Change or set the user credentials of a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="625"/> + <source><b>Credentials</b><p>This changes or sets the user credentials of a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>GitPullDialog</name> @@ -22972,6 +23065,49 @@ </message> </context> <context> + <name>GitRemoteCredentialsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="14"/> + <source>Git Remote Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished">Nom:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="40"/> + <source>URL:</source> + <translation type="unfinished">URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="57"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="63"/> + <source>Username:</source> + <translation type="unfinished">Nom d'utilisateur:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="70"/> + <source>Enter the user name for the remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="77"/> + <source>Password:</source> + <translation type="unfinished">Mot de passe:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="87"/> + <source>Enter the password for the remote repository</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GitRemoteRepositoriesDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="14"/> @@ -23015,92 +23151,92 @@ <translation type="unfinished">&Ajouter</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="159"/> + <source>Press to rename the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="162"/> + <source>&Rename</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="92"/> - <source>Press to rename the selected repository</source> + <source>Press to remove the selected repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="95"/> - <source>&Rename</source> + <source>Re&move</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="102"/> - <source>Press to remove the selected repository</source> + <source>Press to delete stale tracking branches under the selected repository </source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="105"/> - <source>Re&move</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="112"/> - <source>Press to delete stale tracking branches under the selected repository </source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="115"/> <source>&Prune</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="129"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="119"/> <source>Press to show information about the selected repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="132"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="122"/> <source>Show &Info...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="160"/> - <source>Errors</source> - <translation type="unfinished">Erreurs</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="166"/> - <source><b>Git log errors</b><p>This shows possible error messages of the git log command.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="182"/> - <source>Input</source> - <translation type="unfinished">Entrée</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="204"/> - <source>Press to send the input to the git process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="207"/> - <source>&Send</source> - <translation type="unfinished">&Envoyer</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="210"/> + <source>Errors</source> + <translation type="unfinished">Erreurs</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="216"/> + <source><b>Git log errors</b><p>This shows possible error messages of the git log command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="232"/> + <source>Input</source> + <translation type="unfinished">Entrée</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="254"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="257"/> + <source>&Send</source> + <translation type="unfinished">&Envoyer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="260"/> <source>Alt+S</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="267"/> <source>Enter data to be sent to the git process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="224"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="274"/> <source>Select to switch the input field to password mode</source> <translation type="unfinished">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="227"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="277"/> <source>&Password Mode</source> <translation type="unfinished">Mode Mot de &Passe</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="280"/> <source>Alt+P</source> <translation type="unfinished">Alt+P</translation> </message> @@ -23124,6 +23260,26 @@ <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="169"/> + <source>Press to change the URL of the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="172"/> + <source>Change &URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="179"/> + <source>Press to set or change the user credentials of the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="182"/> + <source>&Credentials</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>GitRevisionSelectionDialog</name>
--- a/i18n/eric6_it.ts Sun Jun 03 11:30:57 2018 +0200 +++ b/i18n/eric6_it.ts Sun Jun 03 14:03:19 2018 +0200 @@ -1476,7 +1476,7 @@ </message> <message> <location filename="../Utilities/BackgroundService.py" line="422"/> - <source>Erics background client disconnected because of an unknown reason.</source> + <source>Eric's background client disconnected because of an unknown reason.</source> <translation type="unfinished"></translation> </message> <message> @@ -18017,237 +18017,237 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2972"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3070"/> <source>Show Remote Info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> <source>Rename Remote Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> <source>Enter new name for remote repository:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2996"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3094"/> <source>Show Shortlog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3054"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3152"/> <source>Cherry-pick</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3084"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3182"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3109"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3207"/> <source>Copy Changesets (Quit)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3233"/> <source>Copy Changesets (Cancel)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3215"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3313"/> <source>Saving stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3414"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> <source>Show Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3414"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> <source>Select a stash (empty for latest stash):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3326"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3424"/> <source>Restore Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3340"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3438"/> <source>Restoring stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3374"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3472"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3364"/> - <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="3389"/> - <source>Creating branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3423"/> - <source>Delete Stash</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3423"/> - <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="3434"/> - <source>Deleting stash</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3454"/> - <source>Delete All Stashes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3454"/> - <source>Do you really want to delete all stashes?</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> - <source>Deleting all stashes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3534"/> - <source>Showing the combined configuration settings</source> - <translation type="unfinished">Visualizzazione combinata della impostazioni di configurazione</translation> + <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="3487"/> + <source>Creating branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <source>Delete Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <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="3532"/> + <source>Deleting stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <source>Delete All Stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <source>Do you really want to delete all stashes?</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3560"/> - <source>Verifying the integrity of the Git repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3585"/> - <source>Performing Repository Housekeeping</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3629"/> - <source><tr><td><b>Statistics</b></td></tr></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3630"/> - <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="3634"/> - <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="3638"/> - <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="3642"/> - <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="3646"/> - <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="3650"/> - <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="3654"/> - <source><tr><td>Garbage files: </td><td>{0}</td></tr></source> - <translation type="unfinished"></translation> + <source>Deleting all stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3632"/> + <source>Showing the combined configuration settings</source> + <translation type="unfinished">Visualizzazione combinata della impostazioni di configurazione</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3658"/> + <source>Verifying the integrity of the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3683"/> + <source>Performing Repository Housekeeping</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3727"/> + <source><tr><td><b>Statistics</b></td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3728"/> + <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="3732"/> + <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="3736"/> + <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="3740"/> + <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="3744"/> + <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="3748"/> + <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="3752"/> + <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="3756"/> <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="3664"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3762"/> <source><p><b>No statistics available.</b></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3730"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3828"/> <source>Creating Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3773"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3871"/> <source>Add Submodule</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> <source>List Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> <source>No submodules defined for the project.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3956"/> <source>All</source> <translation type="unfinished">Tutti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> <source>Submodule Path</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> <source>Select a submodule path:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3914"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4012"/> <source>Initialize Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3951"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4049"/> <source>Unregister Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4031"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4129"/> <source>Update Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4065"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4163"/> <source>Synchronize Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4123"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4221"/> <source>Submodules Summary</source> <translation type="unfinished"></translation> </message> @@ -18279,6 +18279,31 @@ <source>Enter the remote URL</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="51"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="57"/> + <source>Username:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="64"/> + <source>Enter the user name for the remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="71"/> + <source>Password:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="81"/> + <source>Enter the password for the remote repository</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>GitApplyBundleDataDialog</name> @@ -18904,6 +18929,34 @@ </message> </context> <context> + <name>GitChangeRemoteUrlDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="14"/> + <source>Git Change Remote URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished">Nome:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="40"/> + <source>URL:</source> + <translation type="unfinished">URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="57"/> + <source>New URL:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="64"/> + <source>Enter the new remote URL</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GitCherryPickDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="14"/> @@ -21172,7 +21225,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1765"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1797"/> <source>Show Remote Info</source> <translation type="unfinished"></translation> </message> @@ -21187,7 +21240,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1161"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1191"/> <source>Add</source> <translation type="unfinished">Aggiungi</translation> </message> @@ -21207,7 +21260,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1785"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1817"/> <source>Remove</source> <translation type="unfinished">Rimuovi</translation> </message> @@ -21227,7 +21280,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1799"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1831"/> <source>Prune</source> <translation type="unfinished"></translation> </message> @@ -21247,7 +21300,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1874"/> <source>Rename</source> <translation type="unfinished"></translation> </message> @@ -21267,940 +21320,980 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1833"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1895"/> <source>Copy Commits</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="609"/> - <source>Copies commits into the current branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="612"/> - <source><b>Copy Commits</b><p>This copies commits on top of the current branch.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="619"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="623"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="626"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="635"/> - <source>Quit Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="639"/> - <source>Quit the current copying session</source> + <source>Copies commits into the current branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="642"/> - <source><b>Quit Copying Session</b><p>This quits the current copying session.</p></source> + <source><b>Copy Commits</b><p>This copies commits on top of the current branch.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="649"/> - <source>Cancel Copying Session</source> + <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="653"/> - <source>Cancel the current copying session and return to the previous state</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="657"/> - <source><b>Cancel Copying Session</b><p>This cancels the current copying session and returns to the previous state.</p></source> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="656"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="665"/> - <source>Stash changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="665"/> - <source>Stash changes...</source> + <source>Quit Copying Session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="669"/> - <source>Stash all current changes of the project</source> + <source>Quit the current copying session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="672"/> - <source><b>Stash changes</b><p>This stashes all current changes of the project.</p></source> + <source><b>Quit Copying Session</b><p>This quits the current copying session.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="679"/> - <source>Show stash browser</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="679"/> - <source>Show stash browser...</source> + <source>Cancel Copying Session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="683"/> - <source>Show a dialog with all stashes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="686"/> - <source><b>Show stash browser...</b><p>This shows a dialog listing all available stashes. Actions on these stashes may be executed via the context menu.</p></source> + <source>Cancel the current copying session and return to the previous state</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="687"/> + <source><b>Cancel Copying Session</b><p>This cancels the current copying session and returns to the previous state.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> - <source>Show stash</source> + <source>Stash changes</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> - <source>Show stash...</source> + <source>Stash changes...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="699"/> - <source>Show a dialog with a patch of a stash</source> + <source>Stash all current changes of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="702"/> + <source><b>Stash changes</b><p>This stashes all current changes of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="709"/> + <source>Show stash browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="709"/> + <source>Show stash browser...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="713"/> + <source>Show a dialog with all stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="716"/> + <source><b>Show stash browser...</b><p>This shows a dialog listing all available stashes. Actions on these stashes may be executed via the context menu.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="725"/> + <source>Show stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="725"/> + <source>Show stash...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="729"/> + <source>Show a dialog with a patch of a stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="732"/> <source><b>Show stash...</b><p>This shows a dialog with a patch of a selectable stash.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="710"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="740"/> <source>Restore && Keep</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="714"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="744"/> <source>Restore a stash but keep it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="717"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="747"/> <source><b>Restore &amp; Keep</b><p>This restores a selectable stash and keeps it.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="724"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="754"/> <source>Restore && Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="758"/> <source>Restore a stash and delete it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="731"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="761"/> <source><b>Restore &amp; Delete</b><p>This restores a selectable stash and deletes it.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1980"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2042"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="772"/> <source>Create a new branch and restore a stash into it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="745"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="775"/> <source><b>Create Branch</b><p>This creates a new branch and restores a stash into it.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="753"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="783"/> <source>Delete</source> <translation type="unfinished">Cancella</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="787"/> <source>Delete a stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="760"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="790"/> <source><b>Delete</b><p>This deletes a stash.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="767"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="797"/> <source>Delete All</source> <translation type="unfinished">Cancella tutto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="771"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="801"/> <source>Delete all stashes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="774"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="804"/> <source><b>Delete All</b><p>This deletes all stashes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="811"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="811"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="785"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="815"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="788"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="818"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="825"/> <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="825"/> <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="829"/> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="802"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="810"/> - <source>Create .gitignore</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="814"/> - <source>Create a .gitignore file with default values</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="817"/> - <source><b>Create .gitignore</b><p>This creates a .gitignore file with default values.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="824"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="824"/> - <source>Show combined configuration settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="828"/> - <source>Show the combined configuration settings from all configuration files</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="832"/> - <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="840"/> - <source>Verify repository</source> - <translation type="unfinished">Verifica repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="840"/> - <source>Verify repository...</source> - <translation type="unfinished">Verifica repository...</translation> + <source>Create .gitignore</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="844"/> - <source>Verify the connectivity and validity of objects of the database</source> + <source>Create a .gitignore file with default values</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="847"/> - <source><b>Verify repository</b><p>This verifies the connectivity and validity of objects of the database.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="855"/> - <source>Optimize repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="855"/> - <source>Optimize repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="859"/> - <source>Cleanup and optimize the local repository</source> + <source><b>Create .gitignore</b><p>This creates a .gitignore file with default values.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="854"/> + <source>Show combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="854"/> + <source>Show combined configuration settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="858"/> + <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="862"/> + <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="870"/> + <source>Verify repository</source> + <translation type="unfinished">Verifica repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="870"/> + <source>Verify repository...</source> + <translation type="unfinished">Verifica repository...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="874"/> + <source>Verify the connectivity and validity of objects of the database</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="877"/> + <source><b>Verify repository</b><p>This verifies the connectivity and validity of objects of the database.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="885"/> + <source>Optimize repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="885"/> + <source>Optimize repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="889"/> + <source>Cleanup and optimize the local repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="892"/> <source><b>Optimize repository</b><p>This cleans up and optimizes the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="899"/> <source>Repository Statistics</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="899"/> <source>Repository Statistics...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="903"/> <source>Show some statistics of the local repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="876"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="906"/> <source><b>Repository Statistics</b><p>This show some statistics of the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="883"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="913"/> <source>Create Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="887"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="917"/> <source>Create an archive from the local repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="890"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="920"/> <source><b>Create Archive</b><p>This creates an archive from the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="897"/> - <source>Create bundle</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="897"/> - <source>Create bundle...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="901"/> - <source>Create bundle file collecting changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="904"/> - <source><b>Create bundle</b><p>This creates a bundle file collecting selected changesets (git bundle create).</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="912"/> - <source>Verify bundle</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="912"/> - <source>Verify bundle...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="916"/> - <source>Verify the validity and applicability of a bundle file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="919"/> - <source><b>Verify bundle</b><p>This verifies that a bundle file is valid and will apply cleanly.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> - <source>List bundle heads</source> + <source>Create bundle</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> - <source>List bundle heads...</source> + <source>Create bundle...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="931"/> - <source>List all heads contained in a bundle file</source> + <source>Create bundle file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="934"/> + <source><b>Create bundle</b><p>This creates a bundle file collecting selected changesets (git bundle create).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="942"/> + <source>Verify bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="942"/> + <source>Verify bundle...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="946"/> + <source>Verify the validity and applicability of a bundle file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="949"/> + <source><b>Verify bundle</b><p>This verifies that a bundle file is valid and will apply cleanly.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="957"/> + <source>List bundle heads</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="957"/> + <source>List bundle heads...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="961"/> + <source>List all heads contained in a bundle file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="964"/> <source><b>List bundle heads</b><p>This lists all heads contained in a bundle file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="971"/> <source>Apply Bundle (fetch)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="971"/> <source>Apply Bundle (fetch)...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="945"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="975"/> <source>Apply a head of a bundle file using fetch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="948"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="978"/> <source><b>Apply Bundle (fetch)</b><p>This applies a head of a bundle file using fetch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2097"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2159"/> <source>Apply Bundle (pull)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="955"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="985"/> <source>Apply Bundle (pull)...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="959"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="989"/> <source>Apply a head of a bundle file using pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="962"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="992"/> <source><b>Apply Bundle (pull)</b><p>This applies a head of a bundle file using pull.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="969"/> - <source>Start</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="973"/> - <source>Start a bisect session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="976"/> - <source><b>Start</b><p>This starts a bisect session.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="983"/> - <source>Start (Extended)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="987"/> - <source>Start a bisect session giving a bad and optionally good commits</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="990"/> - <source><b>Start (Extended)</b><p>This starts a bisect session giving a bad and optionally good commits.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="999"/> - <source>Mark as "good"</source> - <translation type="unfinished">Segna come "good"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="999"/> - <source>Mark as "good"...</source> - <translation type="unfinished">Segna come "good"...</translation> + <source>Start</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1003"/> - <source>Mark a selectable revision as good</source> + <source>Start a bisect session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1006"/> - <source><b>Mark as "good"</b><p>This marks a selectable revision as good.</p></source> + <source><b>Start</b><p>This starts a bisect session.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1013"/> - <source>Mark as "bad"</source> - <translation type="unfinished">Segna come "bad"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1013"/> - <source>Mark as "bad"...</source> - <translation type="unfinished">Segna come "bad"...</translation> + <source>Start (Extended)</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1017"/> - <source>Mark a selectable revision as bad</source> + <source>Start a bisect session giving a bad and optionally good commits</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1020"/> + <source><b>Start (Extended)</b><p>This starts a bisect session giving a bad and optionally good commits.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1029"/> + <source>Mark as "good"</source> + <translation type="unfinished">Segna come "good"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1029"/> + <source>Mark as "good"...</source> + <translation type="unfinished">Segna come "good"...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1033"/> + <source>Mark a selectable revision as good</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1036"/> + <source><b>Mark as "good"</b><p>This marks a selectable revision as good.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1043"/> + <source>Mark as "bad"</source> + <translation type="unfinished">Segna come "bad"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1043"/> + <source>Mark as "bad"...</source> + <translation type="unfinished">Segna come "bad"...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1047"/> + <source>Mark a selectable revision as bad</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1050"/> <source><b>Mark as "bad"</b><p>This marks a selectable revision as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1057"/> <source>Skip</source> <translation type="unfinished">Salta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1057"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1031"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1061"/> <source>Skip a selectable revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1064"/> <source><b>Skip</b><p>This skips a selectable revision.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1071"/> <source>Reset</source> <translation type="unfinished">Resetta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1071"/> <source>Reset...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1075"/> <source>Reset the bisect session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1078"/> <source><b>Reset</b><p>This resets the bisect session.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1055"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1085"/> <source>Show bisect log browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1090"/> <source>Show a dialog to browse the bisect log of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1063"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1093"/> <source><b>Show bisect log browser</b><p>This shows a dialog to browse the bisect log of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1072"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1102"/> <source>Create replay file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1106"/> <source>Create a replay file to repeat the current bisect session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1109"/> <source><b>Create replay file</b><p>This creates a replay file to repeat the current bisect session.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1088"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1118"/> <source>Edit replay file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1092"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1122"/> <source>Edit a bisect replay file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1095"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1125"/> <source><b>Edit replay file</b><p>This edits a bisect replay file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1133"/> <source>Replay session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1107"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1137"/> <source>Replay a bisect session from file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1110"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1140"/> <source><b>Replay session</b><p>This replays a bisect session from file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1147"/> <source>Check patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1121"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1151"/> <source>Check a list of patch files, if they would apply cleanly</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1124"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1154"/> <source><b>Check patch files</b><p>This checks a list of patch files, if they would apply cleanly.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2323"/> <source>Apply patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1166"/> <source>Apply a list of patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1139"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1169"/> <source><b>Apply patch files</b><p>This applies a list of patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1146"/> - <source>Show patch statistics</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1150"/> - <source>Show some statistics for a list of patch files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1153"/> - <source><b>Show patch statistics</b><p>This shows some statistics for a list of patch files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1165"/> - <source>Add a submodule to the current project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1168"/> - <source><b>Add</b><p>This adds a submodule to the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1176"/> - <source>List</source> + <source>Show patch statistics</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1180"/> - <source>List the submodule of the current project</source> + <source>Show some statistics for a list of patch files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1183"/> - <source><b>List</b><p>This lists the submodules of the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1191"/> - <source>Initialize</source> + <source><b>Show patch statistics</b><p>This shows some statistics for a list of patch files.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1195"/> - <source>Initialize the submodules of the current project</source> + <source>Add a submodule to the current project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1198"/> + <source><b>Add</b><p>This adds a submodule to the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1206"/> + <source>List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1210"/> + <source>List the submodule of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1213"/> + <source><b>List</b><p>This lists the submodules of the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1221"/> + <source>Initialize</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1225"/> + <source>Initialize the submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1228"/> <source><b>Initialize</b><p>This initializes the submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1207"/> - <source>Unregister</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1211"/> - <source>Unregister submodules of the current project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1214"/> - <source><b>Unregister</b><p>This unregisters submodules of the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1222"/> - <source>Update</source> - <translation type="unfinished">Aggiorna</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1226"/> - <source>Update submodules of the current project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1229"/> - <source><b>Update</b><p>This updates submodules of the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1237"/> - <source>Initialize and Update</source> + <source>Unregister</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1241"/> - <source>Initialize and update submodules of the current project</source> + <source>Unregister submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1244"/> + <source><b>Unregister</b><p>This unregisters submodules of the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1252"/> + <source>Update</source> + <translation type="unfinished">Aggiorna</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1256"/> + <source>Update submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1259"/> + <source><b>Update</b><p>This updates submodules of the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1267"/> + <source>Initialize and Update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1271"/> + <source>Initialize and update submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1274"/> <source><b>Initialize and Update</b><p>This initializes and updates submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1253"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1283"/> <source>Fetch and Update</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1257"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1287"/> <source>Fetch and update submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1260"/> - <source><b>Fetch and Update</b><p>This fetches and updates submodules of the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1269"/> - <source>Update with Options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1273"/> - <source>Update submodules of the current project offering a dialog to enter options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1277"/> - <source><b>Update with Options</b><p>This updates submodules of the current project offering a dialog to enter update options.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1286"/> - <source>Synchronize URLs</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1290"/> + <source><b>Fetch and Update</b><p>This fetches and updates submodules of the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1299"/> + <source>Update with Options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1303"/> + <source>Update submodules of the current project offering a dialog to enter options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1307"/> + <source><b>Update with Options</b><p>This updates submodules of the current project offering a dialog to enter update options.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1316"/> + <source>Synchronize URLs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1320"/> <source>Synchronize URLs of submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1293"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1323"/> <source><b>Synchronize URLs</b><p>This synchronizes URLs of submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1332"/> <source>Show Status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1306"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1336"/> <source>Show the status of submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1339"/> <source><b>Show Status</b><p>This shows a dialog with the status of submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1318"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1348"/> <source>Show Summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1322"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1352"/> <source>Show summary information for submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1325"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1355"/> <source><b>Show Summary</b><p>This shows some summary information for submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1344"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1374"/> <source>Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1360"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1390"/> <source>Bundle Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1401"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2237"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2299"/> <source>Bisect</source> <translation type="unfinished">Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1397"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1427"/> <source>Tags</source> <translation type="unfinished">Tags</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1405"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1435"/> <source>Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1418"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1448"/> <source>Manage Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1426"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1456"/> <source>Remote Repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1436"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1468"/> <source>Cherry-pick</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1444"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1476"/> <source>Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1459"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1491"/> <source>Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1541"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1573"/> <source>Git</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1646"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1678"/> <source>Branch</source> <translation type="unfinished">Branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2323"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Il progetto deve essere riletto. Farlo ora ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1690"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1722"/> <source>Pull</source> <translation type="unfinished">Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1715"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1747"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1734"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1766"/> <source>Unstage Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1874"/> <source>Select a remote repository:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1853"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1915"/> <source>Copy Commits (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1872"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1934"/> <source>Copy Commits (Quit)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1892"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1954"/> <source>Copy Commits (Cancel)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1911"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1973"/> <source>Save Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1961"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2023"/> <source>Restore Stash</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="604"/> + <source>Change URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="604"/> + <source>Change URL...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="608"/> + <source>Change the URL of a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="611"/> + <source><b>Change URL</b><p>This changes the URL of a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="618"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="618"/> + <source>Credentials...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="622"/> + <source>Change or set the user credentials of a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="625"/> + <source><b>Credentials</b><p>This changes or sets the user credentials of a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>GitPullDialog</name> @@ -22502,6 +22595,49 @@ </message> </context> <context> + <name>GitRemoteCredentialsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="14"/> + <source>Git Remote Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished">Nome:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="40"/> + <source>URL:</source> + <translation type="unfinished">URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="57"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="63"/> + <source>Username:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="70"/> + <source>Enter the user name for the remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="77"/> + <source>Password:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="87"/> + <source>Enter the password for the remote repository</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GitRemoteRepositoriesDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="14"/> @@ -22545,92 +22681,92 @@ <translation type="unfinished">&Aggiungi</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="159"/> + <source>Press to rename the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="162"/> + <source>&Rename</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="92"/> - <source>Press to rename the selected repository</source> + <source>Press to remove the selected repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="95"/> - <source>&Rename</source> + <source>Re&move</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="102"/> - <source>Press to remove the selected repository</source> + <source>Press to delete stale tracking branches under the selected repository </source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="105"/> - <source>Re&move</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="112"/> - <source>Press to delete stale tracking branches under the selected repository </source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="115"/> <source>&Prune</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="129"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="119"/> <source>Press to show information about the selected repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="132"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="122"/> <source>Show &Info...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="160"/> - <source>Errors</source> - <translation type="unfinished">Errori</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="166"/> - <source><b>Git log errors</b><p>This shows possible error messages of the git log command.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="182"/> - <source>Input</source> - <translation type="unfinished">Input</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="204"/> - <source>Press to send the input to the git process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="207"/> - <source>&Send</source> - <translation type="unfinished">&Spedisci</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="210"/> + <source>Errors</source> + <translation type="unfinished">Errori</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="216"/> + <source><b>Git log errors</b><p>This shows possible error messages of the git log command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="232"/> + <source>Input</source> + <translation type="unfinished">Input</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="254"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="257"/> + <source>&Send</source> + <translation type="unfinished">&Spedisci</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="260"/> <source>Alt+S</source> <translation type="unfinished">Alt+S</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="267"/> <source>Enter data to be sent to the git process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="224"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="274"/> <source>Select to switch the input field to password mode</source> <translation type="unfinished">Seleziona per impostare il campo di input in modalità password</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="227"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="277"/> <source>&Password Mode</source> <translation type="unfinished">Modo &Password</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="280"/> <source>Alt+P</source> <translation type="unfinished">Alt+P</translation> </message> @@ -22654,6 +22790,26 @@ <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/GitRemoteRepositoriesDialog.ui" line="169"/> + <source>Press to change the URL of the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="172"/> + <source>Change &URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="179"/> + <source>Press to set or change the user credentials of the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="182"/> + <source>&Credentials</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>GitRevisionSelectionDialog</name>
--- a/i18n/eric6_pt.ts Sun Jun 03 11:30:57 2018 +0200 +++ b/i18n/eric6_pt.ts Sun Jun 03 14:03:19 2018 +0200 @@ -1554,8 +1554,8 @@ </message> <message> <location filename="../Utilities/BackgroundService.py" line="422"/> - <source>Erics background client disconnected because of an unknown reason.</source> - <translation>Cliente de fundo de Eric desconectou-se por motivo desconhecido.</translation> + <source>Eric's background client disconnected because of an unknown reason.</source> + <translation type="unfinished">Cliente de fundo de Eric desconectou-se por motivo desconhecido.</translation> </message> <message> <location filename="../Utilities/BackgroundService.py" line="428"/> @@ -18708,237 +18708,237 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2972"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3070"/> <source>Show Remote Info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> <source>Rename Remote Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> <source>Enter new name for remote repository:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2996"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3094"/> <source>Show Shortlog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3054"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3152"/> <source>Cherry-pick</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3084"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3182"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3109"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3207"/> <source>Copy Changesets (Quit)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3233"/> <source>Copy Changesets (Cancel)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3215"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3313"/> <source>Saving stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3414"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> <source>Show Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3414"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> <source>Select a stash (empty for latest stash):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3326"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3424"/> <source>Restore Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3340"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3438"/> <source>Restoring stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3374"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3472"/> <source>Create Branch</source> <translation type="unfinished">Criar Ramo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3364"/> - <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="3389"/> - <source>Creating branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3423"/> - <source>Delete Stash</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3423"/> - <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="3434"/> - <source>Deleting stash</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3454"/> - <source>Delete All Stashes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3454"/> - <source>Do you really want to delete all stashes?</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> - <source>Deleting all stashes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3534"/> - <source>Showing the combined configuration settings</source> - <translation type="unfinished">A mostrar as definições de configuração combinadas</translation> + <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="3487"/> + <source>Creating branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <source>Delete Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <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="3532"/> + <source>Deleting stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <source>Delete All Stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <source>Do you really want to delete all stashes?</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3560"/> - <source>Verifying the integrity of the Git repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3585"/> - <source>Performing Repository Housekeeping</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3629"/> - <source><tr><td><b>Statistics</b></td></tr></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3630"/> - <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="3634"/> - <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="3638"/> - <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="3642"/> - <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="3646"/> - <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="3650"/> - <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="3654"/> - <source><tr><td>Garbage files: </td><td>{0}</td></tr></source> - <translation type="unfinished"></translation> + <source>Deleting all stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3632"/> + <source>Showing the combined configuration settings</source> + <translation type="unfinished">A mostrar as definições de configuração combinadas</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3658"/> + <source>Verifying the integrity of the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3683"/> + <source>Performing Repository Housekeeping</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3727"/> + <source><tr><td><b>Statistics</b></td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3728"/> + <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="3732"/> + <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="3736"/> + <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="3740"/> + <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="3744"/> + <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="3748"/> + <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="3752"/> + <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="3756"/> <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="3664"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3762"/> <source><p><b>No statistics available.</b></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3730"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3828"/> <source>Creating Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3773"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3871"/> <source>Add Submodule</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> <source>List Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> <source>No submodules defined for the project.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3956"/> <source>All</source> <translation type="unfinished">Tudo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> <source>Submodule Path</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> <source>Select a submodule path:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3914"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4012"/> <source>Initialize Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3951"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4049"/> <source>Unregister Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4031"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4129"/> <source>Update Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4065"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4163"/> <source>Synchronize Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4123"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4221"/> <source>Submodules Summary</source> <translation type="unfinished"></translation> </message> @@ -18970,6 +18970,31 @@ <source>Enter the remote URL</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="51"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="57"/> + <source>Username:</source> + <translation type="unfinished">Nome de Usuário:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="64"/> + <source>Enter the user name for the remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="71"/> + <source>Password:</source> + <translation type="unfinished">Senha:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="81"/> + <source>Enter the password for the remote repository</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>GitApplyBundleDataDialog</name> @@ -19595,6 +19620,34 @@ </message> </context> <context> + <name>GitChangeRemoteUrlDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="14"/> + <source>Git Change Remote URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished">Nome:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="40"/> + <source>URL:</source> + <translation type="unfinished">URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="57"/> + <source>New URL:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="64"/> + <source>Enter the new remote URL</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GitCherryPickDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="14"/> @@ -21864,7 +21917,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1765"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1797"/> <source>Show Remote Info</source> <translation type="unfinished"></translation> </message> @@ -21879,7 +21932,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1161"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1191"/> <source>Add</source> <translation type="unfinished">Adicionar</translation> </message> @@ -21899,7 +21952,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1785"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1817"/> <source>Remove</source> <translation type="unfinished">Retirar</translation> </message> @@ -21919,7 +21972,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1799"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1831"/> <source>Prune</source> <translation type="unfinished"></translation> </message> @@ -21939,7 +21992,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1874"/> <source>Rename</source> <translation type="unfinished"></translation> </message> @@ -21959,940 +22012,980 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1833"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1895"/> <source>Copy Commits</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="609"/> - <source>Copies commits into the current branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="612"/> - <source><b>Copy Commits</b><p>This copies commits on top of the current branch.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="619"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="623"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="626"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="635"/> - <source>Quit Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="639"/> - <source>Quit the current copying session</source> + <source>Copies commits into the current branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="642"/> - <source><b>Quit Copying Session</b><p>This quits the current copying session.</p></source> + <source><b>Copy Commits</b><p>This copies commits on top of the current branch.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="649"/> - <source>Cancel Copying Session</source> + <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="653"/> - <source>Cancel the current copying session and return to the previous state</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="657"/> - <source><b>Cancel Copying Session</b><p>This cancels the current copying session and returns to the previous state.</p></source> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="656"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="665"/> - <source>Stash changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="665"/> - <source>Stash changes...</source> + <source>Quit Copying Session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="669"/> - <source>Stash all current changes of the project</source> + <source>Quit the current copying session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="672"/> - <source><b>Stash changes</b><p>This stashes all current changes of the project.</p></source> + <source><b>Quit Copying Session</b><p>This quits the current copying session.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="679"/> - <source>Show stash browser</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="679"/> - <source>Show stash browser...</source> + <source>Cancel Copying Session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="683"/> - <source>Show a dialog with all stashes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="686"/> - <source><b>Show stash browser...</b><p>This shows a dialog listing all available stashes. Actions on these stashes may be executed via the context menu.</p></source> + <source>Cancel the current copying session and return to the previous state</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="687"/> + <source><b>Cancel Copying Session</b><p>This cancels the current copying session and returns to the previous state.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> - <source>Show stash</source> + <source>Stash changes</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> - <source>Show stash...</source> + <source>Stash changes...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="699"/> - <source>Show a dialog with a patch of a stash</source> + <source>Stash all current changes of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="702"/> + <source><b>Stash changes</b><p>This stashes all current changes of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="709"/> + <source>Show stash browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="709"/> + <source>Show stash browser...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="713"/> + <source>Show a dialog with all stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="716"/> + <source><b>Show stash browser...</b><p>This shows a dialog listing all available stashes. Actions on these stashes may be executed via the context menu.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="725"/> + <source>Show stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="725"/> + <source>Show stash...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="729"/> + <source>Show a dialog with a patch of a stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="732"/> <source><b>Show stash...</b><p>This shows a dialog with a patch of a selectable stash.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="710"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="740"/> <source>Restore && Keep</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="714"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="744"/> <source>Restore a stash but keep it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="717"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="747"/> <source><b>Restore &amp; Keep</b><p>This restores a selectable stash and keeps it.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="724"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="754"/> <source>Restore && Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="758"/> <source>Restore a stash and delete it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="731"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="761"/> <source><b>Restore &amp; Delete</b><p>This restores a selectable stash and deletes it.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1980"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2042"/> <source>Create Branch</source> <translation type="unfinished">Criar Ramo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="772"/> <source>Create a new branch and restore a stash into it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="745"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="775"/> <source><b>Create Branch</b><p>This creates a new branch and restores a stash into it.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="753"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="783"/> <source>Delete</source> <translation type="unfinished">Apagar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="787"/> <source>Delete a stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="760"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="790"/> <source><b>Delete</b><p>This deletes a stash.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="767"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="797"/> <source>Delete All</source> <translation type="unfinished">Apagar Tudo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="771"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="801"/> <source>Delete all stashes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="774"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="804"/> <source><b>Delete All</b><p>This deletes all stashes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="811"/> <source>Edit user configuration</source> <translation type="unfinished">Editar configuração de usuário</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="811"/> <source>Edit user configuration...</source> <translation type="unfinished">Editar configuração de usuário...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="785"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="815"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="788"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="818"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="825"/> <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="825"/> <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="829"/> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="802"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="810"/> - <source>Create .gitignore</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="814"/> - <source>Create a .gitignore file with default values</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="817"/> - <source><b>Create .gitignore</b><p>This creates a .gitignore file with default values.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="824"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="824"/> - <source>Show combined configuration settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="828"/> - <source>Show the combined configuration settings from all configuration files</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="832"/> - <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="840"/> - <source>Verify repository</source> - <translation type="unfinished">Verificar repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="840"/> - <source>Verify repository...</source> - <translation type="unfinished">Verificar repositorio...</translation> + <source>Create .gitignore</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="844"/> - <source>Verify the connectivity and validity of objects of the database</source> + <source>Create a .gitignore file with default values</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="847"/> - <source><b>Verify repository</b><p>This verifies the connectivity and validity of objects of the database.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="855"/> - <source>Optimize repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="855"/> - <source>Optimize repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="859"/> - <source>Cleanup and optimize the local repository</source> + <source><b>Create .gitignore</b><p>This creates a .gitignore file with default values.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="854"/> + <source>Show combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="854"/> + <source>Show combined configuration settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="858"/> + <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="862"/> + <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="870"/> + <source>Verify repository</source> + <translation type="unfinished">Verificar repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="870"/> + <source>Verify repository...</source> + <translation type="unfinished">Verificar repositorio...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="874"/> + <source>Verify the connectivity and validity of objects of the database</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="877"/> + <source><b>Verify repository</b><p>This verifies the connectivity and validity of objects of the database.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="885"/> + <source>Optimize repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="885"/> + <source>Optimize repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="889"/> + <source>Cleanup and optimize the local repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="892"/> <source><b>Optimize repository</b><p>This cleans up and optimizes the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="899"/> <source>Repository Statistics</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="899"/> <source>Repository Statistics...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="903"/> <source>Show some statistics of the local repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="876"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="906"/> <source><b>Repository Statistics</b><p>This show some statistics of the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="883"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="913"/> <source>Create Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="887"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="917"/> <source>Create an archive from the local repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="890"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="920"/> <source><b>Create Archive</b><p>This creates an archive from the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="897"/> - <source>Create bundle</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="897"/> - <source>Create bundle...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="901"/> - <source>Create bundle file collecting changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="904"/> - <source><b>Create bundle</b><p>This creates a bundle file collecting selected changesets (git bundle create).</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="912"/> - <source>Verify bundle</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="912"/> - <source>Verify bundle...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="916"/> - <source>Verify the validity and applicability of a bundle file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="919"/> - <source><b>Verify bundle</b><p>This verifies that a bundle file is valid and will apply cleanly.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> - <source>List bundle heads</source> + <source>Create bundle</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> - <source>List bundle heads...</source> + <source>Create bundle...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="931"/> - <source>List all heads contained in a bundle file</source> + <source>Create bundle file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="934"/> + <source><b>Create bundle</b><p>This creates a bundle file collecting selected changesets (git bundle create).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="942"/> + <source>Verify bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="942"/> + <source>Verify bundle...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="946"/> + <source>Verify the validity and applicability of a bundle file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="949"/> + <source><b>Verify bundle</b><p>This verifies that a bundle file is valid and will apply cleanly.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="957"/> + <source>List bundle heads</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="957"/> + <source>List bundle heads...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="961"/> + <source>List all heads contained in a bundle file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="964"/> <source><b>List bundle heads</b><p>This lists all heads contained in a bundle file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="971"/> <source>Apply Bundle (fetch)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="971"/> <source>Apply Bundle (fetch)...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="945"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="975"/> <source>Apply a head of a bundle file using fetch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="948"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="978"/> <source><b>Apply Bundle (fetch)</b><p>This applies a head of a bundle file using fetch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2097"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2159"/> <source>Apply Bundle (pull)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="955"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="985"/> <source>Apply Bundle (pull)...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="959"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="989"/> <source>Apply a head of a bundle file using pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="962"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="992"/> <source><b>Apply Bundle (pull)</b><p>This applies a head of a bundle file using pull.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="969"/> - <source>Start</source> - <translation type="unfinished">Iniciar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="973"/> - <source>Start a bisect session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="976"/> - <source><b>Start</b><p>This starts a bisect session.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="983"/> - <source>Start (Extended)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="987"/> - <source>Start a bisect session giving a bad and optionally good commits</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="990"/> - <source><b>Start (Extended)</b><p>This starts a bisect session giving a bad and optionally good commits.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="999"/> - <source>Mark as "good"</source> - <translation type="unfinished">Marcar como "bom"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="999"/> - <source>Mark as "good"...</source> - <translation type="unfinished">Marcar como "bom"...</translation> + <source>Start</source> + <translation type="unfinished">Iniciar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1003"/> - <source>Mark a selectable revision as good</source> + <source>Start a bisect session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1006"/> - <source><b>Mark as "good"</b><p>This marks a selectable revision as good.</p></source> + <source><b>Start</b><p>This starts a bisect session.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1013"/> - <source>Mark as "bad"</source> - <translation type="unfinished">Marcar como "mau"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1013"/> - <source>Mark as "bad"...</source> - <translation type="unfinished">Marcar como "mau"...</translation> + <source>Start (Extended)</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1017"/> - <source>Mark a selectable revision as bad</source> + <source>Start a bisect session giving a bad and optionally good commits</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1020"/> + <source><b>Start (Extended)</b><p>This starts a bisect session giving a bad and optionally good commits.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1029"/> + <source>Mark as "good"</source> + <translation type="unfinished">Marcar como "bom"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1029"/> + <source>Mark as "good"...</source> + <translation type="unfinished">Marcar como "bom"...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1033"/> + <source>Mark a selectable revision as good</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1036"/> + <source><b>Mark as "good"</b><p>This marks a selectable revision as good.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1043"/> + <source>Mark as "bad"</source> + <translation type="unfinished">Marcar como "mau"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1043"/> + <source>Mark as "bad"...</source> + <translation type="unfinished">Marcar como "mau"...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1047"/> + <source>Mark a selectable revision as bad</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1050"/> <source><b>Mark as "bad"</b><p>This marks a selectable revision as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1057"/> <source>Skip</source> <translation type="unfinished">Saltar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1057"/> <source>Skip...</source> <translation type="unfinished">Saltar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1031"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1061"/> <source>Skip a selectable revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1064"/> <source><b>Skip</b><p>This skips a selectable revision.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1071"/> <source>Reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1071"/> <source>Reset...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1075"/> <source>Reset the bisect session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1078"/> <source><b>Reset</b><p>This resets the bisect session.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1055"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1085"/> <source>Show bisect log browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1090"/> <source>Show a dialog to browse the bisect log of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1063"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1093"/> <source><b>Show bisect log browser</b><p>This shows a dialog to browse the bisect log of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1072"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1102"/> <source>Create replay file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1106"/> <source>Create a replay file to repeat the current bisect session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1109"/> <source><b>Create replay file</b><p>This creates a replay file to repeat the current bisect session.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1088"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1118"/> <source>Edit replay file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1092"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1122"/> <source>Edit a bisect replay file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1095"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1125"/> <source><b>Edit replay file</b><p>This edits a bisect replay file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1133"/> <source>Replay session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1107"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1137"/> <source>Replay a bisect session from file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1110"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1140"/> <source><b>Replay session</b><p>This replays a bisect session from file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1147"/> <source>Check patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1121"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1151"/> <source>Check a list of patch files, if they would apply cleanly</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1124"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1154"/> <source><b>Check patch files</b><p>This checks a list of patch files, if they would apply cleanly.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2323"/> <source>Apply patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1166"/> <source>Apply a list of patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1139"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1169"/> <source><b>Apply patch files</b><p>This applies a list of patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1146"/> - <source>Show patch statistics</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1150"/> - <source>Show some statistics for a list of patch files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1153"/> - <source><b>Show patch statistics</b><p>This shows some statistics for a list of patch files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1165"/> - <source>Add a submodule to the current project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1168"/> - <source><b>Add</b><p>This adds a submodule to the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1176"/> - <source>List</source> + <source>Show patch statistics</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1180"/> - <source>List the submodule of the current project</source> + <source>Show some statistics for a list of patch files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1183"/> - <source><b>List</b><p>This lists the submodules of the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1191"/> - <source>Initialize</source> + <source><b>Show patch statistics</b><p>This shows some statistics for a list of patch files.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1195"/> - <source>Initialize the submodules of the current project</source> + <source>Add a submodule to the current project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1198"/> + <source><b>Add</b><p>This adds a submodule to the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1206"/> + <source>List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1210"/> + <source>List the submodule of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1213"/> + <source><b>List</b><p>This lists the submodules of the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1221"/> + <source>Initialize</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1225"/> + <source>Initialize the submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1228"/> <source><b>Initialize</b><p>This initializes the submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1207"/> - <source>Unregister</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1211"/> - <source>Unregister submodules of the current project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1214"/> - <source><b>Unregister</b><p>This unregisters submodules of the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1222"/> - <source>Update</source> - <translation type="unfinished">Atualizar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1226"/> - <source>Update submodules of the current project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1229"/> - <source><b>Update</b><p>This updates submodules of the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1237"/> - <source>Initialize and Update</source> + <source>Unregister</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1241"/> - <source>Initialize and update submodules of the current project</source> + <source>Unregister submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1244"/> + <source><b>Unregister</b><p>This unregisters submodules of the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1252"/> + <source>Update</source> + <translation type="unfinished">Atualizar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1256"/> + <source>Update submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1259"/> + <source><b>Update</b><p>This updates submodules of the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1267"/> + <source>Initialize and Update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1271"/> + <source>Initialize and update submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1274"/> <source><b>Initialize and Update</b><p>This initializes and updates submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1253"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1283"/> <source>Fetch and Update</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1257"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1287"/> <source>Fetch and update submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1260"/> - <source><b>Fetch and Update</b><p>This fetches and updates submodules of the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1269"/> - <source>Update with Options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1273"/> - <source>Update submodules of the current project offering a dialog to enter options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1277"/> - <source><b>Update with Options</b><p>This updates submodules of the current project offering a dialog to enter update options.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1286"/> - <source>Synchronize URLs</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1290"/> + <source><b>Fetch and Update</b><p>This fetches and updates submodules of the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1299"/> + <source>Update with Options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1303"/> + <source>Update submodules of the current project offering a dialog to enter options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1307"/> + <source><b>Update with Options</b><p>This updates submodules of the current project offering a dialog to enter update options.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1316"/> + <source>Synchronize URLs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1320"/> <source>Synchronize URLs of submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1293"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1323"/> <source><b>Synchronize URLs</b><p>This synchronizes URLs of submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1332"/> <source>Show Status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1306"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1336"/> <source>Show the status of submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1339"/> <source><b>Show Status</b><p>This shows a dialog with the status of submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1318"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1348"/> <source>Show Summary</source> <translation type="unfinished">Mostrar Sumário</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1322"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1352"/> <source>Show summary information for submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1325"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1355"/> <source><b>Show Summary</b><p>This shows some summary information for submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1344"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1374"/> <source>Administration</source> <translation type="unfinished">Administração</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1360"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1390"/> <source>Bundle Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1401"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2237"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2299"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1397"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1427"/> <source>Tags</source> <translation type="unfinished">Etiquetas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1405"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1435"/> <source>Branches</source> <translation type="unfinished">Ramos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1418"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1448"/> <source>Manage Changes</source> <translation type="unfinished">Gerir Alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1426"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1456"/> <source>Remote Repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1436"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1468"/> <source>Cherry-pick</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1444"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1476"/> <source>Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1459"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1491"/> <source>Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1541"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1573"/> <source>Git</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1646"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1678"/> <source>Branch</source> <translation type="unfinished">Ramo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2323"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1690"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1722"/> <source>Pull</source> <translation type="unfinished">Puxar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1715"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1747"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1734"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1766"/> <source>Unstage Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1874"/> <source>Select a remote repository:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1853"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1915"/> <source>Copy Commits (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1872"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1934"/> <source>Copy Commits (Quit)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1892"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1954"/> <source>Copy Commits (Cancel)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1911"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1973"/> <source>Save Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1961"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2023"/> <source>Restore Stash</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="604"/> + <source>Change URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="604"/> + <source>Change URL...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="608"/> + <source>Change the URL of a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="611"/> + <source><b>Change URL</b><p>This changes the URL of a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="618"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="618"/> + <source>Credentials...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="622"/> + <source>Change or set the user credentials of a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="625"/> + <source><b>Credentials</b><p>This changes or sets the user credentials of a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>GitPullDialog</name> @@ -23194,6 +23287,49 @@ </message> </context> <context> + <name>GitRemoteCredentialsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="14"/> + <source>Git Remote Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished">Nome:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="40"/> + <source>URL:</source> + <translation type="unfinished">URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="57"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="63"/> + <source>Username:</source> + <translation type="unfinished">Nome de Usuário:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="70"/> + <source>Enter the user name for the remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="77"/> + <source>Password:</source> + <translation type="unfinished">Senha:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="87"/> + <source>Enter the password for the remote repository</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GitRemoteRepositoriesDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="14"/> @@ -23237,92 +23373,92 @@ <translation type="unfinished">&Adicionar</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="159"/> + <source>Press to rename the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="162"/> + <source>&Rename</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="92"/> - <source>Press to rename the selected repository</source> + <source>Press to remove the selected repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="95"/> - <source>&Rename</source> + <source>Re&move</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="102"/> - <source>Press to remove the selected repository</source> + <source>Press to delete stale tracking branches under the selected repository </source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="105"/> - <source>Re&move</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="112"/> - <source>Press to delete stale tracking branches under the selected repository </source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="115"/> <source>&Prune</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="129"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="119"/> <source>Press to show information about the selected repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="132"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="122"/> <source>Show &Info...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="160"/> - <source>Errors</source> - <translation type="unfinished">Erros</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="166"/> - <source><b>Git log errors</b><p>This shows possible error messages of the git log command.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="182"/> - <source>Input</source> - <translation type="unfinished">Entrada</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="204"/> - <source>Press to send the input to the git process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="207"/> - <source>&Send</source> - <translation type="unfinished">&Enviar</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="210"/> + <source>Errors</source> + <translation type="unfinished">Erros</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="216"/> + <source><b>Git log errors</b><p>This shows possible error messages of the git log command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="232"/> + <source>Input</source> + <translation type="unfinished">Entrada</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="254"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="257"/> + <source>&Send</source> + <translation type="unfinished">&Enviar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="260"/> <source>Alt+S</source> <translation type="unfinished">Alt+S</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="267"/> <source>Enter data to be sent to the git process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="224"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="274"/> <source>Select to switch the input field to password mode</source> <translation type="unfinished">Selecionar para mudar o campo de entrada ao modo senha</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="227"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="277"/> <source>&Password Mode</source> <translation type="unfinished">Modo &Senha</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="280"/> <source>Alt+P</source> <translation type="unfinished">Alt+P</translation> </message> @@ -23346,6 +23482,26 @@ <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="169"/> + <source>Press to change the URL of the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="172"/> + <source>Change &URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="179"/> + <source>Press to set or change the user credentials of the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="182"/> + <source>&Credentials</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>GitRevisionSelectionDialog</name>
--- a/i18n/eric6_ru.ts Sun Jun 03 11:30:57 2018 +0200 +++ b/i18n/eric6_ru.ts Sun Jun 03 14:03:19 2018 +0200 @@ -1479,8 +1479,8 @@ </message> <message> <location filename="../Utilities/BackgroundService.py" line="422"/> - <source>Erics background client disconnected because of an unknown reason.</source> - <translation>Фоновый клиент прервал соединение по неизвестной причине.</translation> + <source>Eric's background client disconnected because of an unknown reason.</source> + <translation type="unfinished">Фоновый клиент прервал соединение по неизвестной причине.</translation> </message> <message> <location filename="../Utilities/BackgroundService.py" line="428"/> @@ -18000,182 +18000,182 @@ <translation>Повтор Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2972"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3070"/> <source>Show Remote Info</source> <translation>Показать инфо об удаленном источнике</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> <source>Rename Remote Repository</source> <translation>Переименовать удаленный репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> <source>Enter new name for remote repository:</source> <translation>Введите новое имя для удаленного репозитория:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2996"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3094"/> <source>Show Shortlog</source> <translation>Отображение журнала изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3054"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3152"/> <source>Cherry-pick</source> <translation>Выборка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3084"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3182"/> <source>Copy Changesets (Continue)</source> <translation>Копировать набор изменений (продолжение)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3109"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3207"/> <source>Copy Changesets (Quit)</source> <translation>Копировать изменения (завершение)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3233"/> <source>Copy Changesets (Cancel)</source> <translation>Копировать изменения (отмена)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3215"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3313"/> <source>Saving stash</source> <translation>Сохранение в стеке незавершенных изменений ("заначка")</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3414"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> <source>Show Stash</source> <translation>Показать "заначку"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3414"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> <source>Select a stash (empty for latest stash):</source> <translation>Выберите "заначку" (оставьте пустым чтобы использовать последнюю):</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3326"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3424"/> <source>Restore Stash</source> <translation>Восстановить из "заначки"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3340"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3438"/> <source>Restoring stash</source> <translation>Восстановление из стека незавершенных изменений ("заначки")</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3374"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3472"/> <source>Create Branch</source> <translation>Создать ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3364"/> - <source>Enter a branch name to restore a stash to:</source> - <translation>Введите имя ветви для восстановления из "заначки":</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3389"/> - <source>Creating branch</source> - <translation>Создание ветви</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3423"/> - <source>Delete Stash</source> - <translation>Удалить "заначку"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3423"/> - <source>Do you really want to delete the stash <b>{0}</b>?</source> - <translation>Вы действительно хотите удалить "заначку" <b>{0}</b>?</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3434"/> - <source>Deleting stash</source> - <translation>Удаление "заначки"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3454"/> - <source>Delete All Stashes</source> - <translation>Удалить все "заначки"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3454"/> - <source>Do you really want to delete all stashes?</source> - <translation>Вы действительно хотите удалить все "заначки"?</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> - <source>Deleting all stashes</source> - <translation>Удаление всех "заначек"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3534"/> - <source>Showing the combined configuration settings</source> - <translation>Отображение обобщенных параметров конфигурации</translation> + <source>Enter a branch name to restore a stash to:</source> + <translation>Введите имя ветви для восстановления из "заначки":</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3487"/> + <source>Creating branch</source> + <translation>Создание ветви</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <source>Delete Stash</source> + <translation>Удалить "заначку"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <source>Do you really want to delete the stash <b>{0}</b>?</source> + <translation>Вы действительно хотите удалить "заначку" <b>{0}</b>?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3532"/> + <source>Deleting stash</source> + <translation>Удаление "заначки"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <source>Delete All Stashes</source> + <translation>Удалить все "заначки"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <source>Do you really want to delete all stashes?</source> + <translation>Вы действительно хотите удалить все "заначки"?</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3560"/> - <source>Verifying the integrity of the Git repository</source> - <translation>Проверка целостности Git репозитория</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3585"/> - <source>Performing Repository Housekeeping</source> - <translation>Проведение уборки репозитория</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3629"/> - <source><tr><td><b>Statistics</b></td></tr></source> - <translation><tr><td><b>Статистика</b></td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3630"/> - <source><tr><td>Number of loose objects: </td><td>{0}</td></tr></source> - <translation><tr><td>Количество "рыхлых" объектов: </td><td>{0}</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3634"/> - <source><tr><td>Disk space used by loose objects: </td><td>{0} KiB</td></tr></source> - <translation><tr><td>Дисковое пространство, занятое "рыхлыми" объектами: </td><td>{0} KiB</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3638"/> - <source><tr><td>Number of packed objects: </td><td>{0}</td></tr></source> - <translation><tr><td>Количество упакованных объектов: </td><td>{0}</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3642"/> - <source><tr><td>Number of packs: </td><td>{0}</td></tr></source> - <translation><tr><td>Количество упаковок: </td><td>{0}</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3646"/> - <source><tr><td>Disk space used by packed objects: </td><td>{0} KiB</td></tr></source> - <translation><tr><td>Дисковое пространство, занятое упакованными объектами: </td><td>{0} KiB</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3650"/> - <source><tr><td>Packed objects waiting for pruning: </td><td>{0}</td></tr></source> - <translation><tr><td>Упакованные объекты, ожидающие удаления: </td><td>{0}</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3654"/> - <source><tr><td>Garbage files: </td><td>{0}</td></tr></source> - <translation><tr><td>Мусорные файлы: </td><td>{0}</td></tr></translation> + <source>Deleting all stashes</source> + <translation>Удаление всех "заначек"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3632"/> + <source>Showing the combined configuration settings</source> + <translation>Отображение обобщенных параметров конфигурации</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3658"/> + <source>Verifying the integrity of the Git repository</source> + <translation>Проверка целостности Git репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3683"/> + <source>Performing Repository Housekeeping</source> + <translation>Проведение уборки репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3727"/> + <source><tr><td><b>Statistics</b></td></tr></source> + <translation><tr><td><b>Статистика</b></td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3728"/> + <source><tr><td>Number of loose objects: </td><td>{0}</td></tr></source> + <translation><tr><td>Количество "рыхлых" объектов: </td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3732"/> + <source><tr><td>Disk space used by loose objects: </td><td>{0} KiB</td></tr></source> + <translation><tr><td>Дисковое пространство, занятое "рыхлыми" объектами: </td><td>{0} KiB</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3736"/> + <source><tr><td>Number of packed objects: </td><td>{0}</td></tr></source> + <translation><tr><td>Количество упакованных объектов: </td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3740"/> + <source><tr><td>Number of packs: </td><td>{0}</td></tr></source> + <translation><tr><td>Количество упаковок: </td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3744"/> + <source><tr><td>Disk space used by packed objects: </td><td>{0} KiB</td></tr></source> + <translation><tr><td>Дисковое пространство, занятое упакованными объектами: </td><td>{0} KiB</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3748"/> + <source><tr><td>Packed objects waiting for pruning: </td><td>{0}</td></tr></source> + <translation><tr><td>Упакованные объекты, ожидающие удаления: </td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3752"/> + <source><tr><td>Garbage files: </td><td>{0}</td></tr></source> + <translation><tr><td>Мусорные файлы: </td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3756"/> <source><tr><td>Disk space used by garbage files: </td><td>{0} KiB</td></tr></source> <translation><tr><td>Дисковое пространство, занятое мусорными файлами: </td><td>{0} KiB</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3664"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3762"/> <source><p><b>No statistics available.</b></p></source> <translation><p><b>Нет статистики.</b></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3730"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3828"/> <source>Creating Archive</source> <translation>Создание архива</translation> </message> @@ -18205,57 +18205,57 @@ <translation>Применить патч файлы</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3773"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3871"/> <source>Add Submodule</source> <translation>Добавить подмодуль</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> <source>List Submodules</source> <translation>Список подмодулей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> <source>No submodules defined for the project.</source> <translation>Подмодули для проекта не определены.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3956"/> <source>All</source> <translation>Все</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> <source>Submodule Path</source> <translation>Путь подмодуля</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> <source>Select a submodule path:</source> <translation>Выберите путь к подмодулю:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3914"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4012"/> <source>Initialize Submodules</source> <translation>Инициализация подмодулей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3951"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4049"/> <source>Unregister Submodules</source> <translation>Отменить регистрацию подмодулей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4031"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4129"/> <source>Update Submodules</source> <translation>Обновить подмодули</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4065"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4163"/> <source>Synchronize Submodules</source> <translation>Синхронизировать подмодули</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4123"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4221"/> <source>Submodules Summary</source> <translation>Сводка о подмодулях</translation> </message> @@ -18287,6 +18287,31 @@ <source>Enter the remote URL</source> <translation>Введите URL удаленного репозитория</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="51"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="57"/> + <source>Username:</source> + <translation type="unfinished">Имя пользователя:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="64"/> + <source>Enter the user name for the remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="71"/> + <source>Password:</source> + <translation type="unfinished">Пароль:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="81"/> + <source>Enter the password for the remote repository</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>GitApplyBundleDataDialog</name> @@ -18916,6 +18941,34 @@ </message> </context> <context> + <name>GitChangeRemoteUrlDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="14"/> + <source>Git Change Remote URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="40"/> + <source>URL:</source> + <translation type="unfinished">URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="57"/> + <source>New URL:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="64"/> + <source>Enter the new remote URL</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GitCherryPickDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="14"/> @@ -21171,7 +21224,7 @@ <translation><b>Показать удаленные репозитории</b><p>Показ удаленных репозиториев, доступных для загрузки, извлечения и передачи.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1765"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1797"/> <source>Show Remote Info</source> <translation>Показать инфо об удаленном репозитории</translation> </message> @@ -21186,7 +21239,7 @@ <translation>Показать информацию об удаленном репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1161"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1191"/> <source>Add</source> <translation>Добавить</translation> </message> @@ -21206,7 +21259,7 @@ <translation><b>Добавить</b><p>Добавление удаленного репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1785"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1817"/> <source>Remove</source> <translation>Удалить</translation> </message> @@ -21226,7 +21279,7 @@ <translation><b>Удалить</b><p>Удалить удаленный репозиторий.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1799"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1831"/> <source>Prune</source> <translation>Отсечь</translation> </message> @@ -21246,7 +21299,7 @@ <translation><b>Отсечь</b><p>Отсечка устаревших отслеживаемых ветвей удаленных репозиториев.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1874"/> <source>Rename</source> <translation>Переименовать</translation> </message> @@ -21266,717 +21319,717 @@ <translation><b>Переименовать</b><p>Переименование удаленного репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1833"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1895"/> <source>Copy Commits</source> <translation>Копировать коммиты</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="609"/> - <source>Copies commits into the current branch</source> - <translation>Копировать коммиты в текущую ветвь</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="612"/> - <source><b>Copy Commits</b><p>This copies commits on top of the current branch.</p></source> - <translation><b>Копировать коммиты</b><p>Копирование коммитов в текущую ветвь.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="619"/> - <source>Continue Copying Session</source> - <translation>Продолжить сессию копирования</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="623"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation>Продолжение последней сессии копирования (после разрешения конфликтов)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="626"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation><b>Продолжить копировать изменения</b><p>Продолжение последней сессии копирования после разрешения конфликтов.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="635"/> - <source>Quit Copying Session</source> - <translation>Завершить сессию копирования</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="639"/> - <source>Quit the current copying session</source> - <translation>Завершение текущуе сессию копирования</translation> + <source>Copies commits into the current branch</source> + <translation>Копировать коммиты в текущую ветвь</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="642"/> - <source><b>Quit Copying Session</b><p>This quits the current copying session.</p></source> - <translation><b>Завершить сессию копирования</b><p>Завершение сессии копирования.</p></translation> + <source><b>Copy Commits</b><p>This copies commits on top of the current branch.</p></source> + <translation><b>Копировать коммиты</b><p>Копирование коммитов в текущую ветвь.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="649"/> - <source>Cancel Copying Session</source> - <translation>Отменить сессию копирования</translation> + <source>Continue Copying Session</source> + <translation>Продолжить сессию копирования</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="653"/> - <source>Cancel the current copying session and return to the previous state</source> - <translation>Отмена текущей сессии копирования и возврат к предыдущему состоянию</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="657"/> - <source><b>Cancel Copying Session</b><p>This cancels the current copying session and returns to the previous state.</p></source> - <translation><b>Отменить сессию копирования</b><p>Отмена текущей сессии копирования и возврат к предыдущему состоянию.</p></translation> + <source>Continue the last copying session after conflicts were resolved</source> + <translation>Продолжение последней сессии копирования (после разрешения конфликтов)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="656"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation><b>Продолжить копировать изменения</b><p>Продолжение последней сессии копирования после разрешения конфликтов.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="665"/> - <source>Stash changes</source> - <translation>Скрыть изменения</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="665"/> - <source>Stash changes...</source> - <translation>Скрыть изменения...</translation> + <source>Quit Copying Session</source> + <translation>Завершить сессию копирования</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="669"/> - <source>Stash all current changes of the project</source> - <translation>Скрыть все текущие изменения в стеке незавершенных изменений</translation> + <source>Quit the current copying session</source> + <translation>Завершение текущуе сессию копирования</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="672"/> - <source><b>Stash changes</b><p>This stashes all current changes of the project.</p></source> - <translation><b>Скрыть изменения</b><p>Скрыть все текущие изменения в стеке незавершенных изменений.</p></translation> + <source><b>Quit Copying Session</b><p>This quits the current copying session.</p></source> + <translation><b>Завершить сессию копирования</b><p>Завершение сессии копирования.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="679"/> - <source>Show stash browser</source> - <translation>Показать браузер "заначек"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="679"/> - <source>Show stash browser...</source> - <translation>Показать браузер "заначек"...</translation> + <source>Cancel Copying Session</source> + <translation>Отменить сессию копирования</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="683"/> - <source>Show a dialog with all stashes</source> - <translation>Показать диалоговое окно со всеми стеками незавершенных изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="686"/> - <source><b>Show stash browser...</b><p>This shows a dialog listing all available stashes. Actions on these stashes may be executed via the context menu.</p></source> - <translation><b>Показать браузер "заначек"...</b><p>Показать диалог со списком всех доступных стеков незавершенных изменений. С помощью контекстного меню можно выполнять необходимые действия над ними.</p></translation> + <source>Cancel the current copying session and return to the previous state</source> + <translation>Отмена текущей сессии копирования и возврат к предыдущему состоянию</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="687"/> + <source><b>Cancel Copying Session</b><p>This cancels the current copying session and returns to the previous state.</p></source> + <translation><b>Отменить сессию копирования</b><p>Отмена текущей сессии копирования и возврат к предыдущему состоянию.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> - <source>Show stash</source> - <translation>Показать "заначку"</translation> + <source>Stash changes</source> + <translation>Скрыть изменения</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> - <source>Show stash...</source> - <translation>Показать "заначку"...</translation> + <source>Stash changes...</source> + <translation>Скрыть изменения...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="699"/> - <source>Show a dialog with a patch of a stash</source> - <translation>Показать диалог, отображающий изменения, сохраненные в стеке незавершенных изменений</translation> + <source>Stash all current changes of the project</source> + <translation>Скрыть все текущие изменения в стеке незавершенных изменений</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="702"/> + <source><b>Stash changes</b><p>This stashes all current changes of the project.</p></source> + <translation><b>Скрыть изменения</b><p>Скрыть все текущие изменения в стеке незавершенных изменений.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="709"/> + <source>Show stash browser</source> + <translation>Показать браузер "заначек"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="709"/> + <source>Show stash browser...</source> + <translation>Показать браузер "заначек"...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="713"/> + <source>Show a dialog with all stashes</source> + <translation>Показать диалоговое окно со всеми стеками незавершенных изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="716"/> + <source><b>Show stash browser...</b><p>This shows a dialog listing all available stashes. Actions on these stashes may be executed via the context menu.</p></source> + <translation><b>Показать браузер "заначек"...</b><p>Показать диалог со списком всех доступных стеков незавершенных изменений. С помощью контекстного меню можно выполнять необходимые действия над ними.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="725"/> + <source>Show stash</source> + <translation>Показать "заначку"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="725"/> + <source>Show stash...</source> + <translation>Показать "заначку"...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="729"/> + <source>Show a dialog with a patch of a stash</source> + <translation>Показать диалог, отображающий изменения, сохраненные в стеке незавершенных изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="732"/> <source><b>Show stash...</b><p>This shows a dialog with a patch of a selectable stash.</p></source> <translation><b>Показать "заначку"...</b><p>Показать диалог, отображающий исправления в выбранном стеке незавершенных изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="710"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="740"/> <source>Restore && Keep</source> <translation>Восстановить && Сохранить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="714"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="744"/> <source>Restore a stash but keep it</source> <translation>Восстановить изменения из стека, но не удалять его</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="717"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="747"/> <source><b>Restore &amp; Keep</b><p>This restores a selectable stash and keeps it.</p></source> <translation><b>Восстановить &amp; Сохранить</b><p>Восстановение изменений из выбранного стека незавершенных изменений, но не удалять его.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="724"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="754"/> <source>Restore && Delete</source> <translation>Восстановить && Удалить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="758"/> <source>Restore a stash and delete it</source> <translation>Восстановить изменения из стека незавершенных изменений и удалить его</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="731"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="761"/> <source><b>Restore &amp; Delete</b><p>This restores a selectable stash and deletes it.</p></source> <translation><b>Восстановить &amp; Удалить</b><p>Восстановление изменений из выбранного стека незавершенных изменений и удалить его.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1980"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2042"/> <source>Create Branch</source> <translation>Создать ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="772"/> <source>Create a new branch and restore a stash into it</source> <translation>Создать новую ветвь и восстановить в ней изменения из стека незавершенных изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="745"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="775"/> <source><b>Create Branch</b><p>This creates a new branch and restores a stash into it.</p></source> <translation><b>Создать ветвь</b><p>Создать новую ветвь и восстановить в ней изменения из стека незавершенных изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="753"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="783"/> <source>Delete</source> <translation>Удалить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="787"/> <source>Delete a stash</source> <translation>Удалить стек незавершенных изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="760"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="790"/> <source><b>Delete</b><p>This deletes a stash.</p></source> <translation><b>Удалить</b><p>Удаление стека незавершенных изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="767"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="797"/> <source>Delete All</source> <translation>Удалить все</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="771"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="801"/> <source>Delete all stashes</source> <translation>Удалить все стеки незавершенных изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="774"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="804"/> <source><b>Delete All</b><p>This deletes all stashes.</p></source> <translation><b>Удалить все</b><p>Удалить все стеки незавершенных изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="811"/> <source>Edit user configuration</source> <translation>Правка конфигурации пользователя</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="811"/> <source>Edit user configuration...</source> <translation>Правка конфигурации пользователя...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="785"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="815"/> <source>Show an editor to edit the user configuration file</source> <translation>Отображение редактора для правки конфигурации пользователя</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="788"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="818"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation><b>Правка конфигурации пользователя</b><p>Отображение редактора для правки конфигурации пользователя.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="825"/> <source>Edit repository configuration</source> <translation>Правка конфигурации репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="825"/> <source>Edit repository configuration...</source> <translation>Правка конфигурации репозитория...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="829"/> <source>Show an editor to edit the repository configuration file</source> <translation>Отображение редактора для правки конфигурации репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="802"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation><b>Правка конфигурации репозитория</b><p>Отображение редактора для правки конфигурации репозитория.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="810"/> - <source>Create .gitignore</source> - <translation>Создать файл .gitignore</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="814"/> - <source>Create a .gitignore file with default values</source> - <translation>Создать файл .gitignore со значениями по умолчанию</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="817"/> - <source><b>Create .gitignore</b><p>This creates a .gitignore file with default values.</p></source> - <translation><b>Создать .gitignore</b><p>Создать файл .gitignore со значениями по умолчанию.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="824"/> - <source>Show combined configuration settings</source> - <translation>Показать обобщенные параметры настройки</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="824"/> - <source>Show combined configuration settings...</source> - <translation>Показать обобщенные параметры настройки...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="828"/> - <source>Show the combined configuration settings from all configuration files</source> - <translation>Показать обобщенные параметры настройки из всех конфигурационных файлов</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="832"/> - <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> - <translation><b>Показать обобщенные параметры настройки</b><p>Отображение объединенных параметров настройки из всех конфигурационных файлов.</p></translation> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> + <translation><b>Правка конфигурации репозитория</b><p>Отображение редактора для правки конфигурации репозитория.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="840"/> - <source>Verify repository</source> - <translation>Проверить репозиторий</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="840"/> - <source>Verify repository...</source> - <translation>Проверить репозиторий...</translation> + <source>Create .gitignore</source> + <translation>Создать файл .gitignore</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="844"/> - <source>Verify the connectivity and validity of objects of the database</source> - <translation>Проверка подключения и достоверности объектов базы данных</translation> + <source>Create a .gitignore file with default values</source> + <translation>Создать файл .gitignore со значениями по умолчанию</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="847"/> - <source><b>Verify repository</b><p>This verifies the connectivity and validity of objects of the database.</p></source> - <translation><b>Проверить репозиторий</b><p>Проверка подключения и достоверности объектов базы данных.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="855"/> - <source>Optimize repository</source> - <translation>Оптимизировать репозиторий</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="855"/> - <source>Optimize repository...</source> - <translation>Оптимизировать репозиторий...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="859"/> - <source>Cleanup and optimize the local repository</source> - <translation>Почистить и оптимизировать репозиторий</translation> + <source><b>Create .gitignore</b><p>This creates a .gitignore file with default values.</p></source> + <translation><b>Создать .gitignore</b><p>Создать файл .gitignore со значениями по умолчанию.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="854"/> + <source>Show combined configuration settings</source> + <translation>Показать обобщенные параметры настройки</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="854"/> + <source>Show combined configuration settings...</source> + <translation>Показать обобщенные параметры настройки...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="858"/> + <source>Show the combined configuration settings from all configuration files</source> + <translation>Показать обобщенные параметры настройки из всех конфигурационных файлов</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="862"/> + <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> + <translation><b>Показать обобщенные параметры настройки</b><p>Отображение объединенных параметров настройки из всех конфигурационных файлов.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="870"/> + <source>Verify repository</source> + <translation>Проверить репозиторий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="870"/> + <source>Verify repository...</source> + <translation>Проверить репозиторий...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="874"/> + <source>Verify the connectivity and validity of objects of the database</source> + <translation>Проверка подключения и достоверности объектов базы данных</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="877"/> + <source><b>Verify repository</b><p>This verifies the connectivity and validity of objects of the database.</p></source> + <translation><b>Проверить репозиторий</b><p>Проверка подключения и достоверности объектов базы данных.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="885"/> + <source>Optimize repository</source> + <translation>Оптимизировать репозиторий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="885"/> + <source>Optimize repository...</source> + <translation>Оптимизировать репозиторий...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="889"/> + <source>Cleanup and optimize the local repository</source> + <translation>Почистить и оптимизировать репозиторий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="892"/> <source><b>Optimize repository</b><p>This cleans up and optimizes the local repository.</p></source> <translation><b>Оптимизировать репозиторий</b><p>Почистить и оптимизировать локальный репозиторий.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="899"/> <source>Repository Statistics</source> <translation>Статистика репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="899"/> <source>Repository Statistics...</source> <translation>Статистика репозитория...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="903"/> <source>Show some statistics of the local repository</source> <translation>Показ некоторых статистических данных локального репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="876"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="906"/> <source><b>Repository Statistics</b><p>This show some statistics of the local repository.</p></source> <translation><b>Статистика репозитория</b><p>Отображение некоторых статистических данных локального репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="883"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="913"/> <source>Create Archive</source> <translation>Создать архив</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="887"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="917"/> <source>Create an archive from the local repository</source> <translation>Создать архив из локального репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="890"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="920"/> <source><b>Create Archive</b><p>This creates an archive from the local repository.</p></source> <translation><b>Создать архив</b><p>Создание архива из локального репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="897"/> - <source>Create bundle</source> - <translation>Создать пакет</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="897"/> - <source>Create bundle...</source> - <translation>Создать пакет...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="901"/> - <source>Create bundle file collecting changesets</source> - <translation>Создать файл пакета, содержащий наборы изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="904"/> - <source><b>Create bundle</b><p>This creates a bundle file collecting selected changesets (git bundle create).</p></source> - <translation><b>Создать пакет</b><p>Создание файла пакета, содержащего выбранные наборы изменений (git bundle create).</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="912"/> - <source>Verify bundle</source> - <translation>Проверить пакет</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="912"/> - <source>Verify bundle...</source> - <translation>Проверить пакет...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="916"/> - <source>Verify the validity and applicability of a bundle file</source> - <translation>Проверить целостность и применимость файла пакета</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="919"/> - <source><b>Verify bundle</b><p>This verifies that a bundle file is valid and will apply cleanly.</p></source> - <translation><b>Проверить пакет</b><p>Проверка целостности и применимости файла пакета.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> - <source>List bundle heads</source> - <translation>Список ветвей в пакете</translation> + <source>Create bundle</source> + <translation>Создать пакет</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> - <source>List bundle heads...</source> - <translation>Список ветвей в пакете...</translation> + <source>Create bundle...</source> + <translation>Создать пакет...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="931"/> - <source>List all heads contained in a bundle file</source> - <translation>Список всех ветвей, содержащихся в файле пакета</translation> + <source>Create bundle file collecting changesets</source> + <translation>Создать файл пакета, содержащий наборы изменений</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="934"/> + <source><b>Create bundle</b><p>This creates a bundle file collecting selected changesets (git bundle create).</p></source> + <translation><b>Создать пакет</b><p>Создание файла пакета, содержащего выбранные наборы изменений (git bundle create).</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="942"/> + <source>Verify bundle</source> + <translation>Проверить пакет</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="942"/> + <source>Verify bundle...</source> + <translation>Проверить пакет...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="946"/> + <source>Verify the validity and applicability of a bundle file</source> + <translation>Проверить целостность и применимость файла пакета</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="949"/> + <source><b>Verify bundle</b><p>This verifies that a bundle file is valid and will apply cleanly.</p></source> + <translation><b>Проверить пакет</b><p>Проверка целостности и применимости файла пакета.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="957"/> + <source>List bundle heads</source> + <translation>Список ветвей в пакете</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="957"/> + <source>List bundle heads...</source> + <translation>Список ветвей в пакете...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="961"/> + <source>List all heads contained in a bundle file</source> + <translation>Список всех ветвей, содержащихся в файле пакета</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="964"/> <source><b>List bundle heads</b><p>This lists all heads contained in a bundle file.</p></source> <translation><b>Список ветвей в пакете</b><p>Показать список ветвей, содержащихся в файле пакета.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="971"/> <source>Apply Bundle (fetch)</source> <translation>Применить пакет (fetch)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="971"/> <source>Apply Bundle (fetch)...</source> <translation>Применить пакет (fetch)...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="945"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="975"/> <source>Apply a head of a bundle file using fetch</source> <translation>Применить ветвь из пакета используя команду fetch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="948"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="978"/> <source><b>Apply Bundle (fetch)</b><p>This applies a head of a bundle file using fetch.</p></source> <translation><b>Применить пакет (fetch)</b><p>Применить ветвь из пакета, используя команду fetch.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2097"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2159"/> <source>Apply Bundle (pull)</source> <translation>Применить пакет (pull)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="955"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="985"/> <source>Apply Bundle (pull)...</source> <translation>Применить пакет (pull)...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="959"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="989"/> <source>Apply a head of a bundle file using pull</source> <translation>Применить ветвь из пакета, используя команду pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="962"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="992"/> <source><b>Apply Bundle (pull)</b><p>This applies a head of a bundle file using pull.</p></source> <translation><b>Применить пакет (pull)</b><p>Применить ветвь из пакета, используя команду pull.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="969"/> - <source>Start</source> - <translation>Начать</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="973"/> - <source>Start a bisect session</source> - <translation>Запуск сессии двоичного поиска</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="976"/> - <source><b>Start</b><p>This starts a bisect session.</p></source> - <translation><b>Начать</b><p>Запуск сессии двоичного поиска.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="983"/> - <source>Start (Extended)</source> - <translation>Начать (расширенный)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="987"/> - <source>Start a bisect session giving a bad and optionally good commits</source> - <translation>Запуск сессии двоичного поиска, задав плохой и, опционально, хороший коммиты</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="990"/> - <source><b>Start (Extended)</b><p>This starts a bisect session giving a bad and optionally good commits.</p></source> - <translation><b>Начать (расширенно)</b><p>Запуск сессии двоичного поиска, задав плохой и, опционально, хороший коммиты.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="999"/> - <source>Mark as "good"</source> - <translation>Пометить как "хороший"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="999"/> - <source>Mark as "good"...</source> - <translation>Пометить как "хороший"...</translation> + <source>Start</source> + <translation>Начать</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1003"/> - <source>Mark a selectable revision as good</source> - <translation>Пометить выбранный коммит как "хороший"</translation> + <source>Start a bisect session</source> + <translation>Запуск сессии двоичного поиска</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1006"/> - <source><b>Mark as "good"</b><p>This marks a selectable revision as good.</p></source> - <translation><b>Пометить как "хороший"</b><p>Пометить выбранный коммит как "хороший".</p></translation> + <source><b>Start</b><p>This starts a bisect session.</p></source> + <translation><b>Начать</b><p>Запуск сессии двоичного поиска.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1013"/> - <source>Mark as "bad"</source> - <translation>Пометить как "плохой"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1013"/> - <source>Mark as "bad"...</source> - <translation>Пометить как "плохой"...</translation> + <source>Start (Extended)</source> + <translation>Начать (расширенный)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1017"/> - <source>Mark a selectable revision as bad</source> - <translation>Пометить выбранный коммит как "плохой"</translation> + <source>Start a bisect session giving a bad and optionally good commits</source> + <translation>Запуск сессии двоичного поиска, задав плохой и, опционально, хороший коммиты</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1020"/> + <source><b>Start (Extended)</b><p>This starts a bisect session giving a bad and optionally good commits.</p></source> + <translation><b>Начать (расширенно)</b><p>Запуск сессии двоичного поиска, задав плохой и, опционально, хороший коммиты.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1029"/> + <source>Mark as "good"</source> + <translation>Пометить как "хороший"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1029"/> + <source>Mark as "good"...</source> + <translation>Пометить как "хороший"...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1033"/> + <source>Mark a selectable revision as good</source> + <translation>Пометить выбранный коммит как "хороший"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1036"/> + <source><b>Mark as "good"</b><p>This marks a selectable revision as good.</p></source> + <translation><b>Пометить как "хороший"</b><p>Пометить выбранный коммит как "хороший".</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1043"/> + <source>Mark as "bad"</source> + <translation>Пометить как "плохой"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1043"/> + <source>Mark as "bad"...</source> + <translation>Пометить как "плохой"...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1047"/> + <source>Mark a selectable revision as bad</source> + <translation>Пометить выбранный коммит как "плохой"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1050"/> <source><b>Mark as "bad"</b><p>This marks a selectable revision as bad.</p></source> <translation><b>Пометить как "плохой"</b><p>Пометить выбранный коммит как "плохой".</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1057"/> <source>Skip</source> <translation>Пропустить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1057"/> <source>Skip...</source> <translation>Пропустить...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1031"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1061"/> <source>Skip a selectable revision</source> <translation>Пропустить выбранную ревизию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1064"/> <source><b>Skip</b><p>This skips a selectable revision.</p></source> <translation><b>Пропустить</b><p>Пропуск выбранной ревизии.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1071"/> <source>Reset</source> <translation>Рестарт</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1071"/> <source>Reset...</source> <translation>Рестарт...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1075"/> <source>Reset the bisect session</source> <translation>Рестарт сессии двоичного поиска</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1078"/> <source><b>Reset</b><p>This resets the bisect session.</p></source> <translation><b>Рестарт</b><p>Рестарт сессии двоичного поиска.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1055"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1085"/> <source>Show bisect log browser</source> <translation>Показать журнал двоичного поиска</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1090"/> <source>Show a dialog to browse the bisect log of the local project</source> <translation>Показать диалоговое окно просмотра журнала двоичного поиска локального проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1063"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1093"/> <source><b>Show bisect log browser</b><p>This shows a dialog to browse the bisect log of the local project.</p></source> <translation><b>Показать журнал двоичного поиска</b><p>Показ диалогового окна просмотра журнала двоичного поиска для локального проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1072"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1102"/> <source>Create replay file</source> <translation>Создать файл повтора</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1106"/> <source>Create a replay file to repeat the current bisect session</source> <translation>Создать файл повтора для текущей сессии двоичного поиска</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1109"/> <source><b>Create replay file</b><p>This creates a replay file to repeat the current bisect session.</p></source> <translation><b>Создать файл повтора</b><p>Создать файл повтора для текущей сессии двоичного поиска.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1088"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1118"/> <source>Edit replay file</source> <translation>Редактировать файл повтора</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1092"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1122"/> <source>Edit a bisect replay file</source> <translation>Редактировать файл повтора двоичного поиска</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1095"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1125"/> <source><b>Edit replay file</b><p>This edits a bisect replay file.</p></source> <translation><b>Редактировать файл повтора</b><p>Редактировать файл повтора двоичного поиска.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1133"/> <source>Replay session</source> <translation>Повтор сессии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1107"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1137"/> <source>Replay a bisect session from file</source> <translation>Повтор сессии двоичного поиска из файла</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1110"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1140"/> <source><b>Replay session</b><p>This replays a bisect session from file.</p></source> <translation><b>Повтор сессии</b><p>Повтор сессии двоичного поиска из файла.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1344"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1374"/> <source>Administration</source> <translation>Администрирование</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1360"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1390"/> <source>Bundle Management</source> <translation>Управление пакетами</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1690"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1722"/> <source>Pull</source> <translation>Загрузить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2237"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2299"/> <source>Bisect</source> <translation>Двоичный поиск (bisect)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1397"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1427"/> <source>Tags</source> <translation>Теги (tags)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1405"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1435"/> <source>Branches</source> <translation>Ветви (branches)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1418"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1448"/> <source>Manage Changes</source> <translation>Управление изменениями</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1426"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1456"/> <source>Remote Repositories</source> <translation>Удаленные репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1436"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1468"/> <source>Cherry-pick</source> <translation>Выборка (cherry-pick)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1444"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1476"/> <source>Stash</source> <translation>Скрыть (stash)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1646"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1678"/> <source>Branch</source> <translation>Ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2323"/> <source>The project should be reread. Do this now?</source> <translation>Проект должен быть перепрочитан. Сделать это сейчас?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1715"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1747"/> <source>Revert Changes</source> <translation>Отменить изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1734"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1766"/> <source>Unstage Changes</source> <translation>Отменить индексирование изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1874"/> <source>Select a remote repository:</source> <translation>Выберите удаленный репозиторий:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1853"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1915"/> <source>Copy Commits (Continue)</source> <translation>Копировать коммиты (продолжить)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1872"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1934"/> <source>Copy Commits (Quit)</source> <translation>Копировать коммиты (закончить)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1892"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1954"/> <source>Copy Commits (Cancel)</source> <translation>Копировать коммиты (прервать)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1911"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1973"/> <source>Save Stash</source> <translation>Сохранить "заначку"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1961"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2023"/> <source>Restore Stash</source> <translation>Восстановить из "заначки"</translation> </message> @@ -22001,225 +22054,265 @@ <translation><b>Фиксация изменений в репозитории</b><p>Фиксация изменений локального проекта в Git репозитории.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1541"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1573"/> <source>Git</source> <translation>Git</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1147"/> <source>Check patch files</source> <translation>Проверить файлы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1121"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1151"/> <source>Check a list of patch files, if they would apply cleanly</source> <translation>Проверить, что файлы изменений из списка будут выполнены без ошибок</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1124"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1154"/> <source><b>Check patch files</b><p>This checks a list of patch files, if they would apply cleanly.</p></source> <translation><b>Проверить файлы изменений</b><p>Проверить что файлы изменений из списка применятся без ошибок.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2323"/> <source>Apply patch files</source> <translation>Применить файлы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1166"/> <source>Apply a list of patch files</source> <translation>Применить файлы изменений из списка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1139"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1169"/> <source><b>Apply patch files</b><p>This applies a list of patch files.</p></source> <translation><b>Применить файлы изменений</b><p>Применить файлы изменений из списка.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1146"/> - <source>Show patch statistics</source> - <translation>Показать статистику изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1150"/> - <source>Show some statistics for a list of patch files</source> - <translation>Показать некоторую статистику для списка файлов изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1153"/> - <source><b>Show patch statistics</b><p>This shows some statistics for a list of patch files.</p></source> - <translation><b>Показать статистику изменений</b><p>Показ некоторой статистики для списка файлов изменений.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1371"/> - <source>Patch Management</source> - <translation>Управление патчами</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1165"/> - <source>Add a submodule to the current project</source> - <translation>Добавить подмодуль в текущий проект</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1168"/> - <source><b>Add</b><p>This adds a submodule to the current project.</p></source> - <translation><b>Добавить</b><p>Добавление подмодуля для текущего проекта.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1176"/> - <source>List</source> - <translation>Список</translation> + <source>Show patch statistics</source> + <translation>Показать статистику изменений</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1180"/> - <source>List the submodule of the current project</source> - <translation>Список подмодулей текущего проекта</translation> + <source>Show some statistics for a list of patch files</source> + <translation>Показать некоторую статистику для списка файлов изменений</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1183"/> - <source><b>List</b><p>This lists the submodules of the current project.</p></source> - <translation><b>Список</b><p>Список подмодулей текущего проекта.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1191"/> - <source>Initialize</source> - <translation>Инициализировать</translation> + <source><b>Show patch statistics</b><p>This shows some statistics for a list of patch files.</p></source> + <translation><b>Показать статистику изменений</b><p>Показ некоторой статистики для списка файлов изменений.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1401"/> + <source>Patch Management</source> + <translation>Управление патчами</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1195"/> - <source>Initialize the submodules of the current project</source> - <translation>Инициализировать подмодули текущего проекта</translation> + <source>Add a submodule to the current project</source> + <translation>Добавить подмодуль в текущий проект</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1198"/> + <source><b>Add</b><p>This adds a submodule to the current project.</p></source> + <translation><b>Добавить</b><p>Добавление подмодуля для текущего проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1206"/> + <source>List</source> + <translation>Список</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1210"/> + <source>List the submodule of the current project</source> + <translation>Список подмодулей текущего проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1213"/> + <source><b>List</b><p>This lists the submodules of the current project.</p></source> + <translation><b>Список</b><p>Список подмодулей текущего проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1221"/> + <source>Initialize</source> + <translation>Инициализировать</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1225"/> + <source>Initialize the submodules of the current project</source> + <translation>Инициализировать подмодули текущего проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1228"/> <source><b>Initialize</b><p>This initializes the submodules of the current project.</p></source> <translation><b>Инициализировать</b><p>Инициализация подмодулей текущего проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1207"/> - <source>Unregister</source> - <translation>Отменить регистрацию</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1211"/> - <source>Unregister submodules of the current project</source> - <translation>Отмена регистрации подмодулей текущего проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1214"/> - <source><b>Unregister</b><p>This unregisters submodules of the current project.</p></source> - <translation><b>Отменить регистрацию</b><p>Отмена регистрации подмодулей текущего проекта.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1222"/> - <source>Update</source> - <translation>Обновить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1226"/> - <source>Update submodules of the current project</source> - <translation>Обновить подмодули текущего проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1229"/> - <source><b>Update</b><p>This updates submodules of the current project.</p></source> - <translation><b>Обновить</b><p>Обновление подмодулей текущего проекта.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1237"/> - <source>Initialize and Update</source> - <translation>Инициализировать и обновить</translation> + <source>Unregister</source> + <translation>Отменить регистрацию</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1241"/> - <source>Initialize and update submodules of the current project</source> - <translation>Инициализировать и обновить подмодули текущего проекта</translation> + <source>Unregister submodules of the current project</source> + <translation>Отмена регистрации подмодулей текущего проекта</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1244"/> + <source><b>Unregister</b><p>This unregisters submodules of the current project.</p></source> + <translation><b>Отменить регистрацию</b><p>Отмена регистрации подмодулей текущего проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1252"/> + <source>Update</source> + <translation>Обновить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1256"/> + <source>Update submodules of the current project</source> + <translation>Обновить подмодули текущего проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1259"/> + <source><b>Update</b><p>This updates submodules of the current project.</p></source> + <translation><b>Обновить</b><p>Обновление подмодулей текущего проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1267"/> + <source>Initialize and Update</source> + <translation>Инициализировать и обновить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1271"/> + <source>Initialize and update submodules of the current project</source> + <translation>Инициализировать и обновить подмодули текущего проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1274"/> <source><b>Initialize and Update</b><p>This initializes and updates submodules of the current project.</p></source> <translation><b>Инициализировать и обновить</b><p>Инициализация и обновление подмодулей текущего проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1253"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1283"/> <source>Fetch and Update</source> <translation>Получить и обновить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1257"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1287"/> <source>Fetch and update submodules of the current project</source> <translation>Получить и обновить подмодули текущего проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1260"/> - <source><b>Fetch and Update</b><p>This fetches and updates submodules of the current project.</p></source> - <translation><b>Получить и обновить</b><p>Получение и обновление подмодулей текущего проекта.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1269"/> - <source>Update with Options</source> - <translation>Обновить согласно параметрам</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1273"/> - <source>Update submodules of the current project offering a dialog to enter options</source> - <translation>Обновить подмодули текущего проекта с помощью диалогового окна ввода параметров</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1277"/> - <source><b>Update with Options</b><p>This updates submodules of the current project offering a dialog to enter update options.</p></source> - <translation><b>Обновить согласно параметрам</b><p>Обновление подмодулей текущего проекта с помощью диалогового окна ввода параметров.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1286"/> - <source>Synchronize URLs</source> - <translation>Синхронизировать URL-адреса</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1290"/> + <source><b>Fetch and Update</b><p>This fetches and updates submodules of the current project.</p></source> + <translation><b>Получить и обновить</b><p>Получение и обновление подмодулей текущего проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1299"/> + <source>Update with Options</source> + <translation>Обновить согласно параметрам</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1303"/> + <source>Update submodules of the current project offering a dialog to enter options</source> + <translation>Обновить подмодули текущего проекта с помощью диалогового окна ввода параметров</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1307"/> + <source><b>Update with Options</b><p>This updates submodules of the current project offering a dialog to enter update options.</p></source> + <translation><b>Обновить согласно параметрам</b><p>Обновление подмодулей текущего проекта с помощью диалогового окна ввода параметров.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1316"/> + <source>Synchronize URLs</source> + <translation>Синхронизировать URL-адреса</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1320"/> <source>Synchronize URLs of submodules of the current project</source> <translation>Синхронизация URL-адресов подмодулей текущего проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1293"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1323"/> <source><b>Synchronize URLs</b><p>This synchronizes URLs of submodules of the current project.</p></source> <translation><b>Синхронизация URL-адресов</b><p>Синхронизация URL-адресов подмодулей текущего проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1332"/> <source>Show Status</source> <translation>Показать статус</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1306"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1336"/> <source>Show the status of submodules of the current project</source> <translation>Отображение статуса подмодулей текущего проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1339"/> <source><b>Show Status</b><p>This shows a dialog with the status of submodules of the current project.</p></source> <translation><b>Показать статус</b><p>Отображение диалога со статусом подмодулей текущего проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1318"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1348"/> <source>Show Summary</source> <translation>Показать сводку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1322"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1352"/> <source>Show summary information for submodules of the current project</source> <translation>Отображение краткой сводки о подмодулях текущего проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1325"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1355"/> <source><b>Show Summary</b><p>This shows some summary information for submodules of the current project.</p></source> <translation><b>Показать сводку</b><p>Отображение некоторой сводной информации о подмодулях текущего проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1459"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1491"/> <source>Submodules</source> <translation>Подмодули</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="604"/> + <source>Change URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="604"/> + <source>Change URL...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="608"/> + <source>Change the URL of a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="611"/> + <source><b>Change URL</b><p>This changes the URL of a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="618"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="618"/> + <source>Credentials...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="622"/> + <source>Change or set the user credentials of a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="625"/> + <source><b>Credentials</b><p>This changes or sets the user credentials of a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>GitPullDialog</name> @@ -22521,6 +22614,49 @@ </message> </context> <context> + <name>GitRemoteCredentialsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="14"/> + <source>Git Remote Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="40"/> + <source>URL:</source> + <translation type="unfinished">URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="57"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="63"/> + <source>Username:</source> + <translation type="unfinished">Имя пользователя:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="70"/> + <source>Enter the user name for the remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="77"/> + <source>Password:</source> + <translation type="unfinished">Пароль:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="87"/> + <source>Enter the password for the remote repository</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GitRemoteRepositoriesDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="14"/> @@ -22564,92 +22700,92 @@ <translation>&Добавить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="159"/> <source>Press to rename the selected repository</source> <translation>Переименовать выбранный репозиторий</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="162"/> + <source>&Rename</source> + <translation>&Переименовать</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="92"/> + <source>Press to remove the selected repository</source> + <translation>Удалитьть выбранный репозиторий</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="95"/> - <source>&Rename</source> - <translation>&Переименовать</translation> + <source>Re&move</source> + <translation>&Удалить</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="102"/> - <source>Press to remove the selected repository</source> - <translation>Удалитьть выбранный репозиторий</translation> + <source>Press to delete stale tracking branches under the selected repository </source> + <translation>Удалить устаревшие отслеживаемые ветви выбранного репозитория </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="105"/> - <source>Re&move</source> - <translation>&Удалить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="112"/> - <source>Press to delete stale tracking branches under the selected repository </source> - <translation>Удалить устаревшие отслеживаемые ветви выбранного репозитория </translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="115"/> <source>&Prune</source> <translation>&Отсечь (prune)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="129"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="119"/> <source>Press to show information about the selected repository</source> <translation>Информация о выбранном репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="132"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="122"/> <source>Show &Info...</source> <translation>Показать &инфо...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="160"/> - <source>Errors</source> - <translation>Ошибки</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="166"/> - <source><b>Git log errors</b><p>This shows possible error messages of the git log command.</p></source> - <translation><b>Ошибки 'git log' </b><p>Отображение возможных сообщений ошибки команды 'git log'.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="182"/> - <source>Input</source> - <translation>Ввод</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="204"/> - <source>Press to send the input to the git process</source> - <translation>Отправить введеную строку на вход git процесса</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="207"/> - <source>&Send</source> - <translation>&Отправить</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="210"/> + <source>Errors</source> + <translation>Ошибки</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="216"/> + <source><b>Git log errors</b><p>This shows possible error messages of the git log command.</p></source> + <translation><b>Ошибки 'git log' </b><p>Отображение возможных сообщений ошибки команды 'git log'.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="232"/> + <source>Input</source> + <translation>Ввод</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="254"/> + <source>Press to send the input to the git process</source> + <translation>Отправить введеную строку на вход git процесса</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="257"/> + <source>&Send</source> + <translation>&Отправить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="260"/> <source>Alt+S</source> <translation>Alt+S</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="267"/> <source>Enter data to be sent to the git process</source> <translation>Введите данные для отправки git процессу</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="224"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="274"/> <source>Select to switch the input field to password mode</source> <translation>Задать режим ввода пароля для поля ввода пароля</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="227"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="277"/> <source>&Password Mode</source> <translation>&Парольный режим</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="280"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> @@ -22673,6 +22809,26 @@ <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="169"/> + <source>Press to change the URL of the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="172"/> + <source>Change &URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="179"/> + <source>Press to set or change the user credentials of the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="182"/> + <source>&Credentials</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>GitRevisionSelectionDialog</name>
--- a/i18n/eric6_tr.ts Sun Jun 03 11:30:57 2018 +0200 +++ b/i18n/eric6_tr.ts Sun Jun 03 14:03:19 2018 +0200 @@ -1540,7 +1540,7 @@ </message> <message> <location filename="../Utilities/BackgroundService.py" line="422"/> - <source>Erics background client disconnected because of an unknown reason.</source> + <source>Eric's background client disconnected because of an unknown reason.</source> <translation type="unfinished"></translation> </message> <message> @@ -18495,237 +18495,237 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2972"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3070"/> <source>Show Remote Info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> <source>Rename Remote Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> <source>Enter new name for remote repository:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2996"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3094"/> <source>Show Shortlog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3054"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3152"/> <source>Cherry-pick</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3084"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3182"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3109"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3207"/> <source>Copy Changesets (Quit)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3233"/> <source>Copy Changesets (Cancel)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3215"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3313"/> <source>Saving stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3414"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> <source>Show Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3414"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> <source>Select a stash (empty for latest stash):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3326"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3424"/> <source>Restore Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3340"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3438"/> <source>Restoring stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3374"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3472"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3364"/> - <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="3389"/> - <source>Creating branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3423"/> - <source>Delete Stash</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3423"/> - <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="3434"/> - <source>Deleting stash</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3454"/> - <source>Delete All Stashes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3454"/> - <source>Do you really want to delete all stashes?</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> - <source>Deleting all stashes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3534"/> - <source>Showing the combined configuration settings</source> + <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="3487"/> + <source>Creating branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <source>Delete Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <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="3532"/> + <source>Deleting stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <source>Delete All Stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <source>Do you really want to delete all stashes?</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3560"/> - <source>Verifying the integrity of the Git repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3585"/> - <source>Performing Repository Housekeeping</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3629"/> - <source><tr><td><b>Statistics</b></td></tr></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3630"/> - <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="3634"/> - <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="3638"/> - <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="3642"/> - <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="3646"/> - <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="3650"/> - <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="3654"/> - <source><tr><td>Garbage files: </td><td>{0}</td></tr></source> + <source>Deleting all stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3632"/> + <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3658"/> + <source>Verifying the integrity of the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3683"/> + <source>Performing Repository Housekeeping</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3727"/> + <source><tr><td><b>Statistics</b></td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3728"/> + <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="3732"/> + <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="3736"/> + <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="3740"/> + <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="3744"/> + <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="3748"/> + <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="3752"/> + <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="3756"/> <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="3664"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3762"/> <source><p><b>No statistics available.</b></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3730"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3828"/> <source>Creating Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3773"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3871"/> <source>Add Submodule</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> <source>List Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> <source>No submodules defined for the project.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3956"/> <source>All</source> <translation type="unfinished">Hepsi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> <source>Submodule Path</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> <source>Select a submodule path:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3914"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4012"/> <source>Initialize Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3951"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4049"/> <source>Unregister Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4031"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4129"/> <source>Update Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4065"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4163"/> <source>Synchronize Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4123"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4221"/> <source>Submodules Summary</source> <translation type="unfinished"></translation> </message> @@ -18757,6 +18757,31 @@ <source>Enter the remote URL</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="51"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="57"/> + <source>Username:</source> + <translation type="unfinished">Kullanıcı Adı:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="64"/> + <source>Enter the user name for the remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="71"/> + <source>Password:</source> + <translation type="unfinished">Parola:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="81"/> + <source>Enter the password for the remote repository</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>GitApplyBundleDataDialog</name> @@ -19382,6 +19407,34 @@ </message> </context> <context> + <name>GitChangeRemoteUrlDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="14"/> + <source>Git Change Remote URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished">Adı:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="40"/> + <source>URL:</source> + <translation type="unfinished">URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="57"/> + <source>New URL:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="64"/> + <source>Enter the new remote URL</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GitCherryPickDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="14"/> @@ -21649,7 +21702,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1765"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1797"/> <source>Show Remote Info</source> <translation type="unfinished"></translation> </message> @@ -21664,7 +21717,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1161"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1191"/> <source>Add</source> <translation type="unfinished">Ekle</translation> </message> @@ -21684,7 +21737,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1785"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1817"/> <source>Remove</source> <translation type="unfinished">Kaldır</translation> </message> @@ -21704,7 +21757,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1799"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1831"/> <source>Prune</source> <translation type="unfinished"></translation> </message> @@ -21724,7 +21777,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1874"/> <source>Rename</source> <translation type="unfinished"></translation> </message> @@ -21744,940 +21797,980 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1833"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1895"/> <source>Copy Commits</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="609"/> - <source>Copies commits into the current branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="612"/> - <source><b>Copy Commits</b><p>This copies commits on top of the current branch.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="619"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="623"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="626"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="635"/> - <source>Quit Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="639"/> - <source>Quit the current copying session</source> + <source>Copies commits into the current branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="642"/> - <source><b>Quit Copying Session</b><p>This quits the current copying session.</p></source> + <source><b>Copy Commits</b><p>This copies commits on top of the current branch.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="649"/> - <source>Cancel Copying Session</source> + <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="653"/> - <source>Cancel the current copying session and return to the previous state</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="657"/> - <source><b>Cancel Copying Session</b><p>This cancels the current copying session and returns to the previous state.</p></source> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="656"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="665"/> - <source>Stash changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="665"/> - <source>Stash changes...</source> + <source>Quit Copying Session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="669"/> - <source>Stash all current changes of the project</source> + <source>Quit the current copying session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="672"/> - <source><b>Stash changes</b><p>This stashes all current changes of the project.</p></source> + <source><b>Quit Copying Session</b><p>This quits the current copying session.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="679"/> - <source>Show stash browser</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="679"/> - <source>Show stash browser...</source> + <source>Cancel Copying Session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="683"/> - <source>Show a dialog with all stashes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="686"/> - <source><b>Show stash browser...</b><p>This shows a dialog listing all available stashes. Actions on these stashes may be executed via the context menu.</p></source> + <source>Cancel the current copying session and return to the previous state</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="687"/> + <source><b>Cancel Copying Session</b><p>This cancels the current copying session and returns to the previous state.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> - <source>Show stash</source> + <source>Stash changes</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> - <source>Show stash...</source> + <source>Stash changes...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="699"/> - <source>Show a dialog with a patch of a stash</source> + <source>Stash all current changes of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="702"/> + <source><b>Stash changes</b><p>This stashes all current changes of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="709"/> + <source>Show stash browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="709"/> + <source>Show stash browser...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="713"/> + <source>Show a dialog with all stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="716"/> + <source><b>Show stash browser...</b><p>This shows a dialog listing all available stashes. Actions on these stashes may be executed via the context menu.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="725"/> + <source>Show stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="725"/> + <source>Show stash...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="729"/> + <source>Show a dialog with a patch of a stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="732"/> <source><b>Show stash...</b><p>This shows a dialog with a patch of a selectable stash.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="710"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="740"/> <source>Restore && Keep</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="714"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="744"/> <source>Restore a stash but keep it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="717"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="747"/> <source><b>Restore &amp; Keep</b><p>This restores a selectable stash and keeps it.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="724"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="754"/> <source>Restore && Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="758"/> <source>Restore a stash and delete it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="731"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="761"/> <source><b>Restore &amp; Delete</b><p>This restores a selectable stash and deletes it.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1980"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2042"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="772"/> <source>Create a new branch and restore a stash into it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="745"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="775"/> <source><b>Create Branch</b><p>This creates a new branch and restores a stash into it.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="753"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="783"/> <source>Delete</source> <translation type="unfinished">Sil</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="787"/> <source>Delete a stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="760"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="790"/> <source><b>Delete</b><p>This deletes a stash.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="767"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="797"/> <source>Delete All</source> <translation type="unfinished">Hepsini Sil</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="771"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="801"/> <source>Delete all stashes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="774"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="804"/> <source><b>Delete All</b><p>This deletes all stashes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="811"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="811"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="785"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="815"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="788"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="818"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="825"/> <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="825"/> <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="829"/> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="802"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="810"/> - <source>Create .gitignore</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="814"/> - <source>Create a .gitignore file with default values</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="817"/> - <source><b>Create .gitignore</b><p>This creates a .gitignore file with default values.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="824"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="824"/> - <source>Show combined configuration settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="828"/> - <source>Show the combined configuration settings from all configuration files</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="832"/> - <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="840"/> - <source>Verify repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="840"/> - <source>Verify repository...</source> + <source>Create .gitignore</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="844"/> - <source>Verify the connectivity and validity of objects of the database</source> + <source>Create a .gitignore file with default values</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="847"/> - <source><b>Verify repository</b><p>This verifies the connectivity and validity of objects of the database.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="855"/> - <source>Optimize repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="855"/> - <source>Optimize repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="859"/> - <source>Cleanup and optimize the local repository</source> + <source><b>Create .gitignore</b><p>This creates a .gitignore file with default values.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="854"/> + <source>Show combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="854"/> + <source>Show combined configuration settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="858"/> + <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="862"/> + <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="870"/> + <source>Verify repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="870"/> + <source>Verify repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="874"/> + <source>Verify the connectivity and validity of objects of the database</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="877"/> + <source><b>Verify repository</b><p>This verifies the connectivity and validity of objects of the database.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="885"/> + <source>Optimize repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="885"/> + <source>Optimize repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="889"/> + <source>Cleanup and optimize the local repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="892"/> <source><b>Optimize repository</b><p>This cleans up and optimizes the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="899"/> <source>Repository Statistics</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="899"/> <source>Repository Statistics...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="903"/> <source>Show some statistics of the local repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="876"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="906"/> <source><b>Repository Statistics</b><p>This show some statistics of the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="883"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="913"/> <source>Create Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="887"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="917"/> <source>Create an archive from the local repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="890"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="920"/> <source><b>Create Archive</b><p>This creates an archive from the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="897"/> - <source>Create bundle</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="897"/> - <source>Create bundle...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="901"/> - <source>Create bundle file collecting changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="904"/> - <source><b>Create bundle</b><p>This creates a bundle file collecting selected changesets (git bundle create).</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="912"/> - <source>Verify bundle</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="912"/> - <source>Verify bundle...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="916"/> - <source>Verify the validity and applicability of a bundle file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="919"/> - <source><b>Verify bundle</b><p>This verifies that a bundle file is valid and will apply cleanly.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> - <source>List bundle heads</source> + <source>Create bundle</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> - <source>List bundle heads...</source> + <source>Create bundle...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="931"/> - <source>List all heads contained in a bundle file</source> + <source>Create bundle file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="934"/> + <source><b>Create bundle</b><p>This creates a bundle file collecting selected changesets (git bundle create).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="942"/> + <source>Verify bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="942"/> + <source>Verify bundle...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="946"/> + <source>Verify the validity and applicability of a bundle file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="949"/> + <source><b>Verify bundle</b><p>This verifies that a bundle file is valid and will apply cleanly.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="957"/> + <source>List bundle heads</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="957"/> + <source>List bundle heads...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="961"/> + <source>List all heads contained in a bundle file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="964"/> <source><b>List bundle heads</b><p>This lists all heads contained in a bundle file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="971"/> <source>Apply Bundle (fetch)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="971"/> <source>Apply Bundle (fetch)...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="945"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="975"/> <source>Apply a head of a bundle file using fetch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="948"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="978"/> <source><b>Apply Bundle (fetch)</b><p>This applies a head of a bundle file using fetch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2097"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2159"/> <source>Apply Bundle (pull)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="955"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="985"/> <source>Apply Bundle (pull)...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="959"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="989"/> <source>Apply a head of a bundle file using pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="962"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="992"/> <source><b>Apply Bundle (pull)</b><p>This applies a head of a bundle file using pull.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="969"/> - <source>Start</source> - <translation type="unfinished">Başla</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="973"/> - <source>Start a bisect session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="976"/> - <source><b>Start</b><p>This starts a bisect session.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="983"/> - <source>Start (Extended)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="987"/> - <source>Start a bisect session giving a bad and optionally good commits</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="990"/> - <source><b>Start (Extended)</b><p>This starts a bisect session giving a bad and optionally good commits.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="999"/> - <source>Mark as "good"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="999"/> - <source>Mark as "good"...</source> - <translation type="unfinished"></translation> + <source>Start</source> + <translation type="unfinished">Başla</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1003"/> - <source>Mark a selectable revision as good</source> + <source>Start a bisect session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1006"/> - <source><b>Mark as "good"</b><p>This marks a selectable revision as good.</p></source> + <source><b>Start</b><p>This starts a bisect session.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1013"/> - <source>Mark as "bad"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1013"/> - <source>Mark as "bad"...</source> + <source>Start (Extended)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1017"/> - <source>Mark a selectable revision as bad</source> + <source>Start a bisect session giving a bad and optionally good commits</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1020"/> + <source><b>Start (Extended)</b><p>This starts a bisect session giving a bad and optionally good commits.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1029"/> + <source>Mark as "good"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1029"/> + <source>Mark as "good"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1033"/> + <source>Mark a selectable revision as good</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1036"/> + <source><b>Mark as "good"</b><p>This marks a selectable revision as good.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1043"/> + <source>Mark as "bad"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1043"/> + <source>Mark as "bad"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1047"/> + <source>Mark a selectable revision as bad</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1050"/> <source><b>Mark as "bad"</b><p>This marks a selectable revision as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1057"/> <source>Skip</source> <translation type="unfinished">Atla</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1057"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1031"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1061"/> <source>Skip a selectable revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1064"/> <source><b>Skip</b><p>This skips a selectable revision.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1071"/> <source>Reset</source> <translation type="unfinished">Başadön</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1071"/> <source>Reset...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1075"/> <source>Reset the bisect session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1078"/> <source><b>Reset</b><p>This resets the bisect session.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1055"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1085"/> <source>Show bisect log browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1090"/> <source>Show a dialog to browse the bisect log of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1063"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1093"/> <source><b>Show bisect log browser</b><p>This shows a dialog to browse the bisect log of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1072"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1102"/> <source>Create replay file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1106"/> <source>Create a replay file to repeat the current bisect session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1109"/> <source><b>Create replay file</b><p>This creates a replay file to repeat the current bisect session.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1088"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1118"/> <source>Edit replay file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1092"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1122"/> <source>Edit a bisect replay file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1095"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1125"/> <source><b>Edit replay file</b><p>This edits a bisect replay file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1133"/> <source>Replay session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1107"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1137"/> <source>Replay a bisect session from file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1110"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1140"/> <source><b>Replay session</b><p>This replays a bisect session from file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1147"/> <source>Check patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1121"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1151"/> <source>Check a list of patch files, if they would apply cleanly</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1124"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1154"/> <source><b>Check patch files</b><p>This checks a list of patch files, if they would apply cleanly.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2323"/> <source>Apply patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1166"/> <source>Apply a list of patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1139"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1169"/> <source><b>Apply patch files</b><p>This applies a list of patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1146"/> - <source>Show patch statistics</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1150"/> - <source>Show some statistics for a list of patch files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1153"/> - <source><b>Show patch statistics</b><p>This shows some statistics for a list of patch files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1165"/> - <source>Add a submodule to the current project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1168"/> - <source><b>Add</b><p>This adds a submodule to the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1176"/> - <source>List</source> + <source>Show patch statistics</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1180"/> - <source>List the submodule of the current project</source> + <source>Show some statistics for a list of patch files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1183"/> - <source><b>List</b><p>This lists the submodules of the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1191"/> - <source>Initialize</source> + <source><b>Show patch statistics</b><p>This shows some statistics for a list of patch files.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1195"/> - <source>Initialize the submodules of the current project</source> + <source>Add a submodule to the current project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1198"/> + <source><b>Add</b><p>This adds a submodule to the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1206"/> + <source>List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1210"/> + <source>List the submodule of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1213"/> + <source><b>List</b><p>This lists the submodules of the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1221"/> + <source>Initialize</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1225"/> + <source>Initialize the submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1228"/> <source><b>Initialize</b><p>This initializes the submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1207"/> - <source>Unregister</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1211"/> - <source>Unregister submodules of the current project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1214"/> - <source><b>Unregister</b><p>This unregisters submodules of the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1222"/> - <source>Update</source> - <translation type="unfinished">Güncelle</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1226"/> - <source>Update submodules of the current project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1229"/> - <source><b>Update</b><p>This updates submodules of the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1237"/> - <source>Initialize and Update</source> + <source>Unregister</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1241"/> - <source>Initialize and update submodules of the current project</source> + <source>Unregister submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1244"/> + <source><b>Unregister</b><p>This unregisters submodules of the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1252"/> + <source>Update</source> + <translation type="unfinished">Güncelle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1256"/> + <source>Update submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1259"/> + <source><b>Update</b><p>This updates submodules of the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1267"/> + <source>Initialize and Update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1271"/> + <source>Initialize and update submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1274"/> <source><b>Initialize and Update</b><p>This initializes and updates submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1253"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1283"/> <source>Fetch and Update</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1257"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1287"/> <source>Fetch and update submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1260"/> - <source><b>Fetch and Update</b><p>This fetches and updates submodules of the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1269"/> - <source>Update with Options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1273"/> - <source>Update submodules of the current project offering a dialog to enter options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1277"/> - <source><b>Update with Options</b><p>This updates submodules of the current project offering a dialog to enter update options.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1286"/> - <source>Synchronize URLs</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1290"/> + <source><b>Fetch and Update</b><p>This fetches and updates submodules of the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1299"/> + <source>Update with Options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1303"/> + <source>Update submodules of the current project offering a dialog to enter options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1307"/> + <source><b>Update with Options</b><p>This updates submodules of the current project offering a dialog to enter update options.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1316"/> + <source>Synchronize URLs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1320"/> <source>Synchronize URLs of submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1293"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1323"/> <source><b>Synchronize URLs</b><p>This synchronizes URLs of submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1332"/> <source>Show Status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1306"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1336"/> <source>Show the status of submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1339"/> <source><b>Show Status</b><p>This shows a dialog with the status of submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1318"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1348"/> <source>Show Summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1322"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1352"/> <source>Show summary information for submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1325"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1355"/> <source><b>Show Summary</b><p>This shows some summary information for submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1344"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1374"/> <source>Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1360"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1390"/> <source>Bundle Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1401"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2237"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2299"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1397"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1427"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1405"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1435"/> <source>Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1418"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1448"/> <source>Manage Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1426"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1456"/> <source>Remote Repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1436"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1468"/> <source>Cherry-pick</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1444"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1476"/> <source>Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1459"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1491"/> <source>Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1541"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1573"/> <source>Git</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1646"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1678"/> <source>Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2323"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1690"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1722"/> <source>Pull</source> <translation type="unfinished">Çekmek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1715"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1747"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1734"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1766"/> <source>Unstage Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1874"/> <source>Select a remote repository:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1853"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1915"/> <source>Copy Commits (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1872"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1934"/> <source>Copy Commits (Quit)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1892"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1954"/> <source>Copy Commits (Cancel)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1911"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1973"/> <source>Save Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1961"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2023"/> <source>Restore Stash</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="604"/> + <source>Change URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="604"/> + <source>Change URL...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="608"/> + <source>Change the URL of a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="611"/> + <source><b>Change URL</b><p>This changes the URL of a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="618"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="618"/> + <source>Credentials...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="622"/> + <source>Change or set the user credentials of a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="625"/> + <source><b>Credentials</b><p>This changes or sets the user credentials of a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>GitPullDialog</name> @@ -22979,6 +23072,49 @@ </message> </context> <context> + <name>GitRemoteCredentialsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="14"/> + <source>Git Remote Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished">Adı:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="40"/> + <source>URL:</source> + <translation type="unfinished">URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="57"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="63"/> + <source>Username:</source> + <translation type="unfinished">Kullanıcı Adı:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="70"/> + <source>Enter the user name for the remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="77"/> + <source>Password:</source> + <translation type="unfinished">Parola:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="87"/> + <source>Enter the password for the remote repository</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GitRemoteRepositoriesDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="14"/> @@ -23022,92 +23158,92 @@ <translation type="unfinished">&Ekle</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="159"/> + <source>Press to rename the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="162"/> + <source>&Rename</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="92"/> - <source>Press to rename the selected repository</source> + <source>Press to remove the selected repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="95"/> - <source>&Rename</source> + <source>Re&move</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="102"/> - <source>Press to remove the selected repository</source> + <source>Press to delete stale tracking branches under the selected repository </source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="105"/> - <source>Re&move</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="112"/> - <source>Press to delete stale tracking branches under the selected repository </source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="115"/> <source>&Prune</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="129"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="119"/> <source>Press to show information about the selected repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="132"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="122"/> <source>Show &Info...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="160"/> - <source>Errors</source> - <translation type="unfinished">Hatalar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="166"/> - <source><b>Git log errors</b><p>This shows possible error messages of the git log command.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="182"/> - <source>Input</source> - <translation type="unfinished">Girdi</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="204"/> - <source>Press to send the input to the git process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="207"/> - <source>&Send</source> - <translation type="unfinished">&Gönder</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="210"/> + <source>Errors</source> + <translation type="unfinished">Hatalar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="216"/> + <source><b>Git log errors</b><p>This shows possible error messages of the git log command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="232"/> + <source>Input</source> + <translation type="unfinished">Girdi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="254"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="257"/> + <source>&Send</source> + <translation type="unfinished">&Gönder</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="260"/> <source>Alt+S</source> <translation type="unfinished">Alt+S</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="267"/> <source>Enter data to be sent to the git process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="224"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="274"/> <source>Select to switch the input field to password mode</source> <translation type="unfinished">Giriş alanını parola moduna çevirmek için seçiniz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="227"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="277"/> <source>&Password Mode</source> <translation type="unfinished">&Parola Modu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="280"/> <source>Alt+P</source> <translation type="unfinished">Alt+P</translation> </message> @@ -23131,6 +23267,26 @@ <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="169"/> + <source>Press to change the URL of the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="172"/> + <source>Change &URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="179"/> + <source>Press to set or change the user credentials of the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="182"/> + <source>&Credentials</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>GitRevisionSelectionDialog</name>
--- a/i18n/eric6_zh_CN.ts Sun Jun 03 11:30:57 2018 +0200 +++ b/i18n/eric6_zh_CN.ts Sun Jun 03 14:03:19 2018 +0200 @@ -1545,8 +1545,8 @@ </message> <message> <location filename="../Utilities/BackgroundService.py" line="422"/> - <source>Erics background client disconnected because of an unknown reason.</source> - <translation>Erics 后台客户端因未知原因断开连接。</translation> + <source>Eric's background client disconnected because of an unknown reason.</source> + <translation type="unfinished">Erics 后台客户端因未知原因断开连接。</translation> </message> <message> <location filename="../Utilities/BackgroundService.py" line="428"/> @@ -18512,237 +18512,237 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2972"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3070"/> <source>Show Remote Info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> <source>Rename Remote Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> <source>Enter new name for remote repository:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2996"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3094"/> <source>Show Shortlog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3054"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3152"/> <source>Cherry-pick</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3084"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3182"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3109"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3207"/> <source>Copy Changesets (Quit)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3233"/> <source>Copy Changesets (Cancel)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3215"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3313"/> <source>Saving stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3414"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> <source>Show Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3414"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> <source>Select a stash (empty for latest stash):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3326"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3424"/> <source>Restore Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3340"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3438"/> <source>Restoring stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3374"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3472"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3364"/> - <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="3389"/> - <source>Creating branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3423"/> - <source>Delete Stash</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3423"/> - <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="3434"/> - <source>Deleting stash</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3454"/> - <source>Delete All Stashes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3454"/> - <source>Do you really want to delete all stashes?</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> - <source>Deleting all stashes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3534"/> - <source>Showing the combined configuration settings</source> + <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="3487"/> + <source>Creating branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <source>Delete Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <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="3532"/> + <source>Deleting stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <source>Delete All Stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <source>Do you really want to delete all stashes?</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3560"/> - <source>Verifying the integrity of the Git repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3585"/> - <source>Performing Repository Housekeeping</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3629"/> - <source><tr><td><b>Statistics</b></td></tr></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3630"/> - <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="3634"/> - <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="3638"/> - <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="3642"/> - <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="3646"/> - <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="3650"/> - <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="3654"/> - <source><tr><td>Garbage files: </td><td>{0}</td></tr></source> + <source>Deleting all stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3632"/> + <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3658"/> + <source>Verifying the integrity of the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3683"/> + <source>Performing Repository Housekeeping</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3727"/> + <source><tr><td><b>Statistics</b></td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3728"/> + <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="3732"/> + <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="3736"/> + <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="3740"/> + <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="3744"/> + <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="3748"/> + <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="3752"/> + <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="3756"/> <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="3664"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3762"/> <source><p><b>No statistics available.</b></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3730"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3828"/> <source>Creating Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3773"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3871"/> <source>Add Submodule</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> <source>List Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> <source>No submodules defined for the project.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3956"/> <source>All</source> <translation type="unfinished">全部</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> <source>Submodule Path</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> <source>Select a submodule path:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3914"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4012"/> <source>Initialize Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3951"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4049"/> <source>Unregister Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4031"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4129"/> <source>Update Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4065"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4163"/> <source>Synchronize Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4123"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4221"/> <source>Submodules Summary</source> <translation type="unfinished"></translation> </message> @@ -18774,6 +18774,31 @@ <source>Enter the remote URL</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="51"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="57"/> + <source>Username:</source> + <translation type="unfinished">用户名：</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="64"/> + <source>Enter the user name for the remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="71"/> + <source>Password:</source> + <translation type="unfinished">密码：</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="81"/> + <source>Enter the password for the remote repository</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>GitApplyBundleDataDialog</name> @@ -19399,6 +19424,34 @@ </message> </context> <context> + <name>GitChangeRemoteUrlDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="14"/> + <source>Git Change Remote URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished">名称：</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="40"/> + <source>URL:</source> + <translation type="unfinished">URL：</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="57"/> + <source>New URL:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="64"/> + <source>Enter the new remote URL</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GitCherryPickDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="14"/> @@ -21668,7 +21721,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1765"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1797"/> <source>Show Remote Info</source> <translation type="unfinished"></translation> </message> @@ -21683,7 +21736,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1161"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1191"/> <source>Add</source> <translation type="unfinished">添加</translation> </message> @@ -21703,7 +21756,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1785"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1817"/> <source>Remove</source> <translation type="unfinished">移除</translation> </message> @@ -21723,7 +21776,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1799"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1831"/> <source>Prune</source> <translation type="unfinished"></translation> </message> @@ -21743,7 +21796,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1874"/> <source>Rename</source> <translation type="unfinished"></translation> </message> @@ -21763,940 +21816,980 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1833"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1895"/> <source>Copy Commits</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="609"/> - <source>Copies commits into the current branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="612"/> - <source><b>Copy Commits</b><p>This copies commits on top of the current branch.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="619"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="623"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="626"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="635"/> - <source>Quit Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="639"/> - <source>Quit the current copying session</source> + <source>Copies commits into the current branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="642"/> - <source><b>Quit Copying Session</b><p>This quits the current copying session.</p></source> + <source><b>Copy Commits</b><p>This copies commits on top of the current branch.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="649"/> - <source>Cancel Copying Session</source> + <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="653"/> - <source>Cancel the current copying session and return to the previous state</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="657"/> - <source><b>Cancel Copying Session</b><p>This cancels the current copying session and returns to the previous state.</p></source> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="656"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="665"/> - <source>Stash changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="665"/> - <source>Stash changes...</source> + <source>Quit Copying Session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="669"/> - <source>Stash all current changes of the project</source> + <source>Quit the current copying session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="672"/> - <source><b>Stash changes</b><p>This stashes all current changes of the project.</p></source> + <source><b>Quit Copying Session</b><p>This quits the current copying session.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="679"/> - <source>Show stash browser</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="679"/> - <source>Show stash browser...</source> + <source>Cancel Copying Session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="683"/> - <source>Show a dialog with all stashes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="686"/> - <source><b>Show stash browser...</b><p>This shows a dialog listing all available stashes. Actions on these stashes may be executed via the context menu.</p></source> + <source>Cancel the current copying session and return to the previous state</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="687"/> + <source><b>Cancel Copying Session</b><p>This cancels the current copying session and returns to the previous state.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> - <source>Show stash</source> + <source>Stash changes</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> - <source>Show stash...</source> + <source>Stash changes...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="699"/> - <source>Show a dialog with a patch of a stash</source> + <source>Stash all current changes of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="702"/> + <source><b>Stash changes</b><p>This stashes all current changes of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="709"/> + <source>Show stash browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="709"/> + <source>Show stash browser...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="713"/> + <source>Show a dialog with all stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="716"/> + <source><b>Show stash browser...</b><p>This shows a dialog listing all available stashes. Actions on these stashes may be executed via the context menu.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="725"/> + <source>Show stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="725"/> + <source>Show stash...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="729"/> + <source>Show a dialog with a patch of a stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="732"/> <source><b>Show stash...</b><p>This shows a dialog with a patch of a selectable stash.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="710"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="740"/> <source>Restore && Keep</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="714"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="744"/> <source>Restore a stash but keep it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="717"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="747"/> <source><b>Restore &amp; Keep</b><p>This restores a selectable stash and keeps it.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="724"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="754"/> <source>Restore && Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="758"/> <source>Restore a stash and delete it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="731"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="761"/> <source><b>Restore &amp; Delete</b><p>This restores a selectable stash and deletes it.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1980"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2042"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="772"/> <source>Create a new branch and restore a stash into it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="745"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="775"/> <source><b>Create Branch</b><p>This creates a new branch and restores a stash into it.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="753"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="783"/> <source>Delete</source> <translation type="unfinished">删除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="787"/> <source>Delete a stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="760"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="790"/> <source><b>Delete</b><p>This deletes a stash.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="767"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="797"/> <source>Delete All</source> <translation type="unfinished">全部删除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="771"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="801"/> <source>Delete all stashes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="774"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="804"/> <source><b>Delete All</b><p>This deletes all stashes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="811"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="811"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="785"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="815"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="788"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="818"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="825"/> <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="825"/> <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="829"/> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="802"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="810"/> - <source>Create .gitignore</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="814"/> - <source>Create a .gitignore file with default values</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="817"/> - <source><b>Create .gitignore</b><p>This creates a .gitignore file with default values.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="824"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="824"/> - <source>Show combined configuration settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="828"/> - <source>Show the combined configuration settings from all configuration files</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="832"/> - <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="840"/> - <source>Verify repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="840"/> - <source>Verify repository...</source> + <source>Create .gitignore</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="844"/> - <source>Verify the connectivity and validity of objects of the database</source> + <source>Create a .gitignore file with default values</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="847"/> - <source><b>Verify repository</b><p>This verifies the connectivity and validity of objects of the database.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="855"/> - <source>Optimize repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="855"/> - <source>Optimize repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="859"/> - <source>Cleanup and optimize the local repository</source> + <source><b>Create .gitignore</b><p>This creates a .gitignore file with default values.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="854"/> + <source>Show combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="854"/> + <source>Show combined configuration settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="858"/> + <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="862"/> + <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="870"/> + <source>Verify repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="870"/> + <source>Verify repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="874"/> + <source>Verify the connectivity and validity of objects of the database</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="877"/> + <source><b>Verify repository</b><p>This verifies the connectivity and validity of objects of the database.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="885"/> + <source>Optimize repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="885"/> + <source>Optimize repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="889"/> + <source>Cleanup and optimize the local repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="892"/> <source><b>Optimize repository</b><p>This cleans up and optimizes the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="899"/> <source>Repository Statistics</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="899"/> <source>Repository Statistics...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="903"/> <source>Show some statistics of the local repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="876"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="906"/> <source><b>Repository Statistics</b><p>This show some statistics of the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="883"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="913"/> <source>Create Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="887"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="917"/> <source>Create an archive from the local repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="890"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="920"/> <source><b>Create Archive</b><p>This creates an archive from the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="897"/> - <source>Create bundle</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="897"/> - <source>Create bundle...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="901"/> - <source>Create bundle file collecting changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="904"/> - <source><b>Create bundle</b><p>This creates a bundle file collecting selected changesets (git bundle create).</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="912"/> - <source>Verify bundle</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="912"/> - <source>Verify bundle...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="916"/> - <source>Verify the validity and applicability of a bundle file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="919"/> - <source><b>Verify bundle</b><p>This verifies that a bundle file is valid and will apply cleanly.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> - <source>List bundle heads</source> + <source>Create bundle</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> - <source>List bundle heads...</source> + <source>Create bundle...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="931"/> - <source>List all heads contained in a bundle file</source> + <source>Create bundle file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="934"/> + <source><b>Create bundle</b><p>This creates a bundle file collecting selected changesets (git bundle create).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="942"/> + <source>Verify bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="942"/> + <source>Verify bundle...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="946"/> + <source>Verify the validity and applicability of a bundle file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="949"/> + <source><b>Verify bundle</b><p>This verifies that a bundle file is valid and will apply cleanly.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="957"/> + <source>List bundle heads</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="957"/> + <source>List bundle heads...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="961"/> + <source>List all heads contained in a bundle file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="964"/> <source><b>List bundle heads</b><p>This lists all heads contained in a bundle file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="971"/> <source>Apply Bundle (fetch)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="971"/> <source>Apply Bundle (fetch)...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="945"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="975"/> <source>Apply a head of a bundle file using fetch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="948"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="978"/> <source><b>Apply Bundle (fetch)</b><p>This applies a head of a bundle file using fetch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2097"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2159"/> <source>Apply Bundle (pull)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="955"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="985"/> <source>Apply Bundle (pull)...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="959"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="989"/> <source>Apply a head of a bundle file using pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="962"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="992"/> <source><b>Apply Bundle (pull)</b><p>This applies a head of a bundle file using pull.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="969"/> - <source>Start</source> - <translation type="unfinished">开始</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="973"/> - <source>Start a bisect session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="976"/> - <source><b>Start</b><p>This starts a bisect session.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="983"/> - <source>Start (Extended)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="987"/> - <source>Start a bisect session giving a bad and optionally good commits</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="990"/> - <source><b>Start (Extended)</b><p>This starts a bisect session giving a bad and optionally good commits.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="999"/> - <source>Mark as "good"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="999"/> - <source>Mark as "good"...</source> - <translation type="unfinished"></translation> + <source>Start</source> + <translation type="unfinished">开始</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1003"/> - <source>Mark a selectable revision as good</source> + <source>Start a bisect session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1006"/> - <source><b>Mark as "good"</b><p>This marks a selectable revision as good.</p></source> + <source><b>Start</b><p>This starts a bisect session.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1013"/> - <source>Mark as "bad"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1013"/> - <source>Mark as "bad"...</source> + <source>Start (Extended)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1017"/> - <source>Mark a selectable revision as bad</source> + <source>Start a bisect session giving a bad and optionally good commits</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1020"/> + <source><b>Start (Extended)</b><p>This starts a bisect session giving a bad and optionally good commits.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1029"/> + <source>Mark as "good"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1029"/> + <source>Mark as "good"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1033"/> + <source>Mark a selectable revision as good</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1036"/> + <source><b>Mark as "good"</b><p>This marks a selectable revision as good.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1043"/> + <source>Mark as "bad"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1043"/> + <source>Mark as "bad"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1047"/> + <source>Mark a selectable revision as bad</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1050"/> <source><b>Mark as "bad"</b><p>This marks a selectable revision as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1057"/> <source>Skip</source> <translation type="unfinished">跳过</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1057"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1031"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1061"/> <source>Skip a selectable revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1064"/> <source><b>Skip</b><p>This skips a selectable revision.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1071"/> <source>Reset</source> <translation type="unfinished">重置</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1071"/> <source>Reset...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1075"/> <source>Reset the bisect session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1078"/> <source><b>Reset</b><p>This resets the bisect session.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1055"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1085"/> <source>Show bisect log browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1090"/> <source>Show a dialog to browse the bisect log of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1063"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1093"/> <source><b>Show bisect log browser</b><p>This shows a dialog to browse the bisect log of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1072"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1102"/> <source>Create replay file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1106"/> <source>Create a replay file to repeat the current bisect session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1109"/> <source><b>Create replay file</b><p>This creates a replay file to repeat the current bisect session.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1088"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1118"/> <source>Edit replay file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1092"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1122"/> <source>Edit a bisect replay file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1095"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1125"/> <source><b>Edit replay file</b><p>This edits a bisect replay file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1133"/> <source>Replay session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1107"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1137"/> <source>Replay a bisect session from file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1110"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1140"/> <source><b>Replay session</b><p>This replays a bisect session from file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1147"/> <source>Check patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1121"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1151"/> <source>Check a list of patch files, if they would apply cleanly</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1124"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1154"/> <source><b>Check patch files</b><p>This checks a list of patch files, if they would apply cleanly.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2323"/> <source>Apply patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1166"/> <source>Apply a list of patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1139"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1169"/> <source><b>Apply patch files</b><p>This applies a list of patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1146"/> - <source>Show patch statistics</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1150"/> - <source>Show some statistics for a list of patch files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1153"/> - <source><b>Show patch statistics</b><p>This shows some statistics for a list of patch files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1165"/> - <source>Add a submodule to the current project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1168"/> - <source><b>Add</b><p>This adds a submodule to the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1176"/> - <source>List</source> + <source>Show patch statistics</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1180"/> - <source>List the submodule of the current project</source> + <source>Show some statistics for a list of patch files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1183"/> - <source><b>List</b><p>This lists the submodules of the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1191"/> - <source>Initialize</source> + <source><b>Show patch statistics</b><p>This shows some statistics for a list of patch files.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1195"/> - <source>Initialize the submodules of the current project</source> + <source>Add a submodule to the current project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1198"/> + <source><b>Add</b><p>This adds a submodule to the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1206"/> + <source>List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1210"/> + <source>List the submodule of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1213"/> + <source><b>List</b><p>This lists the submodules of the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1221"/> + <source>Initialize</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1225"/> + <source>Initialize the submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1228"/> <source><b>Initialize</b><p>This initializes the submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1207"/> - <source>Unregister</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1211"/> - <source>Unregister submodules of the current project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1214"/> - <source><b>Unregister</b><p>This unregisters submodules of the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1222"/> - <source>Update</source> - <translation type="unfinished">更新</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1226"/> - <source>Update submodules of the current project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1229"/> - <source><b>Update</b><p>This updates submodules of the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1237"/> - <source>Initialize and Update</source> + <source>Unregister</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1241"/> - <source>Initialize and update submodules of the current project</source> + <source>Unregister submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1244"/> + <source><b>Unregister</b><p>This unregisters submodules of the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1252"/> + <source>Update</source> + <translation type="unfinished">更新</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1256"/> + <source>Update submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1259"/> + <source><b>Update</b><p>This updates submodules of the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1267"/> + <source>Initialize and Update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1271"/> + <source>Initialize and update submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1274"/> <source><b>Initialize and Update</b><p>This initializes and updates submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1253"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1283"/> <source>Fetch and Update</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1257"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1287"/> <source>Fetch and update submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1260"/> - <source><b>Fetch and Update</b><p>This fetches and updates submodules of the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1269"/> - <source>Update with Options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1273"/> - <source>Update submodules of the current project offering a dialog to enter options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1277"/> - <source><b>Update with Options</b><p>This updates submodules of the current project offering a dialog to enter update options.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1286"/> - <source>Synchronize URLs</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1290"/> + <source><b>Fetch and Update</b><p>This fetches and updates submodules of the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1299"/> + <source>Update with Options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1303"/> + <source>Update submodules of the current project offering a dialog to enter options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1307"/> + <source><b>Update with Options</b><p>This updates submodules of the current project offering a dialog to enter update options.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1316"/> + <source>Synchronize URLs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1320"/> <source>Synchronize URLs of submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1293"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1323"/> <source><b>Synchronize URLs</b><p>This synchronizes URLs of submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1332"/> <source>Show Status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1306"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1336"/> <source>Show the status of submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1339"/> <source><b>Show Status</b><p>This shows a dialog with the status of submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1318"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1348"/> <source>Show Summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1322"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1352"/> <source>Show summary information for submodules of the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1325"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1355"/> <source><b>Show Summary</b><p>This shows some summary information for submodules of the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1344"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1374"/> <source>Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1360"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1390"/> <source>Bundle Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1401"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2237"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2299"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1397"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1427"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1405"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1435"/> <source>Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1418"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1448"/> <source>Manage Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1426"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1456"/> <source>Remote Repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1436"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1468"/> <source>Cherry-pick</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1444"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1476"/> <source>Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1459"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1491"/> <source>Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1541"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1573"/> <source>Git</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1646"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1678"/> <source>Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2323"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1690"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1722"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1715"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1747"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1734"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1766"/> <source>Unstage Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1874"/> <source>Select a remote repository:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1853"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1915"/> <source>Copy Commits (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1872"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1934"/> <source>Copy Commits (Quit)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1892"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1954"/> <source>Copy Commits (Cancel)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1911"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1973"/> <source>Save Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1961"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2023"/> <source>Restore Stash</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="604"/> + <source>Change URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="604"/> + <source>Change URL...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="608"/> + <source>Change the URL of a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="611"/> + <source><b>Change URL</b><p>This changes the URL of a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="618"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="618"/> + <source>Credentials...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="622"/> + <source>Change or set the user credentials of a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="625"/> + <source><b>Credentials</b><p>This changes or sets the user credentials of a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>GitPullDialog</name> @@ -22998,6 +23091,49 @@ </message> </context> <context> + <name>GitRemoteCredentialsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="14"/> + <source>Git Remote Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished">名称：</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="40"/> + <source>URL:</source> + <translation type="unfinished">URL：</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="57"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="63"/> + <source>Username:</source> + <translation type="unfinished">用户名：</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="70"/> + <source>Enter the user name for the remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="77"/> + <source>Password:</source> + <translation type="unfinished">密码：</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="87"/> + <source>Enter the password for the remote repository</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GitRemoteRepositoriesDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="14"/> @@ -23041,92 +23177,92 @@ <translation type="unfinished">添加(&A)</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="159"/> + <source>Press to rename the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="162"/> + <source>&Rename</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="92"/> - <source>Press to rename the selected repository</source> + <source>Press to remove the selected repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="95"/> - <source>&Rename</source> + <source>Re&move</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="102"/> - <source>Press to remove the selected repository</source> + <source>Press to delete stale tracking branches under the selected repository </source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="105"/> - <source>Re&move</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="112"/> - <source>Press to delete stale tracking branches under the selected repository </source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="115"/> <source>&Prune</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="129"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="119"/> <source>Press to show information about the selected repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="132"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="122"/> <source>Show &Info...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="160"/> - <source>Errors</source> - <translation type="unfinished">错误</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="166"/> - <source><b>Git log errors</b><p>This shows possible error messages of the git log command.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="182"/> - <source>Input</source> - <translation type="unfinished">输入</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="204"/> - <source>Press to send the input to the git process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="207"/> - <source>&Send</source> - <translation type="unfinished">发送(&S)</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="210"/> + <source>Errors</source> + <translation type="unfinished">错误</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="216"/> + <source><b>Git log errors</b><p>This shows possible error messages of the git log command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="232"/> + <source>Input</source> + <translation type="unfinished">输入</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="254"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="257"/> + <source>&Send</source> + <translation type="unfinished">发送(&S)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="260"/> <source>Alt+S</source> <translation type="unfinished">Alt+S</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="267"/> <source>Enter data to be sent to the git process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="224"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="274"/> <source>Select to switch the input field to password mode</source> <translation type="unfinished">选择将输入区域转换成密码模式</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="227"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="277"/> <source>&Password Mode</source> <translation type="unfinished">密码模式(&P)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="280"/> <source>Alt+P</source> <translation type="unfinished">Alt+P</translation> </message> @@ -23150,6 +23286,26 @@ <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="169"/> + <source>Press to change the URL of the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="172"/> + <source>Change &URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="179"/> + <source>Press to set or change the user credentials of the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="182"/> + <source>&Credentials</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>GitRevisionSelectionDialog</name>
