Sun, 10 Dec 2017 17:42:11 +0100
Added the git plug-in to the core plug-ins.
--- a/APIs/Python3/eric6.api Sun Dec 10 16:43:11 2017 +0100 +++ b/APIs/Python3/eric6.api Sun Dec 10 17:42:11 2017 +0100 @@ -4473,6 +4473,39 @@ eric6.Plugins.PluginTranslator.shortDescription?7 eric6.Plugins.PluginTranslator.translatorPluginObject?7 eric6.Plugins.PluginTranslator.version?7 +eric6.Plugins.PluginVcsGit.VcsGitPlugin.GitDefaults?7 +eric6.Plugins.PluginVcsGit.VcsGitPlugin.activate?4() +eric6.Plugins.PluginVcsGit.VcsGitPlugin.deactivate?4() +eric6.Plugins.PluginVcsGit.VcsGitPlugin.getConfigPath?4() +eric6.Plugins.PluginVcsGit.VcsGitPlugin.getPreferences?4(key) +eric6.Plugins.PluginVcsGit.VcsGitPlugin.getProjectHelper?4() +eric6.Plugins.PluginVcsGit.VcsGitPlugin.initToolbar?4(ui, toolbarManager) +eric6.Plugins.PluginVcsGit.VcsGitPlugin.prepareUninstall?4() +eric6.Plugins.PluginVcsGit.VcsGitPlugin.prepareUnload?4() +eric6.Plugins.PluginVcsGit.VcsGitPlugin.setPreferences?4(key, value) +eric6.Plugins.PluginVcsGit.VcsGitPlugin?1(ui) +eric6.Plugins.PluginVcsGit.author?7 +eric6.Plugins.PluginVcsGit.autoactivate?7 +eric6.Plugins.PluginVcsGit.className?7 +eric6.Plugins.PluginVcsGit.clearPrivateData?4() +eric6.Plugins.PluginVcsGit.createConfigurationPage?4(configDlg) +eric6.Plugins.PluginVcsGit.deactivateable?7 +eric6.Plugins.PluginVcsGit.displayString?4() +eric6.Plugins.PluginVcsGit.error?7 +eric6.Plugins.PluginVcsGit.exeDisplayData?4() +eric6.Plugins.PluginVcsGit.getConfigData?4() +eric6.Plugins.PluginVcsGit.getVcsSystemIndicator?4() +eric6.Plugins.PluginVcsGit.gitCfgPluginObject?7 +eric6.Plugins.PluginVcsGit.longDescription?7 +eric6.Plugins.PluginVcsGit.name?7 +eric6.Plugins.PluginVcsGit.packageName?7 +eric6.Plugins.PluginVcsGit.pluginType?7 +eric6.Plugins.PluginVcsGit.pluginTypename?7 +eric6.Plugins.PluginVcsGit.prepareUninstall?4() +eric6.Plugins.PluginVcsGit.pyqtApi?7 +eric6.Plugins.PluginVcsGit.python2Compatible?7 +eric6.Plugins.PluginVcsGit.shortDescription?7 +eric6.Plugins.PluginVcsGit.version?7 eric6.Plugins.PluginVcsMercurial.VcsMercurialPlugin.MercurialDefaults?7 eric6.Plugins.PluginVcsMercurial.VcsMercurialPlugin.activate?4() eric6.Plugins.PluginVcsMercurial.VcsMercurialPlugin.deactivate?4() @@ -4977,6 +5010,510 @@ eric6.Plugins.UiExtensionPlugins.VirtualenvInterface.VirtualenvExecDialog.VirtualenvExecDialog.on_buttonBox_clicked?4(button) eric6.Plugins.UiExtensionPlugins.VirtualenvInterface.VirtualenvExecDialog.VirtualenvExecDialog.start?4(arguments) eric6.Plugins.UiExtensionPlugins.VirtualenvInterface.VirtualenvExecDialog.VirtualenvExecDialog?1(pyvenv, targetDir, openTarget, createLog, createScript, interpreter, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.Config.ConfigGitSchemes?7 +eric6.Plugins.VcsPlugins.vcsGit.ConfigurationPage.GitPage.GitPage.on_configButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.ConfigurationPage.GitPage.GitPage.save?4() +eric6.Plugins.VcsPlugins.vcsGit.ConfigurationPage.GitPage.GitPage?1(plugin) +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?1(parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitApplyBundleDataDialog.GitApplyBundleDataDialog.getData?4() +eric6.Plugins.VcsPlugins.vcsGit.GitApplyBundleDataDialog.GitApplyBundleDataDialog?1(bundleHeads, branches, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitArchiveDataDialog.GitArchiveDataDialog.getData?4() +eric6.Plugins.VcsPlugins.vcsGit.GitArchiveDataDialog.GitArchiveDataDialog.on_branchButton_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsGit.GitArchiveDataDialog.GitArchiveDataDialog.on_branchCombo_editTextChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitArchiveDataDialog.GitArchiveDataDialog.on_fileButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitArchiveDataDialog.GitArchiveDataDialog.on_fileEdit_textChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitArchiveDataDialog.GitArchiveDataDialog.on_revButton_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsGit.GitArchiveDataDialog.GitArchiveDataDialog.on_revEdit_textChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitArchiveDataDialog.GitArchiveDataDialog.on_tagButton_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsGit.GitArchiveDataDialog.GitArchiveDataDialog.on_tagCombo_editTextChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitArchiveDataDialog.GitArchiveDataDialog?1(tagsList, branchesList, formatsList, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.GitBisectLogBrowserDialog.CommitIdColumn?7 +eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.GitBisectLogBrowserDialog.OperationColumn?7 +eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.GitBisectLogBrowserDialog.SubjectColumn?7 +eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.GitBisectLogBrowserDialog.closeEvent?4(e) +eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.GitBisectLogBrowserDialog.keyPressEvent?4(evt) +eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.GitBisectLogBrowserDialog.on_buttonBox_clicked?4(button) +eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.GitBisectLogBrowserDialog.on_input_returnPressed?4() +eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.GitBisectLogBrowserDialog.on_passwordCheckBox_toggled?4(isOn) +eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.GitBisectLogBrowserDialog.on_refreshButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.GitBisectLogBrowserDialog.on_sendButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.GitBisectLogBrowserDialog.show?4() +eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.GitBisectLogBrowserDialog.start?4(projectdir) +eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.GitBisectLogBrowserDialog?1(vcs, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitBisectStartDialog.GitBisectStartDialog.getData?4() +eric6.Plugins.VcsPlugins.vcsGit.GitBisectStartDialog.GitBisectStartDialog.on_badEdit_textChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitBisectStartDialog.GitBisectStartDialog?1(parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitBlameDialog.GitBlameDialog.closeEvent?4(e) +eric6.Plugins.VcsPlugins.vcsGit.GitBlameDialog.GitBlameDialog.keyPressEvent?4(evt) +eric6.Plugins.VcsPlugins.vcsGit.GitBlameDialog.GitBlameDialog.on_buttonBox_clicked?4(button) +eric6.Plugins.VcsPlugins.vcsGit.GitBlameDialog.GitBlameDialog.on_input_returnPressed?4() +eric6.Plugins.VcsPlugins.vcsGit.GitBlameDialog.GitBlameDialog.on_passwordCheckBox_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsGit.GitBlameDialog.GitBlameDialog.on_sendButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitBlameDialog.GitBlameDialog.start?4(fn) +eric6.Plugins.VcsPlugins.vcsGit.GitBlameDialog.GitBlameDialog?1(vcs, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitBranchDialog.GitBranchDialog.CreateBranch?7 +eric6.Plugins.VcsPlugins.vcsGit.GitBranchDialog.GitBranchDialog.CreateSwitchBranch?7 +eric6.Plugins.VcsPlugins.vcsGit.GitBranchDialog.GitBranchDialog.CreateTrackingBranch?7 +eric6.Plugins.VcsPlugins.vcsGit.GitBranchDialog.GitBranchDialog.DeleteBranch?7 +eric6.Plugins.VcsPlugins.vcsGit.GitBranchDialog.GitBranchDialog.RenameBranch?7 +eric6.Plugins.VcsPlugins.vcsGit.GitBranchDialog.GitBranchDialog.SetTrackingBranch?7 +eric6.Plugins.VcsPlugins.vcsGit.GitBranchDialog.GitBranchDialog.UnsetTrackingBranch?7 +eric6.Plugins.VcsPlugins.vcsGit.GitBranchDialog.GitBranchDialog.getParameters?4() +eric6.Plugins.VcsPlugins.vcsGit.GitBranchDialog.GitBranchDialog.on_branchCombo_editTextChanged?4(text) +eric6.Plugins.VcsPlugins.vcsGit.GitBranchDialog.GitBranchDialog.on_createTrackingButton_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsGit.GitBranchDialog.GitBranchDialog.on_newBranchNameEdit_textChanged?4(text) +eric6.Plugins.VcsPlugins.vcsGit.GitBranchDialog.GitBranchDialog.on_setTrackingButton_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsGit.GitBranchDialog.GitBranchDialog.on_unsetTrackingButton_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsGit.GitBranchDialog.GitBranchDialog?1(branchlist, revision=None, branchName=None, branchOp=None, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitBranchPushDialog.GitBranchPushDialog.getData?4() +eric6.Plugins.VcsPlugins.vcsGit.GitBranchPushDialog.GitBranchPushDialog.on_branchComboBox_editTextChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitBranchPushDialog.GitBranchPushDialog?1(branches, remotes, delete=False, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitBundleDialog.GitBundleDialog.getData?4() +eric6.Plugins.VcsPlugins.vcsGit.GitBundleDialog.GitBundleDialog.on_branchButton_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsGit.GitBundleDialog.GitBundleDialog.on_branchCombo_editTextChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitBundleDialog.GitBundleDialog.on_revisionsButton_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsGit.GitBundleDialog.GitBundleDialog.on_revisionsEdit_textChanged?4(txt) +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.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) +eric6.Plugins.VcsPlugins.vcsGit.GitCommandDialog.GitCommandDialog.getData?4() +eric6.Plugins.VcsPlugins.vcsGit.GitCommandDialog.GitCommandDialog.on_commandCombo_editTextChanged?4(text) +eric6.Plugins.VcsPlugins.vcsGit.GitCommandDialog.GitCommandDialog?1(argvList, ppath, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitCommitDialog.GitCommitDialog.accepted?7 +eric6.Plugins.VcsPlugins.vcsGit.GitCommitDialog.GitCommitDialog.amend?4() +eric6.Plugins.VcsPlugins.vcsGit.GitCommitDialog.GitCommitDialog.logMessage?4() +eric6.Plugins.VcsPlugins.vcsGit.GitCommitDialog.GitCommitDialog.on_buttonBox_accepted?4() +eric6.Plugins.VcsPlugins.vcsGit.GitCommitDialog.GitCommitDialog.on_buttonBox_clicked?4(button) +eric6.Plugins.VcsPlugins.vcsGit.GitCommitDialog.GitCommitDialog.on_buttonBox_rejected?4() +eric6.Plugins.VcsPlugins.vcsGit.GitCommitDialog.GitCommitDialog.on_recentComboBox_activated?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitCommitDialog.GitCommitDialog.rejected?7 +eric6.Plugins.VcsPlugins.vcsGit.GitCommitDialog.GitCommitDialog.resetAuthor?4() +eric6.Plugins.VcsPlugins.vcsGit.GitCommitDialog.GitCommitDialog.showEvent?4(evt) +eric6.Plugins.VcsPlugins.vcsGit.GitCommitDialog.GitCommitDialog.stagedOnly?4() +eric6.Plugins.VcsPlugins.vcsGit.GitCommitDialog.GitCommitDialog?1(vcs, msg, amend, commitAll, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitCopyDialog.GitCopyDialog.getData?4() +eric6.Plugins.VcsPlugins.vcsGit.GitCopyDialog.GitCopyDialog.on_dirButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitCopyDialog.GitCopyDialog.on_targetEdit_textChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitCopyDialog.GitCopyDialog?1(source, parent=None, move=False) +eric6.Plugins.VcsPlugins.vcsGit.GitDescribeDialog.GitDescribeDialog.closeEvent?4(e) +eric6.Plugins.VcsPlugins.vcsGit.GitDescribeDialog.GitDescribeDialog.keyPressEvent?4(evt) +eric6.Plugins.VcsPlugins.vcsGit.GitDescribeDialog.GitDescribeDialog.on_buttonBox_clicked?4(button) +eric6.Plugins.VcsPlugins.vcsGit.GitDescribeDialog.GitDescribeDialog.on_input_returnPressed?4() +eric6.Plugins.VcsPlugins.vcsGit.GitDescribeDialog.GitDescribeDialog.on_passwordCheckBox_toggled?4(isOn) +eric6.Plugins.VcsPlugins.vcsGit.GitDescribeDialog.GitDescribeDialog.on_sendButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitDescribeDialog.GitDescribeDialog.start?4(path, commits) +eric6.Plugins.VcsPlugins.vcsGit.GitDescribeDialog.GitDescribeDialog?1(vcs, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitDialog.GitDialog.hasAddOrDelete?4() +eric6.Plugins.VcsPlugins.vcsGit.GitDialog.GitDialog.keyPressEvent?4(evt) +eric6.Plugins.VcsPlugins.vcsGit.GitDialog.GitDialog.normalExit?4() +eric6.Plugins.VcsPlugins.vcsGit.GitDialog.GitDialog.normalExitWithoutErrors?4() +eric6.Plugins.VcsPlugins.vcsGit.GitDialog.GitDialog.on_buttonBox_clicked?4(button) +eric6.Plugins.VcsPlugins.vcsGit.GitDialog.GitDialog.on_input_returnPressed?4() +eric6.Plugins.VcsPlugins.vcsGit.GitDialog.GitDialog.on_passwordCheckBox_toggled?4(isOn) +eric6.Plugins.VcsPlugins.vcsGit.GitDialog.GitDialog.on_sendButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitDialog.GitDialog.startProcess?4(args, workingDir=None, showArgs=True, environment=None) +eric6.Plugins.VcsPlugins.vcsGit.GitDialog.GitDialog?1(text, git=None, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitDiffDialog.GitDiffDialog.closeEvent?4(e) +eric6.Plugins.VcsPlugins.vcsGit.GitDiffDialog.GitDiffDialog.on_buttonBox_clicked?4(button) +eric6.Plugins.VcsPlugins.vcsGit.GitDiffDialog.GitDiffDialog.on_filesCombo_activated?4(index) +eric6.Plugins.VcsPlugins.vcsGit.GitDiffDialog.GitDiffDialog.on_refreshButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitDiffDialog.GitDiffDialog.on_saveButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitDiffDialog.GitDiffDialog.start?4(fn, versions=None, diffMode="work2repo", stashName="", refreshable=False) +eric6.Plugins.VcsPlugins.vcsGit.GitDiffDialog.GitDiffDialog?1(vcs, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitDiffGenerator.GitDiffGenerator.finished?7 +eric6.Plugins.VcsPlugins.vcsGit.GitDiffGenerator.GitDiffGenerator.getResult?4() +eric6.Plugins.VcsPlugins.vcsGit.GitDiffGenerator.GitDiffGenerator.start?4(fn, versions=None, diffMode="work2repo", stashName="") +eric6.Plugins.VcsPlugins.vcsGit.GitDiffGenerator.GitDiffGenerator.stopProcesses?4() +eric6.Plugins.VcsPlugins.vcsGit.GitDiffGenerator.GitDiffGenerator?1(vcs, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitDiffHighlighter.E5GenericDiffHighlighter.createRules?4(*rules) +eric6.Plugins.VcsPlugins.vcsGit.GitDiffHighlighter.E5GenericDiffHighlighter.formats?4(line) +eric6.Plugins.VcsPlugins.vcsGit.GitDiffHighlighter.E5GenericDiffHighlighter.generateRules?4() +eric6.Plugins.VcsPlugins.vcsGit.GitDiffHighlighter.E5GenericDiffHighlighter.highlightBlock?4(text) +eric6.Plugins.VcsPlugins.vcsGit.GitDiffHighlighter.E5GenericDiffHighlighter.makeFormat?4(fg=None, bg=None, bold=False) +eric6.Plugins.VcsPlugins.vcsGit.GitDiffHighlighter.E5GenericDiffHighlighter?1(doc) +eric6.Plugins.VcsPlugins.vcsGit.GitDiffHighlighter.GitDiffHighlighter.generateRules?4() +eric6.Plugins.VcsPlugins.vcsGit.GitDiffHighlighter.GitDiffHighlighter?1(doc, whitespace=True) +eric6.Plugins.VcsPlugins.vcsGit.GitDiffHighlighter.TERMINAL?4(pattern) +eric6.Plugins.VcsPlugins.vcsGit.GitDiffParser.GitDiffParser.HunkHeaderRegexp?7 +eric6.Plugins.VcsPlugins.vcsGit.GitDiffParser.GitDiffParser.createHunkPatch?4(lineIndex) +eric6.Plugins.VcsPlugins.vcsGit.GitDiffParser.GitDiffParser.createLinesPatch?4(startIndex, endIndex, reverse=False) +eric6.Plugins.VcsPlugins.vcsGit.GitDiffParser.GitDiffParser.headerLength?4() +eric6.Plugins.VcsPlugins.vcsGit.GitDiffParser.GitDiffParser?1(diff) +eric6.Plugins.VcsPlugins.vcsGit.GitFetchDialog.GitFetchDialog.getData?4() +eric6.Plugins.VcsPlugins.vcsGit.GitFetchDialog.GitFetchDialog.on_remoteBranchesList_itemSelectionChanged?4() +eric6.Plugins.VcsPlugins.vcsGit.GitFetchDialog.GitFetchDialog.on_remoteEdit_textChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitFetchDialog.GitFetchDialog.on_remotesComboBox_currentTextChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitFetchDialog.GitFetchDialog.on_updateButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitFetchDialog.GitFetchDialog?1(vcs, repodir, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitListDialog.GitListDialog.getSelection?4() +eric6.Plugins.VcsPlugins.vcsGit.GitListDialog.GitListDialog?1(selections, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.COLORNAMES?7 +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.COLORS?7 +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.AuthorColumn?7 +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.BranchColumn?7 +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.CommitDateColumn?7 +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.CommitIdColumn?7 +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.CommitterColumn?7 +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.DateColumn?7 +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.IconColumn?7 +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.SubjectColumn?7 +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.TagsColumn?7 +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.closeEvent?4(e) +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.col2x?4(radius) +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.keyPressEvent?4(evt) +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.on_buttonBox_clicked?4(button) +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.on_diffSelectLabel_linkActivated?4(link) +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.on_downButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.on_fieldCombo_activated?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.on_filesTree_currentItemChanged?4(current, previous) +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.on_findNextButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.on_findPrevButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.on_fromDate_dateChanged?4(date) +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.on_input_returnPressed?4() +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.on_logTree_currentItemChanged?4(current, previous) +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.on_logTree_customContextMenuRequested?4(pos) +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.on_logTree_itemSelectionChanged?4() +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.on_modeComboBox_currentIndexChanged?4(index) +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.on_nextButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.on_passwordCheckBox_toggled?4(isOn) +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.on_refreshButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.on_rxEdit_returnPressed?4() +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.on_rxEdit_textChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.on_saveLabel_linkActivated?4(link) +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.on_sbsSelectLabel_linkActivated?4(link) +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.on_sendButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.on_stopCheckBox_clicked?4(checked) +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.on_toDate_dateChanged?4(date) +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.on_upButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.show?4() +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.start?4(fn, isFile=False, noEntries=0) +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog?1(vcs, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.GitMergeDialog.getParameters?4() +eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.GitMergeDialog.on_branchButton_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.GitMergeDialog.on_branchCombo_editTextChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.GitMergeDialog.on_commitGroupBox_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.GitMergeDialog.on_commitMessageEdit_textChanged?4() +eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.GitMergeDialog.on_idButton_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.GitMergeDialog.on_idEdit_textChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.GitMergeDialog.on_noneButton_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.GitMergeDialog.on_remoteBranchButton_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.GitMergeDialog.on_remoteBranchCombo_editTextChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.GitMergeDialog.on_tagButton_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.GitMergeDialog.on_tagCombo_editTextChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.GitMergeDialog?1(tagsList, branchesList, currentBranch, remoteBranchesList, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitNewProjectOptionsDialog.GitNewProjectOptionsDialog.getData?4() +eric6.Plugins.VcsPlugins.vcsGit.GitNewProjectOptionsDialog.GitNewProjectOptionsDialog.on_projectDirButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitNewProjectOptionsDialog.GitNewProjectOptionsDialog.on_vcsProjectDirEdit_textChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitNewProjectOptionsDialog.GitNewProjectOptionsDialog.on_vcsUrlButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitNewProjectOptionsDialog.GitNewProjectOptionsDialog.on_vcsUrlClearHistoryButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitNewProjectOptionsDialog.GitNewProjectOptionsDialog.on_vcsUrlCombo_editTextChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitNewProjectOptionsDialog.GitNewProjectOptionsDialog?1(vcs, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitOptionsDialog.GitOptionsDialog.getData?4() +eric6.Plugins.VcsPlugins.vcsGit.GitOptionsDialog.GitOptionsDialog?1(vcs, project, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitPatchFilesDialog.GitPatchFilesDialog.getData?4() +eric6.Plugins.VcsPlugins.vcsGit.GitPatchFilesDialog.GitPatchFilesDialog.on_addButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitPatchFilesDialog.GitPatchFilesDialog.on_deleteButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitPatchFilesDialog.GitPatchFilesDialog.on_downButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitPatchFilesDialog.GitPatchFilesDialog.on_patchFilesList_itemSelectionChanged?4() +eric6.Plugins.VcsPlugins.vcsGit.GitPatchFilesDialog.GitPatchFilesDialog.on_upButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitPatchFilesDialog.GitPatchFilesDialog?1(rootDir, patchCheckData, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitPatchStatisticsDialog.GitPatchStatisticsDialog.getData?4() +eric6.Plugins.VcsPlugins.vcsGit.GitPatchStatisticsDialog.GitPatchStatisticsDialog.start?4(projectDir, patchCheckData) +eric6.Plugins.VcsPlugins.vcsGit.GitPatchStatisticsDialog.GitPatchStatisticsDialog?1(vcs, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitPullDialog.GitPullDialog.getData?4() +eric6.Plugins.VcsPlugins.vcsGit.GitPullDialog.GitPullDialog.on_remoteEdit_textChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitPullDialog.GitPullDialog.on_remotesComboBox_currentTextChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitPullDialog.GitPullDialog.on_updateButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitPullDialog.GitPullDialog?1(vcs, repodir, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitPushDialog.GitPushDialog.ForceColumn?7 +eric6.Plugins.VcsPlugins.vcsGit.GitPushDialog.GitPushDialog.LocalBranchColumn?7 +eric6.Plugins.VcsPlugins.vcsGit.GitPushDialog.GitPushDialog.PushColumn?7 +eric6.Plugins.VcsPlugins.vcsGit.GitPushDialog.GitPushDialog.RemoteBranchColumn?7 +eric6.Plugins.VcsPlugins.vcsGit.GitPushDialog.GitPushDialog.getData?4() +eric6.Plugins.VcsPlugins.vcsGit.GitPushDialog.GitPushDialog.on_branchesTree_itemChanged?4(item, column) +eric6.Plugins.VcsPlugins.vcsGit.GitPushDialog.GitPushDialog.on_remotesComboBox_currentTextChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitPushDialog.GitPushDialog.on_selectAllCheckBox_stateChanged?4(state) +eric6.Plugins.VcsPlugins.vcsGit.GitPushDialog.GitPushDialog?1(vcs, repodir, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.GitReflogBrowserDialog.CommitIdColumn?7 +eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.GitReflogBrowserDialog.NameColumn?7 +eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.GitReflogBrowserDialog.OperationColumn?7 +eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.GitReflogBrowserDialog.SelectorColumn?7 +eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.GitReflogBrowserDialog.SubjectColumn?7 +eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.GitReflogBrowserDialog.closeEvent?4(e) +eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.GitReflogBrowserDialog.keyPressEvent?4(evt) +eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.GitReflogBrowserDialog.on_buttonBox_clicked?4(button) +eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.GitReflogBrowserDialog.on_input_returnPressed?4() +eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.GitReflogBrowserDialog.on_nextButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.GitReflogBrowserDialog.on_passwordCheckBox_toggled?4(isOn) +eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.GitReflogBrowserDialog.on_refreshButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.GitReflogBrowserDialog.on_sendButton_clicked?4() +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.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_input_returnPressed?4() +eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.GitRemoteRepositoriesDialog.on_passwordCheckBox_toggled?4(isOn) +eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.GitRemoteRepositoriesDialog.on_pruneButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.GitRemoteRepositoriesDialog.on_refreshButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.GitRemoteRepositoriesDialog.on_removeButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.GitRemoteRepositoriesDialog.on_renameButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.GitRemoteRepositoriesDialog.on_repolist_itemSelectionChanged?4() +eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.GitRemoteRepositoriesDialog.on_sendButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.GitRemoteRepositoriesDialog.on_showInfoButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.GitRemoteRepositoriesDialog.start?4(projectDir) +eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.GitRemoteRepositoriesDialog?1(vcs, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitRevisionSelectionDialog.GitRevisionSelectionDialog.getRevision?4() +eric6.Plugins.VcsPlugins.vcsGit.GitRevisionSelectionDialog.GitRevisionSelectionDialog.on_branchButton_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsGit.GitRevisionSelectionDialog.GitRevisionSelectionDialog.on_branchCombo_editTextChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitRevisionSelectionDialog.GitRevisionSelectionDialog.on_remoteBranchButton_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsGit.GitRevisionSelectionDialog.GitRevisionSelectionDialog.on_remoteBranchCombo_editTextChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitRevisionSelectionDialog.GitRevisionSelectionDialog.on_revButton_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsGit.GitRevisionSelectionDialog.GitRevisionSelectionDialog.on_revEdit_textChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitRevisionSelectionDialog.GitRevisionSelectionDialog.on_tagButton_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsGit.GitRevisionSelectionDialog.GitRevisionSelectionDialog.on_tagCombo_editTextChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitRevisionSelectionDialog.GitRevisionSelectionDialog?1(tagsList, branchesList, trackingBranchesList=None, noneLabel="", showBranches=True, showHead=True, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.GitRevisionsSelectionDialog.getRevisions?4() +eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.GitRevisionsSelectionDialog.on_branch1Button_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.GitRevisionsSelectionDialog.on_branch1Combo_editTextChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.GitRevisionsSelectionDialog.on_branch2Button_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.GitRevisionsSelectionDialog.on_branch2Combo_editTextChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.GitRevisionsSelectionDialog.on_rev1Button_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.GitRevisionsSelectionDialog.on_rev1Edit_textChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.GitRevisionsSelectionDialog.on_rev2Button_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.GitRevisionsSelectionDialog.on_rev2Edit_textChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.GitRevisionsSelectionDialog.on_tag1Button_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.GitRevisionsSelectionDialog.on_tag1Combo_editTextChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.GitRevisionsSelectionDialog.on_tag2Button_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.GitRevisionsSelectionDialog.on_tag2Combo_editTextChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.GitRevisionsSelectionDialog?1(tagsList, branchesList, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.GitStashBrowserDialog.DateColumn?7 +eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.GitStashBrowserDialog.FileStatisticsRole?7 +eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.GitStashBrowserDialog.MessageColumn?7 +eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.GitStashBrowserDialog.NameColumn?7 +eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.GitStashBrowserDialog.Separator?7 +eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.GitStashBrowserDialog.TotalStatisticsRole?7 +eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.GitStashBrowserDialog.closeEvent?4(e) +eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.GitStashBrowserDialog.keyPressEvent?4(evt) +eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.GitStashBrowserDialog.on_buttonBox_clicked?4(button) +eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.GitStashBrowserDialog.on_input_returnPressed?4() +eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.GitStashBrowserDialog.on_passwordCheckBox_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.GitStashBrowserDialog.on_refreshButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.GitStashBrowserDialog.on_sendButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.GitStashBrowserDialog.on_stashList_currentItemChanged?4(current, previous) +eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.GitStashBrowserDialog.on_stashList_customContextMenuRequested?4(pos) +eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.GitStashBrowserDialog.show?4() +eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.GitStashBrowserDialog.start?4(projectDir) +eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.GitStashBrowserDialog?1(vcs, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitStashDataDialog.GitStashDataDialog.NoUntracked?7 +eric6.Plugins.VcsPlugins.vcsGit.GitStashDataDialog.GitStashDataDialog.UntrackedAndIgnored?7 +eric6.Plugins.VcsPlugins.vcsGit.GitStashDataDialog.GitStashDataDialog.UntrackedOnly?7 +eric6.Plugins.VcsPlugins.vcsGit.GitStashDataDialog.GitStashDataDialog.getData?4() +eric6.Plugins.VcsPlugins.vcsGit.GitStashDataDialog.GitStashDataDialog?1(parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.GitStatusDialog.ConflictRole?7 +eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.GitStatusDialog.ConflictStates?7 +eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.GitStatusDialog.closeEvent?4(e) +eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.GitStatusDialog.keyPressEvent?4(evt) +eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.GitStatusDialog.on_buttonBox_clicked?4(button) +eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.GitStatusDialog.on_input_returnPressed?4() +eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.GitStatusDialog.on_passwordCheckBox_toggled?4(isOn) +eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.GitStatusDialog.on_refreshButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.GitStatusDialog.on_sendButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.GitStatusDialog.on_statusFilterCombo_activated?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.GitStatusDialog.on_statusList_itemSelectionChanged?4() +eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.GitStatusDialog.show?4() +eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.GitStatusDialog.start?4(fn) +eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.GitStatusDialog?1(vcs, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitStatusMonitorThread.GitStatusMonitorThread.ConflictStates?7 +eric6.Plugins.VcsPlugins.vcsGit.GitStatusMonitorThread.GitStatusMonitorThread._performMonitor?5() +eric6.Plugins.VcsPlugins.vcsGit.GitStatusMonitorThread.GitStatusMonitorThread._shutdown?5() +eric6.Plugins.VcsPlugins.vcsGit.GitStatusMonitorThread.GitStatusMonitorThread?1(interval, project, vcs, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitSubmoduleAddDialog.GitSubmoduleAddDialog.getData?4() +eric6.Plugins.VcsPlugins.vcsGit.GitSubmoduleAddDialog.GitSubmoduleAddDialog.on_submoduleDirButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitSubmoduleAddDialog.GitSubmoduleAddDialog.on_submoduleUrlButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitSubmoduleAddDialog.GitSubmoduleAddDialog.on_submoduleUrlClearHistoryButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitSubmoduleAddDialog.GitSubmoduleAddDialog.on_submoduleUrlCombo_editTextChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.GitSubmoduleAddDialog.GitSubmoduleAddDialog?1(vcs, repodir, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesDeinitDialog.GitSubmodulesDeinitDialog.getData?4() +eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesDeinitDialog.GitSubmodulesDeinitDialog.on_allCheckBox_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesDeinitDialog.GitSubmodulesDeinitDialog.on_submodulesList_itemSelectionChanged?4() +eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesDeinitDialog.GitSubmodulesDeinitDialog?1(submodulePaths, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesListDialog.GitSubmodulesListDialog?1(submodules, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesStatusDialog.GitSubmodulesStatusDialog.on_buttonBox_clicked?4(button) +eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesStatusDialog.GitSubmodulesStatusDialog.on_indexCheckBox_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesStatusDialog.GitSubmodulesStatusDialog.on_recursiveCheckBox_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesStatusDialog.GitSubmodulesStatusDialog.on_refreshButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesStatusDialog.GitSubmodulesStatusDialog.start?4(projectDir) +eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesStatusDialog.GitSubmodulesStatusDialog?1(vcs, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesSummaryOptionsDialog.GitSubmodulesSummaryOptionsDialog.getData?4() +eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesSummaryOptionsDialog.GitSubmodulesSummaryOptionsDialog?1(submodulePaths, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesSyncDialog.GitSubmodulesSyncDialog.getData?4() +eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesSyncDialog.GitSubmodulesSyncDialog?1(submodulePaths, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesUpdateOptionsDialog.GitSubmodulesUpdateOptionsDialog.getData?4() +eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesUpdateOptionsDialog.GitSubmodulesUpdateOptionsDialog?1(submodulePaths, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitTagBranchListDialog.GitTagBranchListDialog.closeEvent?4(e) +eric6.Plugins.VcsPlugins.vcsGit.GitTagBranchListDialog.GitTagBranchListDialog.keyPressEvent?4(evt) +eric6.Plugins.VcsPlugins.vcsGit.GitTagBranchListDialog.GitTagBranchListDialog.on_buttonBox_clicked?4(button) +eric6.Plugins.VcsPlugins.vcsGit.GitTagBranchListDialog.GitTagBranchListDialog.on_input_returnPressed?4() +eric6.Plugins.VcsPlugins.vcsGit.GitTagBranchListDialog.GitTagBranchListDialog.on_passwordCheckBox_toggled?4(isOn) +eric6.Plugins.VcsPlugins.vcsGit.GitTagBranchListDialog.GitTagBranchListDialog.on_sendButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsGit.GitTagBranchListDialog.GitTagBranchListDialog.start?4(path, tags, listAll=True, merged=True) +eric6.Plugins.VcsPlugins.vcsGit.GitTagBranchListDialog.GitTagBranchListDialog?1(vcs, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitTagDialog.GitTagDialog.AnnotatedTag?7 +eric6.Plugins.VcsPlugins.vcsGit.GitTagDialog.GitTagDialog.CreateTag?7 +eric6.Plugins.VcsPlugins.vcsGit.GitTagDialog.GitTagDialog.DeleteTag?7 +eric6.Plugins.VcsPlugins.vcsGit.GitTagDialog.GitTagDialog.LocalTag?7 +eric6.Plugins.VcsPlugins.vcsGit.GitTagDialog.GitTagDialog.SignedTag?7 +eric6.Plugins.VcsPlugins.vcsGit.GitTagDialog.GitTagDialog.VerifyTag?7 +eric6.Plugins.VcsPlugins.vcsGit.GitTagDialog.GitTagDialog.getParameters?4() +eric6.Plugins.VcsPlugins.vcsGit.GitTagDialog.GitTagDialog.on_tagCombo_editTextChanged?4(text) +eric6.Plugins.VcsPlugins.vcsGit.GitTagDialog.GitTagDialog?1(taglist, revision=None, tagName=None, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitUserConfigDataDialog.GitUserConfigDataDialog.getData?4() +eric6.Plugins.VcsPlugins.vcsGit.GitUserConfigDataDialog.GitUserConfigDataDialog?1(version=(0, 0), parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitUtilities.getConfigPath?4() +eric6.Plugins.VcsPlugins.vcsGit.GitUtilities.prepareProcess?4(proc, language="") +eric6.Plugins.VcsPlugins.vcsGit.GitUtilities.strToQByteArray?4(txt) +eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.GitProjectBrowserHelper._addVCSMenu?5(mainMenu) +eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.GitProjectBrowserHelper._addVCSMenuBack?5(mainMenu) +eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.GitProjectBrowserHelper._addVCSMenuDir?5(mainMenu) +eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.GitProjectBrowserHelper._addVCSMenuDirMulti?5(mainMenu) +eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.GitProjectBrowserHelper._addVCSMenuMulti?5(mainMenu) +eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.GitProjectBrowserHelper.showContextMenu?4(menu, standardItems) +eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.GitProjectBrowserHelper.showContextMenuDir?4(menu, standardItems) +eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.GitProjectBrowserHelper.showContextMenuDirMulti?4(menu, standardItems) +eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.GitProjectBrowserHelper.showContextMenuMulti?4(menu, standardItems) +eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.GitProjectBrowserHelper?1(vcsObject, browserObject, projectObject, isTranslationsBrowser, parent=None, name=None) +eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.GitProjectHelper.getActions?4() +eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.GitProjectHelper.getProject?4() +eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.GitProjectHelper.initActions?4() +eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.GitProjectHelper.initMenu?4(menu) +eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.GitProjectHelper.initToolbar?4(ui, toolbarManager) +eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.GitProjectHelper.removeToolbar?4(ui, toolbarManager) +eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.GitProjectHelper.setObjects?4(vcsObject, projectObject) +eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.GitProjectHelper.shutdown?4() +eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.GitProjectHelper?1(vcsObject, projectObject, parent=None, name=None) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.IgnoreFileName?7 +eric6.Plugins.VcsPlugins.vcsGit.git.Git._createStatusMonitorThread?5(interval, project) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.clearStatusCache?4() +eric6.Plugins.VcsPlugins.vcsGit.git.Git.committed?7 +eric6.Plugins.VcsPlugins.vcsGit.git.Git.getPlugin?4() +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitAddRemote?4(projectDir) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitApply?4(repodir, patchFile, cached=False, reverse=False, noDialog=False) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitApplyCheckPatches?4(projectDir, check=False) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitBisect?4(projectDir, subcommand) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitBisectCreateReplayFile?4(projectDir) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitBisectEditReplayFile?4(projectDir) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitBisectLogBrowser?4(projectDir) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitBisectReplay?4(projectDir) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitBlame?4(name) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitBranch?4(name, revision=None, branchName=None, branchOp=None) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitBundle?4(projectDir) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitBundleFetch?4(projectDir) +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.gitCherryPick?4(projectDir, commits=None) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitCherryPickAbort?4(projectDir) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitCherryPickContinue?4(projectDir) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitCherryPickQuit?4(projectDir) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitCommitMerge?4(name) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitCopy?4(name, project) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitCreateArchive?4(projectDir) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitCreateIgnoreFile?4(name, autoAdd=False) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitDeleteRemoteBranch?4(name) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitDescribe?4(projectDir, commits) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitEditConfig?4(projectDir) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitEditUserConfig?4() +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitExtendedDiff?4(name) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitFetch?4(name) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitGetArchiveFormats?4(repodir) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitGetBranchesList?4(repodir, withMaster=False, allBranches=False, remotes=False) +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.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) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitHouseKeeping?4(projectDir) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitListTagBranch?4(path, tags=True, listAll=True, merged=True) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitNormalizeURL?4(url) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitPruneRemote?4(projectDir, remoteName) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitPull?4(name) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitPush?4(name) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitReflogBrowser?4(projectDir) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitRemoveRemote?4(projectDir, remoteName) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitRenameRemote?4(projectDir, remoteName) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitRevert?4(name) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitSbsDiff?4(name, extended=False, revisions=None) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitShortlog?4(projectDir, commit) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitShowBranch?4(name) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitShowConfig?4(projectDir) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitShowPatchesStatistics?4(projectDir) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitShowRemote?4(projectDir, remoteName) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitShowRemotes?4(projectDir) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitStashApply?4(projectDir, stashName="") +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitStashBranch?4(projectDir, stashName="") +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitStashBrowser?4(projectDir) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitStashClear?4(projectDir) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitStashDrop?4(projectDir, stashName="") +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitStashPop?4(projectDir, stashName="") +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitStashSave?4(projectDir) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitStashShowPatch?4(projectDir, stashName="") +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitStatistics?4(projectDir) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitSubmoduleAdd?4(projectDir) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitSubmoduleDeinit?4(projectDir) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitSubmoduleInit?4(projectDir) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitSubmoduleList?4(projectDir) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitSubmoduleStatus?4(projectDir) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitSubmoduleSummary?4(projectDir) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitSubmoduleSync?4(projectDir) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitSubmoduleUpdate?4(projectDir, initialize=False, remote=False) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitSubmoduleUpdateWithOptions?4(projectDir) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitUnstage?4(name) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitVerify?4(projectDir) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitVerifyBundle?4(projectDir) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.initCommand?4(command) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsAdd?4(name, isDir=False, noDialog=False) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsAddBinary?4(name, isDir=False) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsAddTree?4(path) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsAllRegisteredStates?4(names, dname, shortcut=True) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsCheckout?4(vcsDataDict, projectDir, noDialog=False) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsCleanup?4(name) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsCommandLine?4(name) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsCommit?4(name, message="", noDialog=False, commitAll=True, amend=False) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsConvertProject?4(vcsDataDict, project) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsDiff?4(name) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsExists?4() +eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsExport?4(vcsDataDict, projectDir) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsGetProjectBrowserHelper?4(browser, project, isTranslationsBrowser=False) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsGetProjectHelper?4(project) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsImport?4(vcsDataDict, projectDir, noDialog=False) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsInit?4(vcsDir, noDialog=False) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsInitConfig?4(project) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsLogBrowser?4(name, isFile=False) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsMerge?4(name) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsMove?4(name, project, target=None, noDialog=False) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsName?4() +eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsNewProjectOptionsDialog?4(parent=None) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsOptionsDialog?4(project, archive, editable=False, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsRegisteredState?4(name) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsRemove?4(name, project=False, noDialog=False, stageOnly=False) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsRepositoryInfos?4(ppath) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsShutdown?4() +eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsStatus?4(name) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsSupportCommandOptions?4() +eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsSwitch?4(name) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsTag?4(name, revision=None, tagName=None) +eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsUpdate?4(name, noDialog=False, revision=None) +eric6.Plugins.VcsPlugins.vcsGit.git.Git?1(plugin, parent=None, name=None) eric6.Plugins.VcsPlugins.vcsMercurial.Config.ConfigHgSchemes?7 eric6.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.MercurialPage.on_configButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.MercurialPage.save?4()
--- a/APIs/Python3/eric6.bas Sun Dec 10 16:43:11 2017 +0100 +++ b/APIs/Python3/eric6.bas Sun Dec 10 17:42:11 2017 +0100 @@ -303,6 +303,56 @@ FtpReply QNetworkReply FtpSyncHandler SyncHandler Function ClbrBaseClasses.Function VisibilityMixin +Git VersionControl +GitAddRemoteDialog QDialog Ui_GitAddRemoteDialog +GitApplyBundleDataDialog QDialog Ui_GitApplyBundleDataDialog +GitArchiveDataDialog QDialog Ui_GitArchiveDataDialog +GitBisectLogBrowserDialog QWidget Ui_GitBisectLogBrowserDialog +GitBisectStartDialog QDialog Ui_GitBisectStartDialog +GitBlameDialog QDialog Ui_GitBlameDialog +GitBranchDialog QDialog Ui_GitBranchDialog +GitBranchPushDialog QDialog Ui_GitBranchPushDialog +GitBundleDialog QDialog Ui_GitBundleDialog +GitCherryPickDialog QDialog Ui_GitCherryPickDialog +GitCommandDialog QDialog Ui_GitCommandDialog +GitCommitDialog QWidget Ui_GitCommitDialog +GitCopyDialog QDialog Ui_GitCopyDialog +GitDescribeDialog QDialog Ui_GitDescribeDialog +GitDialog QDialog Ui_GitDialog +GitDiffDialog QWidget Ui_GitDiffDialog +GitDiffGenerator QObject +GitDiffHighlighter E5GenericDiffHighlighter +GitFetchDialog QDialog Ui_GitFetchDialog +GitListDialog QDialog Ui_GitListDialog +GitLogBrowserDialog QWidget Ui_GitLogBrowserDialog +GitMergeDialog QDialog Ui_GitMergeDialog +GitNewProjectOptionsDialog QDialog Ui_GitNewProjectOptionsDialog +GitOptionsDialog QDialog Ui_GitOptionsDialog +GitPage ConfigurationPageBase Ui_GitPage +GitPatchFilesDialog QDialog Ui_GitPatchFilesDialog +GitPatchStatisticsDialog QDialog Ui_GitPatchStatisticsDialog +GitProjectBrowserHelper VcsProjectBrowserHelper +GitProjectHelper VcsProjectHelper +GitPullDialog QDialog Ui_GitPullDialog +GitPushDialog QDialog Ui_GitPushDialog +GitReflogBrowserDialog QWidget Ui_GitReflogBrowserDialog +GitRemoteRepositoriesDialog QWidget Ui_GitRemoteRepositoriesDialog +GitRevisionSelectionDialog QDialog Ui_GitRevisionSelectionDialog +GitRevisionsSelectionDialog QDialog Ui_GitRevisionsSelectionDialog +GitStashBrowserDialog QWidget Ui_GitStashBrowserDialog +GitStashDataDialog QDialog Ui_GitStashDataDialog +GitStatusDialog QWidget Ui_GitStatusDialog +GitStatusMonitorThread VcsStatusMonitorThread +GitSubmoduleAddDialog QDialog Ui_GitSubmoduleAddDialog +GitSubmodulesDeinitDialog QDialog Ui_GitSubmodulesDeinitDialog +GitSubmodulesListDialog QDialog Ui_GitSubmodulesListDialog +GitSubmodulesStatusDialog QDialog Ui_GitSubmodulesStatusDialog +GitSubmodulesSummaryOptionsDialog QDialog Ui_GitSubmodulesSummaryOptionsDialog +GitSubmodulesSyncDialog QDialog Ui_GitSubmodulesSyncDialog +GitSubmodulesUpdateOptionsDialog QDialog Ui_GitSubmodulesUpdateOptionsDialog +GitTagBranchListDialog QDialog Ui_GitTagBranchListDialog +GitTagDialog QDialog Ui_GitTagDialog +GitUserConfigDataDialog QDialog Ui_GitUserConfigDataDialog GlosbeEngine TranslationEngine GoogleV1Engine TranslationEngine GoogleV2Engine TranslationEngine @@ -897,6 +947,7 @@ VariablesFilterDialog QDialog Ui_VariablesFilterDialog VariablesViewer QTreeWidget VcsCommandOptionsDialog QDialog Ui_VcsCommandOptionsDialog +VcsGitPlugin QObject VcsMercurialPlugin QObject VcsPage ConfigurationPageBase Ui_VcsPage VcsProjectBrowserHelper QObject
--- a/Documentation/Help/source.qhp Sun Dec 10 16:43:11 2017 +0100 +++ b/Documentation/Help/source.qhp Sun Dec 10 17:42:11 2017 +0100 @@ -554,6 +554,63 @@ </section> </section> <section title="eric6.Plugins.VcsPlugins" ref="index-eric6.Plugins.VcsPlugins.html"> + <section title="eric6.Plugins.VcsPlugins.vcsGit" ref="index-eric6.Plugins.VcsPlugins.vcsGit.html"> + <section title="eric6.Plugins.VcsPlugins.vcsGit.ConfigurationPage" ref="index-eric6.Plugins.VcsPlugins.vcsGit.ConfigurationPage.html"> + <section title="eric6.Plugins.VcsPlugins.vcsGit.ConfigurationPage.GitPage" ref="eric6.Plugins.VcsPlugins.vcsGit.ConfigurationPage.GitPage.html" /> + </section> + <section title="eric6.Plugins.VcsPlugins.vcsGit.Config" ref="eric6.Plugins.VcsPlugins.vcsGit.Config.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitAddRemoteDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitAddRemoteDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitApplyBundleDataDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitApplyBundleDataDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitArchiveDataDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitArchiveDataDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitBisectStartDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBisectStartDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitBlameDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBlameDialog.html" /> + <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.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" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitCopyDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitCopyDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitDescribeDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDescribeDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitDiffDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitDiffGenerator" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffGenerator.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitDiffHighlighter" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffHighlighter.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitDiffParser" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffParser.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitFetchDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitFetchDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitListDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitListDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitNewProjectOptionsDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitNewProjectOptionsDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitOptionsDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitOptionsDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitPatchFilesDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPatchFilesDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitPatchStatisticsDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPatchStatisticsDialog.html" /> + <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.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" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitStashDataDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashDataDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitStatusMonitorThread" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusMonitorThread.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitSubmoduleAddDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmoduleAddDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesDeinitDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesDeinitDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesListDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesListDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesStatusDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesStatusDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesSummaryOptionsDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesSummaryOptionsDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesSyncDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesSyncDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesUpdateOptionsDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesUpdateOptionsDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitTagBranchListDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitTagBranchListDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitTagDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitTagDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitUserConfigDataDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitUserConfigDataDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.GitUtilities" ref="eric6.Plugins.VcsPlugins.vcsGit.GitUtilities.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsGit.git" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html" /> + </section> <section title="eric6.Plugins.VcsPlugins.vcsMercurial" ref="index-eric6.Plugins.VcsPlugins.vcsMercurial.html"> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage" ref="index-eric6.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.html"> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html" /> @@ -808,6 +865,7 @@ <section title="eric6.Plugins.PluginSyntaxChecker" ref="eric6.Plugins.PluginSyntaxChecker.html" /> <section title="eric6.Plugins.PluginTabnanny" ref="eric6.Plugins.PluginTabnanny.html" /> <section title="eric6.Plugins.PluginTranslator" ref="eric6.Plugins.PluginTranslator.html" /> + <section title="eric6.Plugins.PluginVcsGit" ref="eric6.Plugins.PluginVcsGit.html" /> <section title="eric6.Plugins.PluginVcsMercurial" ref="eric6.Plugins.PluginVcsMercurial.html" /> <section title="eric6.Plugins.PluginVcsPySvn" ref="eric6.Plugins.PluginVcsPySvn.html" /> <section title="eric6.Plugins.PluginVcsSubversion" ref="eric6.Plugins.PluginVcsSubversion.html" /> @@ -3124,6 +3182,7 @@ <keyword name="Config (Module)" id="Config (Module)" ref="eric6.Debugger.Config.html" /> <keyword name="Config (Module)" id="Config (Module)" ref="eric6.DocumentationTools.Config.html" /> <keyword name="Config (Module)" id="Config (Module)" ref="eric6.E5XML.Config.html" /> + <keyword name="Config (Module)" id="Config (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.Config.html" /> <keyword name="Config (Module)" id="Config (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.Config.html" /> <keyword name="Config (Module)" id="Config (Module)" ref="eric6.Plugins.VcsPlugins.vcsPySvn.Config.html" /> <keyword name="Config (Module)" id="Config (Module)" ref="eric6.Plugins.VcsPlugins.vcsSubversion.Config.html" /> @@ -3140,6 +3199,7 @@ <keyword name="ConfigurationDialog.showConfigurationPageByName" id="ConfigurationDialog.showConfigurationPageByName" ref="eric6.Preferences.ConfigurationDialog.html#ConfigurationDialog.showConfigurationPageByName" /> <keyword name="ConfigurationPage (Package)" id="ConfigurationPage (Package)" ref="index-eric6.Plugins.UiExtensionPlugins.PipInterface.ConfigurationPage.html" /> <keyword name="ConfigurationPage (Package)" id="ConfigurationPage (Package)" ref="index-eric6.Plugins.UiExtensionPlugins.Translator.ConfigurationPage.html" /> + <keyword name="ConfigurationPage (Package)" id="ConfigurationPage (Package)" ref="index-eric6.Plugins.VcsPlugins.vcsGit.ConfigurationPage.html" /> <keyword name="ConfigurationPage (Package)" id="ConfigurationPage (Package)" ref="index-eric6.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.html" /> <keyword name="ConfigurationPage (Package)" id="ConfigurationPage (Package)" ref="index-eric6.Plugins.VcsPlugins.vcsPySvn.ConfigurationPage.html" /> <keyword name="ConfigurationPage (Package)" id="ConfigurationPage (Package)" ref="index-eric6.Plugins.VcsPlugins.vcsSubversion.ConfigurationPage.html" /> @@ -4314,14 +4374,21 @@ <keyword name="E5FtpProxyError" id="E5FtpProxyError" ref="eric6.E5Network.E5Ftp.html#E5FtpProxyError" /> <keyword name="E5FtpProxyType" id="E5FtpProxyType" ref="eric6.E5Network.E5Ftp.html#E5FtpProxyType" /> <keyword name="E5GenericDiffHighlighter" id="E5GenericDiffHighlighter" ref="eric6.E5Gui.E5GenericDiffHighlighter.html#E5GenericDiffHighlighter" /> + <keyword name="E5GenericDiffHighlighter" id="E5GenericDiffHighlighter" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffHighlighter.html#E5GenericDiffHighlighter" /> <keyword name="E5GenericDiffHighlighter (Constructor)" id="E5GenericDiffHighlighter (Constructor)" ref="eric6.E5Gui.E5GenericDiffHighlighter.html#E5GenericDiffHighlighter.__init__" /> + <keyword name="E5GenericDiffHighlighter (Constructor)" id="E5GenericDiffHighlighter (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffHighlighter.html#E5GenericDiffHighlighter.__init__" /> <keyword name="E5GenericDiffHighlighter (Module)" id="E5GenericDiffHighlighter (Module)" ref="eric6.E5Gui.E5GenericDiffHighlighter.html" /> <keyword name="E5GenericDiffHighlighter.__initColours" id="E5GenericDiffHighlighter.__initColours" ref="eric6.E5Gui.E5GenericDiffHighlighter.html#E5GenericDiffHighlighter.__initColours" /> <keyword name="E5GenericDiffHighlighter.createRules" id="E5GenericDiffHighlighter.createRules" ref="eric6.E5Gui.E5GenericDiffHighlighter.html#E5GenericDiffHighlighter.createRules" /> + <keyword name="E5GenericDiffHighlighter.createRules" id="E5GenericDiffHighlighter.createRules" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffHighlighter.html#E5GenericDiffHighlighter.createRules" /> <keyword name="E5GenericDiffHighlighter.formats" id="E5GenericDiffHighlighter.formats" ref="eric6.E5Gui.E5GenericDiffHighlighter.html#E5GenericDiffHighlighter.formats" /> + <keyword name="E5GenericDiffHighlighter.formats" id="E5GenericDiffHighlighter.formats" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffHighlighter.html#E5GenericDiffHighlighter.formats" /> <keyword name="E5GenericDiffHighlighter.generateRules" id="E5GenericDiffHighlighter.generateRules" ref="eric6.E5Gui.E5GenericDiffHighlighter.html#E5GenericDiffHighlighter.generateRules" /> + <keyword name="E5GenericDiffHighlighter.generateRules" id="E5GenericDiffHighlighter.generateRules" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffHighlighter.html#E5GenericDiffHighlighter.generateRules" /> <keyword name="E5GenericDiffHighlighter.highlightBlock" id="E5GenericDiffHighlighter.highlightBlock" ref="eric6.E5Gui.E5GenericDiffHighlighter.html#E5GenericDiffHighlighter.highlightBlock" /> + <keyword name="E5GenericDiffHighlighter.highlightBlock" id="E5GenericDiffHighlighter.highlightBlock" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffHighlighter.html#E5GenericDiffHighlighter.highlightBlock" /> <keyword name="E5GenericDiffHighlighter.makeFormat" id="E5GenericDiffHighlighter.makeFormat" ref="eric6.E5Gui.E5GenericDiffHighlighter.html#E5GenericDiffHighlighter.makeFormat" /> + <keyword name="E5GenericDiffHighlighter.makeFormat" id="E5GenericDiffHighlighter.makeFormat" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffHighlighter.html#E5GenericDiffHighlighter.makeFormat" /> <keyword name="E5GenericDiffHighlighter.regenerateRules" id="E5GenericDiffHighlighter.regenerateRules" ref="eric6.E5Gui.E5GenericDiffHighlighter.html#E5GenericDiffHighlighter.regenerateRules" /> <keyword name="E5GoogleMail (Module)" id="E5GoogleMail (Module)" ref="eric6.E5Network.E5GoogleMail.html" /> <keyword name="E5Graphics (Package)" id="E5Graphics (Package)" ref="index-eric6.E5Graphics.html" /> @@ -6314,6 +6381,839 @@ <keyword name="Function (Constructor)" id="Function (Constructor)" ref="eric6.Utilities.ModuleParser.html#Function.__init__" /> <keyword name="Function.addDescription" id="Function.addDescription" ref="eric6.Utilities.ModuleParser.html#Function.addDescription" /> <keyword name="Function.setEndLine" id="Function.setEndLine" ref="eric6.Utilities.ModuleParser.html#Function.setEndLine" /> + <keyword name="Git" id="Git" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git" /> + <keyword name="Git (Constructor)" id="Git (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.__init__" /> + <keyword name="Git.__gitGetFileForRevision" id="Git.__gitGetFileForRevision" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.__gitGetFileForRevision" /> + <keyword name="Git.__gitGetStashesList" id="Git.__gitGetStashesList" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.__gitGetStashesList" /> + <keyword name="Git.__gitSubmodulesList" id="Git.__gitSubmodulesList" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.__gitSubmodulesList" /> + <keyword name="Git.__selectSubmodulePath" id="Git.__selectSubmodulePath" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.__selectSubmodulePath" /> + <keyword name="Git.__selectSubmodulePaths" id="Git.__selectSubmodulePaths" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.__selectSubmodulePaths" /> + <keyword name="Git.__vcsCommit_Step2" id="Git.__vcsCommit_Step2" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.__vcsCommit_Step2" /> + <keyword name="Git._createStatusMonitorThread" id="Git._createStatusMonitorThread" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git._createStatusMonitorThread" /> + <keyword name="Git.clearStatusCache" id="Git.clearStatusCache" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.clearStatusCache" /> + <keyword name="Git.getPlugin" id="Git.getPlugin" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.getPlugin" /> + <keyword name="Git.gitAddRemote" id="Git.gitAddRemote" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitAddRemote" /> + <keyword name="Git.gitApply" id="Git.gitApply" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitApply" /> + <keyword name="Git.gitApplyCheckPatches" id="Git.gitApplyCheckPatches" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitApplyCheckPatches" /> + <keyword name="Git.gitBisect" id="Git.gitBisect" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitBisect" /> + <keyword name="Git.gitBisectCreateReplayFile" id="Git.gitBisectCreateReplayFile" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitBisectCreateReplayFile" /> + <keyword name="Git.gitBisectEditReplayFile" id="Git.gitBisectEditReplayFile" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitBisectEditReplayFile" /> + <keyword name="Git.gitBisectLogBrowser" id="Git.gitBisectLogBrowser" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitBisectLogBrowser" /> + <keyword name="Git.gitBisectReplay" id="Git.gitBisectReplay" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitBisectReplay" /> + <keyword name="Git.gitBlame" id="Git.gitBlame" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitBlame" /> + <keyword name="Git.gitBranch" id="Git.gitBranch" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitBranch" /> + <keyword name="Git.gitBundle" id="Git.gitBundle" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitBundle" /> + <keyword name="Git.gitBundleFetch" id="Git.gitBundleFetch" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitBundleFetch" /> + <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.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" /> + <keyword name="Git.gitCherryPickQuit" id="Git.gitCherryPickQuit" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitCherryPickQuit" /> + <keyword name="Git.gitCommitMerge" id="Git.gitCommitMerge" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitCommitMerge" /> + <keyword name="Git.gitCopy" id="Git.gitCopy" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitCopy" /> + <keyword name="Git.gitCreateArchive" id="Git.gitCreateArchive" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitCreateArchive" /> + <keyword name="Git.gitCreateIgnoreFile" id="Git.gitCreateIgnoreFile" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitCreateIgnoreFile" /> + <keyword name="Git.gitDeleteRemoteBranch" id="Git.gitDeleteRemoteBranch" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitDeleteRemoteBranch" /> + <keyword name="Git.gitDescribe" id="Git.gitDescribe" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitDescribe" /> + <keyword name="Git.gitEditConfig" id="Git.gitEditConfig" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitEditConfig" /> + <keyword name="Git.gitEditUserConfig" id="Git.gitEditUserConfig" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitEditUserConfig" /> + <keyword name="Git.gitExtendedDiff" id="Git.gitExtendedDiff" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitExtendedDiff" /> + <keyword name="Git.gitFetch" id="Git.gitFetch" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitFetch" /> + <keyword name="Git.gitGetArchiveFormats" id="Git.gitGetArchiveFormats" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitGetArchiveFormats" /> + <keyword name="Git.gitGetBranchesList" id="Git.gitGetBranchesList" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitGetBranchesList" /> + <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.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" /> + <keyword name="Git.gitHouseKeeping" id="Git.gitHouseKeeping" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitHouseKeeping" /> + <keyword name="Git.gitListTagBranch" id="Git.gitListTagBranch" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitListTagBranch" /> + <keyword name="Git.gitNormalizeURL" id="Git.gitNormalizeURL" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitNormalizeURL" /> + <keyword name="Git.gitPruneRemote" id="Git.gitPruneRemote" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitPruneRemote" /> + <keyword name="Git.gitPull" id="Git.gitPull" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitPull" /> + <keyword name="Git.gitPush" id="Git.gitPush" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitPush" /> + <keyword name="Git.gitReflogBrowser" id="Git.gitReflogBrowser" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitReflogBrowser" /> + <keyword name="Git.gitRemoveRemote" id="Git.gitRemoveRemote" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitRemoveRemote" /> + <keyword name="Git.gitRenameRemote" id="Git.gitRenameRemote" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitRenameRemote" /> + <keyword name="Git.gitRevert" id="Git.gitRevert" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitRevert" /> + <keyword name="Git.gitSbsDiff" id="Git.gitSbsDiff" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitSbsDiff" /> + <keyword name="Git.gitShortlog" id="Git.gitShortlog" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitShortlog" /> + <keyword name="Git.gitShowBranch" id="Git.gitShowBranch" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitShowBranch" /> + <keyword name="Git.gitShowConfig" id="Git.gitShowConfig" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitShowConfig" /> + <keyword name="Git.gitShowPatchesStatistics" id="Git.gitShowPatchesStatistics" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitShowPatchesStatistics" /> + <keyword name="Git.gitShowRemote" id="Git.gitShowRemote" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitShowRemote" /> + <keyword name="Git.gitShowRemotes" id="Git.gitShowRemotes" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitShowRemotes" /> + <keyword name="Git.gitStashApply" id="Git.gitStashApply" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitStashApply" /> + <keyword name="Git.gitStashBranch" id="Git.gitStashBranch" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitStashBranch" /> + <keyword name="Git.gitStashBrowser" id="Git.gitStashBrowser" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitStashBrowser" /> + <keyword name="Git.gitStashClear" id="Git.gitStashClear" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitStashClear" /> + <keyword name="Git.gitStashDrop" id="Git.gitStashDrop" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitStashDrop" /> + <keyword name="Git.gitStashPop" id="Git.gitStashPop" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitStashPop" /> + <keyword name="Git.gitStashSave" id="Git.gitStashSave" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitStashSave" /> + <keyword name="Git.gitStashShowPatch" id="Git.gitStashShowPatch" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitStashShowPatch" /> + <keyword name="Git.gitStatistics" id="Git.gitStatistics" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitStatistics" /> + <keyword name="Git.gitSubmoduleAdd" id="Git.gitSubmoduleAdd" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitSubmoduleAdd" /> + <keyword name="Git.gitSubmoduleDeinit" id="Git.gitSubmoduleDeinit" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitSubmoduleDeinit" /> + <keyword name="Git.gitSubmoduleInit" id="Git.gitSubmoduleInit" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitSubmoduleInit" /> + <keyword name="Git.gitSubmoduleList" id="Git.gitSubmoduleList" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitSubmoduleList" /> + <keyword name="Git.gitSubmoduleStatus" id="Git.gitSubmoduleStatus" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitSubmoduleStatus" /> + <keyword name="Git.gitSubmoduleSummary" id="Git.gitSubmoduleSummary" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitSubmoduleSummary" /> + <keyword name="Git.gitSubmoduleSync" id="Git.gitSubmoduleSync" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitSubmoduleSync" /> + <keyword name="Git.gitSubmoduleUpdate" id="Git.gitSubmoduleUpdate" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitSubmoduleUpdate" /> + <keyword name="Git.gitSubmoduleUpdateWithOptions" id="Git.gitSubmoduleUpdateWithOptions" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitSubmoduleUpdateWithOptions" /> + <keyword name="Git.gitUnstage" id="Git.gitUnstage" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitUnstage" /> + <keyword name="Git.gitVerify" id="Git.gitVerify" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitVerify" /> + <keyword name="Git.gitVerifyBundle" id="Git.gitVerifyBundle" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.gitVerifyBundle" /> + <keyword name="Git.initCommand" id="Git.initCommand" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.initCommand" /> + <keyword name="Git.vcsAdd" id="Git.vcsAdd" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.vcsAdd" /> + <keyword name="Git.vcsAddBinary" id="Git.vcsAddBinary" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.vcsAddBinary" /> + <keyword name="Git.vcsAddTree" id="Git.vcsAddTree" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.vcsAddTree" /> + <keyword name="Git.vcsAllRegisteredStates" id="Git.vcsAllRegisteredStates" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.vcsAllRegisteredStates" /> + <keyword name="Git.vcsCheckout" id="Git.vcsCheckout" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.vcsCheckout" /> + <keyword name="Git.vcsCleanup" id="Git.vcsCleanup" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.vcsCleanup" /> + <keyword name="Git.vcsCommandLine" id="Git.vcsCommandLine" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.vcsCommandLine" /> + <keyword name="Git.vcsCommit" id="Git.vcsCommit" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.vcsCommit" /> + <keyword name="Git.vcsConvertProject" id="Git.vcsConvertProject" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.vcsConvertProject" /> + <keyword name="Git.vcsDiff" id="Git.vcsDiff" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.vcsDiff" /> + <keyword name="Git.vcsExists" id="Git.vcsExists" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.vcsExists" /> + <keyword name="Git.vcsExport" id="Git.vcsExport" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.vcsExport" /> + <keyword name="Git.vcsGetProjectBrowserHelper" id="Git.vcsGetProjectBrowserHelper" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.vcsGetProjectBrowserHelper" /> + <keyword name="Git.vcsGetProjectHelper" id="Git.vcsGetProjectHelper" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.vcsGetProjectHelper" /> + <keyword name="Git.vcsImport" id="Git.vcsImport" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.vcsImport" /> + <keyword name="Git.vcsInit" id="Git.vcsInit" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.vcsInit" /> + <keyword name="Git.vcsInitConfig" id="Git.vcsInitConfig" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.vcsInitConfig" /> + <keyword name="Git.vcsLogBrowser" id="Git.vcsLogBrowser" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.vcsLogBrowser" /> + <keyword name="Git.vcsMerge" id="Git.vcsMerge" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.vcsMerge" /> + <keyword name="Git.vcsMove" id="Git.vcsMove" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.vcsMove" /> + <keyword name="Git.vcsName" id="Git.vcsName" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.vcsName" /> + <keyword name="Git.vcsNewProjectOptionsDialog" id="Git.vcsNewProjectOptionsDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.vcsNewProjectOptionsDialog" /> + <keyword name="Git.vcsOptionsDialog" id="Git.vcsOptionsDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.vcsOptionsDialog" /> + <keyword name="Git.vcsRegisteredState" id="Git.vcsRegisteredState" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.vcsRegisteredState" /> + <keyword name="Git.vcsRemove" id="Git.vcsRemove" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.vcsRemove" /> + <keyword name="Git.vcsRepositoryInfos" id="Git.vcsRepositoryInfos" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.vcsRepositoryInfos" /> + <keyword name="Git.vcsShutdown" id="Git.vcsShutdown" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.vcsShutdown" /> + <keyword name="Git.vcsStatus" id="Git.vcsStatus" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.vcsStatus" /> + <keyword name="Git.vcsSupportCommandOptions" id="Git.vcsSupportCommandOptions" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.vcsSupportCommandOptions" /> + <keyword name="Git.vcsSwitch" id="Git.vcsSwitch" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.vcsSwitch" /> + <keyword name="Git.vcsTag" id="Git.vcsTag" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.vcsTag" /> + <keyword name="Git.vcsUpdate" id="Git.vcsUpdate" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html#Git.vcsUpdate" /> + <keyword name="GitAddRemoteDialog" id="GitAddRemoteDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitAddRemoteDialog.html#GitAddRemoteDialog" /> + <keyword name="GitAddRemoteDialog (Constructor)" id="GitAddRemoteDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitAddRemoteDialog.html#GitAddRemoteDialog.__init__" /> + <keyword name="GitAddRemoteDialog (Module)" id="GitAddRemoteDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitAddRemoteDialog.html" /> + <keyword name="GitAddRemoteDialog.__updateOK" id="GitAddRemoteDialog.__updateOK" ref="eric6.Plugins.VcsPlugins.vcsGit.GitAddRemoteDialog.html#GitAddRemoteDialog.__updateOK" /> + <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="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" /> + <keyword name="GitApplyBundleDataDialog.getData" id="GitApplyBundleDataDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsGit.GitApplyBundleDataDialog.html#GitApplyBundleDataDialog.getData" /> + <keyword name="GitArchiveDataDialog" id="GitArchiveDataDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitArchiveDataDialog.html#GitArchiveDataDialog" /> + <keyword name="GitArchiveDataDialog (Constructor)" id="GitArchiveDataDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitArchiveDataDialog.html#GitArchiveDataDialog.__init__" /> + <keyword name="GitArchiveDataDialog (Module)" id="GitArchiveDataDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitArchiveDataDialog.html" /> + <keyword name="GitArchiveDataDialog.__updateOK" id="GitArchiveDataDialog.__updateOK" ref="eric6.Plugins.VcsPlugins.vcsGit.GitArchiveDataDialog.html#GitArchiveDataDialog.__updateOK" /> + <keyword name="GitArchiveDataDialog.getData" id="GitArchiveDataDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsGit.GitArchiveDataDialog.html#GitArchiveDataDialog.getData" /> + <keyword name="GitArchiveDataDialog.on_branchButton_toggled" id="GitArchiveDataDialog.on_branchButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitArchiveDataDialog.html#GitArchiveDataDialog.on_branchButton_toggled" /> + <keyword name="GitArchiveDataDialog.on_branchCombo_editTextChanged" id="GitArchiveDataDialog.on_branchCombo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitArchiveDataDialog.html#GitArchiveDataDialog.on_branchCombo_editTextChanged" /> + <keyword name="GitArchiveDataDialog.on_fileButton_clicked" id="GitArchiveDataDialog.on_fileButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitArchiveDataDialog.html#GitArchiveDataDialog.on_fileButton_clicked" /> + <keyword name="GitArchiveDataDialog.on_fileEdit_textChanged" id="GitArchiveDataDialog.on_fileEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitArchiveDataDialog.html#GitArchiveDataDialog.on_fileEdit_textChanged" /> + <keyword name="GitArchiveDataDialog.on_revButton_toggled" id="GitArchiveDataDialog.on_revButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitArchiveDataDialog.html#GitArchiveDataDialog.on_revButton_toggled" /> + <keyword name="GitArchiveDataDialog.on_revEdit_textChanged" id="GitArchiveDataDialog.on_revEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitArchiveDataDialog.html#GitArchiveDataDialog.on_revEdit_textChanged" /> + <keyword name="GitArchiveDataDialog.on_tagButton_toggled" id="GitArchiveDataDialog.on_tagButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitArchiveDataDialog.html#GitArchiveDataDialog.on_tagButton_toggled" /> + <keyword name="GitArchiveDataDialog.on_tagCombo_editTextChanged" id="GitArchiveDataDialog.on_tagCombo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitArchiveDataDialog.html#GitArchiveDataDialog.on_tagCombo_editTextChanged" /> + <keyword name="GitBisectLogBrowserDialog" id="GitBisectLogBrowserDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.html#GitBisectLogBrowserDialog" /> + <keyword name="GitBisectLogBrowserDialog (Constructor)" id="GitBisectLogBrowserDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.html#GitBisectLogBrowserDialog.__init__" /> + <keyword name="GitBisectLogBrowserDialog (Module)" id="GitBisectLogBrowserDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.html" /> + <keyword name="GitBisectLogBrowserDialog.__finish" id="GitBisectLogBrowserDialog.__finish" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.html#GitBisectLogBrowserDialog.__finish" /> + <keyword name="GitBisectLogBrowserDialog.__generateLogItem" id="GitBisectLogBrowserDialog.__generateLogItem" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.html#GitBisectLogBrowserDialog.__generateLogItem" /> + <keyword name="GitBisectLogBrowserDialog.__getLogEntries" id="GitBisectLogBrowserDialog.__getLogEntries" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.html#GitBisectLogBrowserDialog.__getLogEntries" /> + <keyword name="GitBisectLogBrowserDialog.__initData" id="GitBisectLogBrowserDialog.__initData" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.html#GitBisectLogBrowserDialog.__initData" /> + <keyword name="GitBisectLogBrowserDialog.__procFinished" id="GitBisectLogBrowserDialog.__procFinished" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.html#GitBisectLogBrowserDialog.__procFinished" /> + <keyword name="GitBisectLogBrowserDialog.__processBuffer" id="GitBisectLogBrowserDialog.__processBuffer" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.html#GitBisectLogBrowserDialog.__processBuffer" /> + <keyword name="GitBisectLogBrowserDialog.__readStderr" id="GitBisectLogBrowserDialog.__readStderr" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.html#GitBisectLogBrowserDialog.__readStderr" /> + <keyword name="GitBisectLogBrowserDialog.__readStdout" id="GitBisectLogBrowserDialog.__readStdout" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.html#GitBisectLogBrowserDialog.__readStdout" /> + <keyword name="GitBisectLogBrowserDialog.__resetUI" id="GitBisectLogBrowserDialog.__resetUI" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.html#GitBisectLogBrowserDialog.__resetUI" /> + <keyword name="GitBisectLogBrowserDialog.__resizeColumnsLog" id="GitBisectLogBrowserDialog.__resizeColumnsLog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.html#GitBisectLogBrowserDialog.__resizeColumnsLog" /> + <keyword name="GitBisectLogBrowserDialog.__showError" id="GitBisectLogBrowserDialog.__showError" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.html#GitBisectLogBrowserDialog.__showError" /> + <keyword name="GitBisectLogBrowserDialog.closeEvent" id="GitBisectLogBrowserDialog.closeEvent" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.html#GitBisectLogBrowserDialog.closeEvent" /> + <keyword name="GitBisectLogBrowserDialog.keyPressEvent" id="GitBisectLogBrowserDialog.keyPressEvent" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.html#GitBisectLogBrowserDialog.keyPressEvent" /> + <keyword name="GitBisectLogBrowserDialog.on_buttonBox_clicked" id="GitBisectLogBrowserDialog.on_buttonBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.html#GitBisectLogBrowserDialog.on_buttonBox_clicked" /> + <keyword name="GitBisectLogBrowserDialog.on_input_returnPressed" id="GitBisectLogBrowserDialog.on_input_returnPressed" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.html#GitBisectLogBrowserDialog.on_input_returnPressed" /> + <keyword name="GitBisectLogBrowserDialog.on_passwordCheckBox_toggled" id="GitBisectLogBrowserDialog.on_passwordCheckBox_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.html#GitBisectLogBrowserDialog.on_passwordCheckBox_toggled" /> + <keyword name="GitBisectLogBrowserDialog.on_refreshButton_clicked" id="GitBisectLogBrowserDialog.on_refreshButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.html#GitBisectLogBrowserDialog.on_refreshButton_clicked" /> + <keyword name="GitBisectLogBrowserDialog.on_sendButton_clicked" id="GitBisectLogBrowserDialog.on_sendButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.html#GitBisectLogBrowserDialog.on_sendButton_clicked" /> + <keyword name="GitBisectLogBrowserDialog.show" id="GitBisectLogBrowserDialog.show" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.html#GitBisectLogBrowserDialog.show" /> + <keyword name="GitBisectLogBrowserDialog.start" id="GitBisectLogBrowserDialog.start" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.html#GitBisectLogBrowserDialog.start" /> + <keyword name="GitBisectStartDialog" id="GitBisectStartDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBisectStartDialog.html#GitBisectStartDialog" /> + <keyword name="GitBisectStartDialog (Constructor)" id="GitBisectStartDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBisectStartDialog.html#GitBisectStartDialog.__init__" /> + <keyword name="GitBisectStartDialog (Module)" id="GitBisectStartDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBisectStartDialog.html" /> + <keyword name="GitBisectStartDialog.__updateOK" id="GitBisectStartDialog.__updateOK" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBisectStartDialog.html#GitBisectStartDialog.__updateOK" /> + <keyword name="GitBisectStartDialog.getData" id="GitBisectStartDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBisectStartDialog.html#GitBisectStartDialog.getData" /> + <keyword name="GitBisectStartDialog.on_badEdit_textChanged" id="GitBisectStartDialog.on_badEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBisectStartDialog.html#GitBisectStartDialog.on_badEdit_textChanged" /> + <keyword name="GitBlameDialog" id="GitBlameDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBlameDialog.html#GitBlameDialog" /> + <keyword name="GitBlameDialog (Constructor)" id="GitBlameDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBlameDialog.html#GitBlameDialog.__init__" /> + <keyword name="GitBlameDialog (Module)" id="GitBlameDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBlameDialog.html" /> + <keyword name="GitBlameDialog.__finish" id="GitBlameDialog.__finish" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBlameDialog.html#GitBlameDialog.__finish" /> + <keyword name="GitBlameDialog.__generateItem" id="GitBlameDialog.__generateItem" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBlameDialog.html#GitBlameDialog.__generateItem" /> + <keyword name="GitBlameDialog.__procFinished" id="GitBlameDialog.__procFinished" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBlameDialog.html#GitBlameDialog.__procFinished" /> + <keyword name="GitBlameDialog.__readStderr" id="GitBlameDialog.__readStderr" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBlameDialog.html#GitBlameDialog.__readStderr" /> + <keyword name="GitBlameDialog.__readStdout" id="GitBlameDialog.__readStdout" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBlameDialog.html#GitBlameDialog.__readStdout" /> + <keyword name="GitBlameDialog.__resizeColumns" id="GitBlameDialog.__resizeColumns" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBlameDialog.html#GitBlameDialog.__resizeColumns" /> + <keyword name="GitBlameDialog.closeEvent" id="GitBlameDialog.closeEvent" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBlameDialog.html#GitBlameDialog.closeEvent" /> + <keyword name="GitBlameDialog.keyPressEvent" id="GitBlameDialog.keyPressEvent" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBlameDialog.html#GitBlameDialog.keyPressEvent" /> + <keyword name="GitBlameDialog.on_buttonBox_clicked" id="GitBlameDialog.on_buttonBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBlameDialog.html#GitBlameDialog.on_buttonBox_clicked" /> + <keyword name="GitBlameDialog.on_input_returnPressed" id="GitBlameDialog.on_input_returnPressed" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBlameDialog.html#GitBlameDialog.on_input_returnPressed" /> + <keyword name="GitBlameDialog.on_passwordCheckBox_toggled" id="GitBlameDialog.on_passwordCheckBox_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBlameDialog.html#GitBlameDialog.on_passwordCheckBox_toggled" /> + <keyword name="GitBlameDialog.on_sendButton_clicked" id="GitBlameDialog.on_sendButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBlameDialog.html#GitBlameDialog.on_sendButton_clicked" /> + <keyword name="GitBlameDialog.start" id="GitBlameDialog.start" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBlameDialog.html#GitBlameDialog.start" /> + <keyword name="GitBranchDialog" id="GitBranchDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBranchDialog.html#GitBranchDialog" /> + <keyword name="GitBranchDialog (Constructor)" id="GitBranchDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBranchDialog.html#GitBranchDialog.__init__" /> + <keyword name="GitBranchDialog (Module)" id="GitBranchDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBranchDialog.html" /> + <keyword name="GitBranchDialog.__updateOK" id="GitBranchDialog.__updateOK" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBranchDialog.html#GitBranchDialog.__updateOK" /> + <keyword name="GitBranchDialog.getParameters" id="GitBranchDialog.getParameters" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBranchDialog.html#GitBranchDialog.getParameters" /> + <keyword name="GitBranchDialog.on_branchCombo_editTextChanged" id="GitBranchDialog.on_branchCombo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBranchDialog.html#GitBranchDialog.on_branchCombo_editTextChanged" /> + <keyword name="GitBranchDialog.on_createTrackingButton_toggled" id="GitBranchDialog.on_createTrackingButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBranchDialog.html#GitBranchDialog.on_createTrackingButton_toggled" /> + <keyword name="GitBranchDialog.on_newBranchNameEdit_textChanged" id="GitBranchDialog.on_newBranchNameEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBranchDialog.html#GitBranchDialog.on_newBranchNameEdit_textChanged" /> + <keyword name="GitBranchDialog.on_setTrackingButton_toggled" id="GitBranchDialog.on_setTrackingButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBranchDialog.html#GitBranchDialog.on_setTrackingButton_toggled" /> + <keyword name="GitBranchDialog.on_unsetTrackingButton_toggled" id="GitBranchDialog.on_unsetTrackingButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBranchDialog.html#GitBranchDialog.on_unsetTrackingButton_toggled" /> + <keyword name="GitBranchPushDialog" id="GitBranchPushDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBranchPushDialog.html#GitBranchPushDialog" /> + <keyword name="GitBranchPushDialog (Constructor)" id="GitBranchPushDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBranchPushDialog.html#GitBranchPushDialog.__init__" /> + <keyword name="GitBranchPushDialog (Module)" id="GitBranchPushDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBranchPushDialog.html" /> + <keyword name="GitBranchPushDialog.getData" id="GitBranchPushDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBranchPushDialog.html#GitBranchPushDialog.getData" /> + <keyword name="GitBranchPushDialog.on_branchComboBox_editTextChanged" id="GitBranchPushDialog.on_branchComboBox_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBranchPushDialog.html#GitBranchPushDialog.on_branchComboBox_editTextChanged" /> + <keyword name="GitBundleDialog" id="GitBundleDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBundleDialog.html#GitBundleDialog" /> + <keyword name="GitBundleDialog (Constructor)" id="GitBundleDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBundleDialog.html#GitBundleDialog.__init__" /> + <keyword name="GitBundleDialog (Module)" id="GitBundleDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBundleDialog.html" /> + <keyword name="GitBundleDialog.__updateOK" id="GitBundleDialog.__updateOK" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBundleDialog.html#GitBundleDialog.__updateOK" /> + <keyword name="GitBundleDialog.getData" id="GitBundleDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBundleDialog.html#GitBundleDialog.getData" /> + <keyword name="GitBundleDialog.on_branchButton_toggled" id="GitBundleDialog.on_branchButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBundleDialog.html#GitBundleDialog.on_branchButton_toggled" /> + <keyword name="GitBundleDialog.on_branchCombo_editTextChanged" id="GitBundleDialog.on_branchCombo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBundleDialog.html#GitBundleDialog.on_branchCombo_editTextChanged" /> + <keyword name="GitBundleDialog.on_revisionsButton_toggled" id="GitBundleDialog.on_revisionsButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitBundleDialog.html#GitBundleDialog.on_revisionsButton_toggled" /> + <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="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" /> + <keyword name="GitCherryPickDialog.getData" id="GitCherryPickDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsGit.GitCherryPickDialog.html#GitCherryPickDialog.getData" /> + <keyword name="GitCherryPickDialog.on_commitsEdit_textChanged" id="GitCherryPickDialog.on_commitsEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitCherryPickDialog.html#GitCherryPickDialog.on_commitsEdit_textChanged" /> + <keyword name="GitCommandDialog" id="GitCommandDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitCommandDialog.html#GitCommandDialog" /> + <keyword name="GitCommandDialog (Constructor)" id="GitCommandDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitCommandDialog.html#GitCommandDialog.__init__" /> + <keyword name="GitCommandDialog (Module)" id="GitCommandDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitCommandDialog.html" /> + <keyword name="GitCommandDialog.getData" id="GitCommandDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsGit.GitCommandDialog.html#GitCommandDialog.getData" /> + <keyword name="GitCommandDialog.on_commandCombo_editTextChanged" id="GitCommandDialog.on_commandCombo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitCommandDialog.html#GitCommandDialog.on_commandCombo_editTextChanged" /> + <keyword name="GitCommitDialog" id="GitCommitDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitCommitDialog.html#GitCommitDialog" /> + <keyword name="GitCommitDialog (Constructor)" id="GitCommitDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitCommitDialog.html#GitCommitDialog.__init__" /> + <keyword name="GitCommitDialog (Module)" id="GitCommitDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitCommitDialog.html" /> + <keyword name="GitCommitDialog.amend" id="GitCommitDialog.amend" ref="eric6.Plugins.VcsPlugins.vcsGit.GitCommitDialog.html#GitCommitDialog.amend" /> + <keyword name="GitCommitDialog.logMessage" id="GitCommitDialog.logMessage" ref="eric6.Plugins.VcsPlugins.vcsGit.GitCommitDialog.html#GitCommitDialog.logMessage" /> + <keyword name="GitCommitDialog.on_buttonBox_accepted" id="GitCommitDialog.on_buttonBox_accepted" ref="eric6.Plugins.VcsPlugins.vcsGit.GitCommitDialog.html#GitCommitDialog.on_buttonBox_accepted" /> + <keyword name="GitCommitDialog.on_buttonBox_clicked" id="GitCommitDialog.on_buttonBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitCommitDialog.html#GitCommitDialog.on_buttonBox_clicked" /> + <keyword name="GitCommitDialog.on_buttonBox_rejected" id="GitCommitDialog.on_buttonBox_rejected" ref="eric6.Plugins.VcsPlugins.vcsGit.GitCommitDialog.html#GitCommitDialog.on_buttonBox_rejected" /> + <keyword name="GitCommitDialog.on_recentComboBox_activated" id="GitCommitDialog.on_recentComboBox_activated" ref="eric6.Plugins.VcsPlugins.vcsGit.GitCommitDialog.html#GitCommitDialog.on_recentComboBox_activated" /> + <keyword name="GitCommitDialog.resetAuthor" id="GitCommitDialog.resetAuthor" ref="eric6.Plugins.VcsPlugins.vcsGit.GitCommitDialog.html#GitCommitDialog.resetAuthor" /> + <keyword name="GitCommitDialog.showEvent" id="GitCommitDialog.showEvent" ref="eric6.Plugins.VcsPlugins.vcsGit.GitCommitDialog.html#GitCommitDialog.showEvent" /> + <keyword name="GitCommitDialog.stagedOnly" id="GitCommitDialog.stagedOnly" ref="eric6.Plugins.VcsPlugins.vcsGit.GitCommitDialog.html#GitCommitDialog.stagedOnly" /> + <keyword name="GitCopyDialog" id="GitCopyDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitCopyDialog.html#GitCopyDialog" /> + <keyword name="GitCopyDialog (Constructor)" id="GitCopyDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitCopyDialog.html#GitCopyDialog.__init__" /> + <keyword name="GitCopyDialog (Module)" id="GitCopyDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitCopyDialog.html" /> + <keyword name="GitCopyDialog.getData" id="GitCopyDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsGit.GitCopyDialog.html#GitCopyDialog.getData" /> + <keyword name="GitCopyDialog.on_dirButton_clicked" id="GitCopyDialog.on_dirButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitCopyDialog.html#GitCopyDialog.on_dirButton_clicked" /> + <keyword name="GitCopyDialog.on_targetEdit_textChanged" id="GitCopyDialog.on_targetEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitCopyDialog.html#GitCopyDialog.on_targetEdit_textChanged" /> + <keyword name="GitDescribeDialog" id="GitDescribeDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDescribeDialog.html#GitDescribeDialog" /> + <keyword name="GitDescribeDialog (Constructor)" id="GitDescribeDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDescribeDialog.html#GitDescribeDialog.__init__" /> + <keyword name="GitDescribeDialog (Module)" id="GitDescribeDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDescribeDialog.html" /> + <keyword name="GitDescribeDialog.__finish" id="GitDescribeDialog.__finish" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDescribeDialog.html#GitDescribeDialog.__finish" /> + <keyword name="GitDescribeDialog.__procFinished" id="GitDescribeDialog.__procFinished" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDescribeDialog.html#GitDescribeDialog.__procFinished" /> + <keyword name="GitDescribeDialog.__readStderr" id="GitDescribeDialog.__readStderr" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDescribeDialog.html#GitDescribeDialog.__readStderr" /> + <keyword name="GitDescribeDialog.__readStdout" id="GitDescribeDialog.__readStdout" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDescribeDialog.html#GitDescribeDialog.__readStdout" /> + <keyword name="GitDescribeDialog.__resizeColumns" id="GitDescribeDialog.__resizeColumns" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDescribeDialog.html#GitDescribeDialog.__resizeColumns" /> + <keyword name="GitDescribeDialog.__resort" id="GitDescribeDialog.__resort" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDescribeDialog.html#GitDescribeDialog.__resort" /> + <keyword name="GitDescribeDialog.closeEvent" id="GitDescribeDialog.closeEvent" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDescribeDialog.html#GitDescribeDialog.closeEvent" /> + <keyword name="GitDescribeDialog.keyPressEvent" id="GitDescribeDialog.keyPressEvent" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDescribeDialog.html#GitDescribeDialog.keyPressEvent" /> + <keyword name="GitDescribeDialog.on_buttonBox_clicked" id="GitDescribeDialog.on_buttonBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDescribeDialog.html#GitDescribeDialog.on_buttonBox_clicked" /> + <keyword name="GitDescribeDialog.on_input_returnPressed" id="GitDescribeDialog.on_input_returnPressed" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDescribeDialog.html#GitDescribeDialog.on_input_returnPressed" /> + <keyword name="GitDescribeDialog.on_passwordCheckBox_toggled" id="GitDescribeDialog.on_passwordCheckBox_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDescribeDialog.html#GitDescribeDialog.on_passwordCheckBox_toggled" /> + <keyword name="GitDescribeDialog.on_sendButton_clicked" id="GitDescribeDialog.on_sendButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDescribeDialog.html#GitDescribeDialog.on_sendButton_clicked" /> + <keyword name="GitDescribeDialog.start" id="GitDescribeDialog.start" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDescribeDialog.html#GitDescribeDialog.start" /> + <keyword name="GitDialog" id="GitDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDialog.html#GitDialog" /> + <keyword name="GitDialog (Constructor)" id="GitDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDialog.html#GitDialog.__init__" /> + <keyword name="GitDialog (Module)" id="GitDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDialog.html" /> + <keyword name="GitDialog.__finish" id="GitDialog.__finish" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDialog.html#GitDialog.__finish" /> + <keyword name="GitDialog.__procFinished" id="GitDialog.__procFinished" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDialog.html#GitDialog.__procFinished" /> + <keyword name="GitDialog.__readStderr" id="GitDialog.__readStderr" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDialog.html#GitDialog.__readStderr" /> + <keyword name="GitDialog.__readStdout" id="GitDialog.__readStdout" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDialog.html#GitDialog.__readStdout" /> + <keyword name="GitDialog.__showError" id="GitDialog.__showError" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDialog.html#GitDialog.__showError" /> + <keyword name="GitDialog.__showOutput" id="GitDialog.__showOutput" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDialog.html#GitDialog.__showOutput" /> + <keyword name="GitDialog.hasAddOrDelete" id="GitDialog.hasAddOrDelete" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDialog.html#GitDialog.hasAddOrDelete" /> + <keyword name="GitDialog.keyPressEvent" id="GitDialog.keyPressEvent" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDialog.html#GitDialog.keyPressEvent" /> + <keyword name="GitDialog.normalExit" id="GitDialog.normalExit" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDialog.html#GitDialog.normalExit" /> + <keyword name="GitDialog.normalExitWithoutErrors" id="GitDialog.normalExitWithoutErrors" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDialog.html#GitDialog.normalExitWithoutErrors" /> + <keyword name="GitDialog.on_buttonBox_clicked" id="GitDialog.on_buttonBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDialog.html#GitDialog.on_buttonBox_clicked" /> + <keyword name="GitDialog.on_input_returnPressed" id="GitDialog.on_input_returnPressed" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDialog.html#GitDialog.on_input_returnPressed" /> + <keyword name="GitDialog.on_passwordCheckBox_toggled" id="GitDialog.on_passwordCheckBox_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDialog.html#GitDialog.on_passwordCheckBox_toggled" /> + <keyword name="GitDialog.on_sendButton_clicked" id="GitDialog.on_sendButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDialog.html#GitDialog.on_sendButton_clicked" /> + <keyword name="GitDialog.startProcess" id="GitDialog.startProcess" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDialog.html#GitDialog.startProcess" /> + <keyword name="GitDiffDialog" id="GitDiffDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffDialog.html#GitDiffDialog" /> + <keyword name="GitDiffDialog (Constructor)" id="GitDiffDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffDialog.html#GitDiffDialog.__init__" /> + <keyword name="GitDiffDialog (Module)" id="GitDiffDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffDialog.html" /> + <keyword name="GitDiffDialog.__generatorFinished" id="GitDiffDialog.__generatorFinished" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffDialog.html#GitDiffDialog.__generatorFinished" /> + <keyword name="GitDiffDialog.__mergeFileSeparators" id="GitDiffDialog.__mergeFileSeparators" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffDialog.html#GitDiffDialog.__mergeFileSeparators" /> + <keyword name="GitDiffDialog.closeEvent" id="GitDiffDialog.closeEvent" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffDialog.html#GitDiffDialog.closeEvent" /> + <keyword name="GitDiffDialog.on_buttonBox_clicked" id="GitDiffDialog.on_buttonBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffDialog.html#GitDiffDialog.on_buttonBox_clicked" /> + <keyword name="GitDiffDialog.on_filesCombo_activated" id="GitDiffDialog.on_filesCombo_activated" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffDialog.html#GitDiffDialog.on_filesCombo_activated" /> + <keyword name="GitDiffDialog.on_refreshButton_clicked" id="GitDiffDialog.on_refreshButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffDialog.html#GitDiffDialog.on_refreshButton_clicked" /> + <keyword name="GitDiffDialog.on_saveButton_clicked" id="GitDiffDialog.on_saveButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffDialog.html#GitDiffDialog.on_saveButton_clicked" /> + <keyword name="GitDiffDialog.start" id="GitDiffDialog.start" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffDialog.html#GitDiffDialog.start" /> + <keyword name="GitDiffGenerator" id="GitDiffGenerator" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffGenerator.html#GitDiffGenerator" /> + <keyword name="GitDiffGenerator (Constructor)" id="GitDiffGenerator (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffGenerator.html#GitDiffGenerator.__init__" /> + <keyword name="GitDiffGenerator (Module)" id="GitDiffGenerator (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffGenerator.html" /> + <keyword name="GitDiffGenerator.__procFinished" id="GitDiffGenerator.__procFinished" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffGenerator.html#GitDiffGenerator.__procFinished" /> + <keyword name="GitDiffGenerator.__processFileLine" id="GitDiffGenerator.__processFileLine" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffGenerator.html#GitDiffGenerator.__processFileLine" /> + <keyword name="GitDiffGenerator.__processLine" id="GitDiffGenerator.__processLine" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffGenerator.html#GitDiffGenerator.__processLine" /> + <keyword name="GitDiffGenerator.__readStderr" id="GitDiffGenerator.__readStderr" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffGenerator.html#GitDiffGenerator.__readStderr" /> + <keyword name="GitDiffGenerator.__readStdout" id="GitDiffGenerator.__readStdout" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffGenerator.html#GitDiffGenerator.__readStdout" /> + <keyword name="GitDiffGenerator.getResult" id="GitDiffGenerator.getResult" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffGenerator.html#GitDiffGenerator.getResult" /> + <keyword name="GitDiffGenerator.start" id="GitDiffGenerator.start" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffGenerator.html#GitDiffGenerator.start" /> + <keyword name="GitDiffGenerator.stopProcesses" id="GitDiffGenerator.stopProcesses" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffGenerator.html#GitDiffGenerator.stopProcesses" /> + <keyword name="GitDiffHighlighter" id="GitDiffHighlighter" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffHighlighter.html#GitDiffHighlighter" /> + <keyword name="GitDiffHighlighter (Constructor)" id="GitDiffHighlighter (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffHighlighter.html#GitDiffHighlighter.__init__" /> + <keyword name="GitDiffHighlighter (Module)" id="GitDiffHighlighter (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffHighlighter.html" /> + <keyword name="GitDiffHighlighter.generateRules" id="GitDiffHighlighter.generateRules" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffHighlighter.html#GitDiffHighlighter.generateRules" /> + <keyword name="GitDiffParser" id="GitDiffParser" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffParser.html#GitDiffParser" /> + <keyword name="GitDiffParser (Constructor)" id="GitDiffParser (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffParser.html#GitDiffParser.__init__" /> + <keyword name="GitDiffParser (Module)" id="GitDiffParser (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffParser.html" /> + <keyword name="GitDiffParser.__generateHunkHeader" id="GitDiffParser.__generateHunkHeader" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffParser.html#GitDiffParser.__generateHunkHeader" /> + <keyword name="GitDiffParser.__generateRange" id="GitDiffParser.__generateRange" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffParser.html#GitDiffParser.__generateRange" /> + <keyword name="GitDiffParser.__initHunk" id="GitDiffParser.__initHunk" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffParser.html#GitDiffParser.__initHunk" /> + <keyword name="GitDiffParser.__parseDiff" id="GitDiffParser.__parseDiff" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffParser.html#GitDiffParser.__parseDiff" /> + <keyword name="GitDiffParser.__parseRange" id="GitDiffParser.__parseRange" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffParser.html#GitDiffParser.__parseRange" /> + <keyword name="GitDiffParser.createHunkPatch" id="GitDiffParser.createHunkPatch" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffParser.html#GitDiffParser.createHunkPatch" /> + <keyword name="GitDiffParser.createLinesPatch" id="GitDiffParser.createLinesPatch" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffParser.html#GitDiffParser.createLinesPatch" /> + <keyword name="GitDiffParser.headerLength" id="GitDiffParser.headerLength" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffParser.html#GitDiffParser.headerLength" /> + <keyword name="GitFetchDialog" id="GitFetchDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitFetchDialog.html#GitFetchDialog" /> + <keyword name="GitFetchDialog (Constructor)" id="GitFetchDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitFetchDialog.html#GitFetchDialog.__init__" /> + <keyword name="GitFetchDialog (Module)" id="GitFetchDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitFetchDialog.html" /> + <keyword name="GitFetchDialog.__okButtonEnable" id="GitFetchDialog.__okButtonEnable" ref="eric6.Plugins.VcsPlugins.vcsGit.GitFetchDialog.html#GitFetchDialog.__okButtonEnable" /> + <keyword name="GitFetchDialog.__updateButtonEnable" id="GitFetchDialog.__updateButtonEnable" ref="eric6.Plugins.VcsPlugins.vcsGit.GitFetchDialog.html#GitFetchDialog.__updateButtonEnable" /> + <keyword name="GitFetchDialog.getData" id="GitFetchDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsGit.GitFetchDialog.html#GitFetchDialog.getData" /> + <keyword name="GitFetchDialog.on_remoteBranchesList_itemSelectionChanged" id="GitFetchDialog.on_remoteBranchesList_itemSelectionChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitFetchDialog.html#GitFetchDialog.on_remoteBranchesList_itemSelectionChanged" /> + <keyword name="GitFetchDialog.on_remoteEdit_textChanged" id="GitFetchDialog.on_remoteEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitFetchDialog.html#GitFetchDialog.on_remoteEdit_textChanged" /> + <keyword name="GitFetchDialog.on_remotesComboBox_currentTextChanged" id="GitFetchDialog.on_remotesComboBox_currentTextChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitFetchDialog.html#GitFetchDialog.on_remotesComboBox_currentTextChanged" /> + <keyword name="GitFetchDialog.on_updateButton_clicked" id="GitFetchDialog.on_updateButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitFetchDialog.html#GitFetchDialog.on_updateButton_clicked" /> + <keyword name="GitListDialog" id="GitListDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitListDialog.html#GitListDialog" /> + <keyword name="GitListDialog (Constructor)" id="GitListDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitListDialog.html#GitListDialog.__init__" /> + <keyword name="GitListDialog (Module)" id="GitListDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitListDialog.html" /> + <keyword name="GitListDialog.getSelection" id="GitListDialog.getSelection" ref="eric6.Plugins.VcsPlugins.vcsGit.GitListDialog.html#GitListDialog.getSelection" /> + <keyword name="GitLogBrowserDialog" id="GitLogBrowserDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog" /> + <keyword name="GitLogBrowserDialog (Constructor)" id="GitLogBrowserDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__init__" /> + <keyword name="GitLogBrowserDialog (Module)" id="GitLogBrowserDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html" /> + <keyword name="GitLogBrowserDialog.__actionMode" id="GitLogBrowserDialog.__actionMode" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__actionMode" /> + <keyword name="GitLogBrowserDialog.__actionsMenuHovered" id="GitLogBrowserDialog.__actionsMenuHovered" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__actionsMenuHovered" /> + <keyword name="GitLogBrowserDialog.__addFinishCallback" id="GitLogBrowserDialog.__addFinishCallback" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__addFinishCallback" /> + <keyword name="GitLogBrowserDialog.__branchActTriggered" id="GitLogBrowserDialog.__branchActTriggered" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__branchActTriggered" /> + <keyword name="GitLogBrowserDialog.__branchSwitchActTriggered" id="GitLogBrowserDialog.__branchSwitchActTriggered" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__branchSwitchActTriggered" /> + <keyword name="GitLogBrowserDialog.__cherryActTriggered" id="GitLogBrowserDialog.__cherryActTriggered" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__cherryActTriggered" /> + <keyword name="GitLogBrowserDialog.__commitIdClicked" id="GitLogBrowserDialog.__commitIdClicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__commitIdClicked" /> + <keyword name="GitLogBrowserDialog.__describeActTriggered" id="GitLogBrowserDialog.__describeActTriggered" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__describeActTriggered" /> + <keyword name="GitLogBrowserDialog.__filterLogs" id="GitLogBrowserDialog.__filterLogs" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__filterLogs" /> + <keyword name="GitLogBrowserDialog.__findItem" id="GitLogBrowserDialog.__findItem" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__findItem" /> + <keyword name="GitLogBrowserDialog.__finish" id="GitLogBrowserDialog.__finish" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__finish" /> + <keyword name="GitLogBrowserDialog.__generateDetailsTableText" id="GitLogBrowserDialog.__generateDetailsTableText" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__generateDetailsTableText" /> + <keyword name="GitLogBrowserDialog.__generateDiffs" id="GitLogBrowserDialog.__generateDiffs" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__generateDiffs" /> + <keyword name="GitLogBrowserDialog.__generateEdges" id="GitLogBrowserDialog.__generateEdges" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__generateEdges" /> + <keyword name="GitLogBrowserDialog.__generateFileItem" id="GitLogBrowserDialog.__generateFileItem" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__generateFileItem" /> + <keyword name="GitLogBrowserDialog.__generateIcon" id="GitLogBrowserDialog.__generateIcon" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__generateIcon" /> + <keyword name="GitLogBrowserDialog.__generateLogItem" id="GitLogBrowserDialog.__generateLogItem" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__generateLogItem" /> + <keyword name="GitLogBrowserDialog.__generatorFinished" id="GitLogBrowserDialog.__generatorFinished" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__generatorFinished" /> + <keyword name="GitLogBrowserDialog.__getBranchesForCommit" id="GitLogBrowserDialog.__getBranchesForCommit" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__getBranchesForCommit" /> + <keyword name="GitLogBrowserDialog.__getColor" id="GitLogBrowserDialog.__getColor" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__getColor" /> + <keyword name="GitLogBrowserDialog.__getCommitForTag" id="GitLogBrowserDialog.__getCommitForTag" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__getCommitForTag" /> + <keyword name="GitLogBrowserDialog.__getLogEntries" id="GitLogBrowserDialog.__getLogEntries" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__getLogEntries" /> + <keyword name="GitLogBrowserDialog.__getTagsForCommit" id="GitLogBrowserDialog.__getTagsForCommit" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__getTagsForCommit" /> + <keyword name="GitLogBrowserDialog.__identifyProject" id="GitLogBrowserDialog.__identifyProject" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__identifyProject" /> + <keyword name="GitLogBrowserDialog.__initActionsMenu" id="GitLogBrowserDialog.__initActionsMenu" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__initActionsMenu" /> + <keyword name="GitLogBrowserDialog.__initData" id="GitLogBrowserDialog.__initData" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__initData" /> + <keyword name="GitLogBrowserDialog.__initLogTreeContextMenu" id="GitLogBrowserDialog.__initLogTreeContextMenu" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__initLogTreeContextMenu" /> + <keyword name="GitLogBrowserDialog.__mergeFileSeparators" id="GitLogBrowserDialog.__mergeFileSeparators" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__mergeFileSeparators" /> + <keyword name="GitLogBrowserDialog.__prepareFieldSearch" id="GitLogBrowserDialog.__prepareFieldSearch" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__prepareFieldSearch" /> + <keyword name="GitLogBrowserDialog.__procFinished" id="GitLogBrowserDialog.__procFinished" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__procFinished" /> + <keyword name="GitLogBrowserDialog.__processBuffer" id="GitLogBrowserDialog.__processBuffer" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__processBuffer" /> + <keyword name="GitLogBrowserDialog.__processBufferItem" id="GitLogBrowserDialog.__processBufferItem" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__processBufferItem" /> + <keyword name="GitLogBrowserDialog.__readStderr" id="GitLogBrowserDialog.__readStderr" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__readStderr" /> + <keyword name="GitLogBrowserDialog.__readStdout" id="GitLogBrowserDialog.__readStdout" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__readStdout" /> + <keyword name="GitLogBrowserDialog.__reloadGeometry" id="GitLogBrowserDialog.__reloadGeometry" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__reloadGeometry" /> + <keyword name="GitLogBrowserDialog.__resetUI" id="GitLogBrowserDialog.__resetUI" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__resetUI" /> + <keyword name="GitLogBrowserDialog.__resizeColumnsFiles" id="GitLogBrowserDialog.__resizeColumnsFiles" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__resizeColumnsFiles" /> + <keyword name="GitLogBrowserDialog.__resizeColumnsLog" id="GitLogBrowserDialog.__resizeColumnsLog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__resizeColumnsLog" /> + <keyword name="GitLogBrowserDialog.__resortFiles" id="GitLogBrowserDialog.__resortFiles" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__resortFiles" /> + <keyword name="GitLogBrowserDialog.__restoreSplitterStates" id="GitLogBrowserDialog.__restoreSplitterStates" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__restoreSplitterStates" /> + <keyword name="GitLogBrowserDialog.__shortlogActTriggered" id="GitLogBrowserDialog.__shortlogActTriggered" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__shortlogActTriggered" /> + <keyword name="GitLogBrowserDialog.__showAuthorColumns" id="GitLogBrowserDialog.__showAuthorColumns" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__showAuthorColumns" /> + <keyword name="GitLogBrowserDialog.__showBranchesColumn" id="GitLogBrowserDialog.__showBranchesColumn" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__showBranchesColumn" /> + <keyword name="GitLogBrowserDialog.__showCommitIdColumn" id="GitLogBrowserDialog.__showCommitIdColumn" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__showCommitIdColumn" /> + <keyword name="GitLogBrowserDialog.__showCommitterColumns" id="GitLogBrowserDialog.__showCommitterColumns" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__showCommitterColumns" /> + <keyword name="GitLogBrowserDialog.__showError" id="GitLogBrowserDialog.__showError" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__showError" /> + <keyword name="GitLogBrowserDialog.__showTagsColumn" id="GitLogBrowserDialog.__showTagsColumn" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__showTagsColumn" /> + <keyword name="GitLogBrowserDialog.__switchActTriggered" id="GitLogBrowserDialog.__switchActTriggered" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__switchActTriggered" /> + <keyword name="GitLogBrowserDialog.__tagActTriggered" id="GitLogBrowserDialog.__tagActTriggered" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__tagActTriggered" /> + <keyword name="GitLogBrowserDialog.__updateDetailsAndFiles" id="GitLogBrowserDialog.__updateDetailsAndFiles" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__updateDetailsAndFiles" /> + <keyword name="GitLogBrowserDialog.__updateFilesTree" id="GitLogBrowserDialog.__updateFilesTree" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__updateFilesTree" /> + <keyword name="GitLogBrowserDialog.__updateSbsSelectLabel" id="GitLogBrowserDialog.__updateSbsSelectLabel" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__updateSbsSelectLabel" /> + <keyword name="GitLogBrowserDialog.__updateToolMenuActions" id="GitLogBrowserDialog.__updateToolMenuActions" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.__updateToolMenuActions" /> + <keyword name="GitLogBrowserDialog.closeEvent" id="GitLogBrowserDialog.closeEvent" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.closeEvent" /> + <keyword name="GitLogBrowserDialog.col2x" id="GitLogBrowserDialog.col2x" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.col2x" /> + <keyword name="GitLogBrowserDialog.keyPressEvent" id="GitLogBrowserDialog.keyPressEvent" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.keyPressEvent" /> + <keyword name="GitLogBrowserDialog.on_buttonBox_clicked" id="GitLogBrowserDialog.on_buttonBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.on_buttonBox_clicked" /> + <keyword name="GitLogBrowserDialog.on_diffSelectLabel_linkActivated" id="GitLogBrowserDialog.on_diffSelectLabel_linkActivated" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.on_diffSelectLabel_linkActivated" /> + <keyword name="GitLogBrowserDialog.on_downButton_clicked" id="GitLogBrowserDialog.on_downButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.on_downButton_clicked" /> + <keyword name="GitLogBrowserDialog.on_fieldCombo_activated" id="GitLogBrowserDialog.on_fieldCombo_activated" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.on_fieldCombo_activated" /> + <keyword name="GitLogBrowserDialog.on_filesTree_currentItemChanged" id="GitLogBrowserDialog.on_filesTree_currentItemChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.on_filesTree_currentItemChanged" /> + <keyword name="GitLogBrowserDialog.on_findNextButton_clicked" id="GitLogBrowserDialog.on_findNextButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.on_findNextButton_clicked" /> + <keyword name="GitLogBrowserDialog.on_findPrevButton_clicked" id="GitLogBrowserDialog.on_findPrevButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.on_findPrevButton_clicked" /> + <keyword name="GitLogBrowserDialog.on_fromDate_dateChanged" id="GitLogBrowserDialog.on_fromDate_dateChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.on_fromDate_dateChanged" /> + <keyword name="GitLogBrowserDialog.on_input_returnPressed" id="GitLogBrowserDialog.on_input_returnPressed" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.on_input_returnPressed" /> + <keyword name="GitLogBrowserDialog.on_logTree_currentItemChanged" id="GitLogBrowserDialog.on_logTree_currentItemChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.on_logTree_currentItemChanged" /> + <keyword name="GitLogBrowserDialog.on_logTree_customContextMenuRequested" id="GitLogBrowserDialog.on_logTree_customContextMenuRequested" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.on_logTree_customContextMenuRequested" /> + <keyword name="GitLogBrowserDialog.on_logTree_itemSelectionChanged" id="GitLogBrowserDialog.on_logTree_itemSelectionChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.on_logTree_itemSelectionChanged" /> + <keyword name="GitLogBrowserDialog.on_modeComboBox_currentIndexChanged" id="GitLogBrowserDialog.on_modeComboBox_currentIndexChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.on_modeComboBox_currentIndexChanged" /> + <keyword name="GitLogBrowserDialog.on_nextButton_clicked" id="GitLogBrowserDialog.on_nextButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.on_nextButton_clicked" /> + <keyword name="GitLogBrowserDialog.on_passwordCheckBox_toggled" id="GitLogBrowserDialog.on_passwordCheckBox_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.on_passwordCheckBox_toggled" /> + <keyword name="GitLogBrowserDialog.on_refreshButton_clicked" id="GitLogBrowserDialog.on_refreshButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.on_refreshButton_clicked" /> + <keyword name="GitLogBrowserDialog.on_rxEdit_returnPressed" id="GitLogBrowserDialog.on_rxEdit_returnPressed" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.on_rxEdit_returnPressed" /> + <keyword name="GitLogBrowserDialog.on_rxEdit_textChanged" id="GitLogBrowserDialog.on_rxEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.on_rxEdit_textChanged" /> + <keyword name="GitLogBrowserDialog.on_saveLabel_linkActivated" id="GitLogBrowserDialog.on_saveLabel_linkActivated" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.on_saveLabel_linkActivated" /> + <keyword name="GitLogBrowserDialog.on_sbsSelectLabel_linkActivated" id="GitLogBrowserDialog.on_sbsSelectLabel_linkActivated" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.on_sbsSelectLabel_linkActivated" /> + <keyword name="GitLogBrowserDialog.on_sendButton_clicked" id="GitLogBrowserDialog.on_sendButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.on_sendButton_clicked" /> + <keyword name="GitLogBrowserDialog.on_stopCheckBox_clicked" id="GitLogBrowserDialog.on_stopCheckBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.on_stopCheckBox_clicked" /> + <keyword name="GitLogBrowserDialog.on_toDate_dateChanged" id="GitLogBrowserDialog.on_toDate_dateChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.on_toDate_dateChanged" /> + <keyword name="GitLogBrowserDialog.on_upButton_clicked" id="GitLogBrowserDialog.on_upButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.on_upButton_clicked" /> + <keyword name="GitLogBrowserDialog.show" id="GitLogBrowserDialog.show" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.show" /> + <keyword name="GitLogBrowserDialog.start" id="GitLogBrowserDialog.start" ref="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html#GitLogBrowserDialog.start" /> + <keyword name="GitMergeDialog" id="GitMergeDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html#GitMergeDialog" /> + <keyword name="GitMergeDialog (Constructor)" id="GitMergeDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html#GitMergeDialog.__init__" /> + <keyword name="GitMergeDialog (Module)" id="GitMergeDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html" /> + <keyword name="GitMergeDialog.__generateDefaultCommitMessage" id="GitMergeDialog.__generateDefaultCommitMessage" ref="eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html#GitMergeDialog.__generateDefaultCommitMessage" /> + <keyword name="GitMergeDialog.__updateOK" id="GitMergeDialog.__updateOK" ref="eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html#GitMergeDialog.__updateOK" /> + <keyword name="GitMergeDialog.getParameters" id="GitMergeDialog.getParameters" ref="eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html#GitMergeDialog.getParameters" /> + <keyword name="GitMergeDialog.on_branchButton_toggled" id="GitMergeDialog.on_branchButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html#GitMergeDialog.on_branchButton_toggled" /> + <keyword name="GitMergeDialog.on_branchCombo_editTextChanged" id="GitMergeDialog.on_branchCombo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html#GitMergeDialog.on_branchCombo_editTextChanged" /> + <keyword name="GitMergeDialog.on_commitGroupBox_toggled" id="GitMergeDialog.on_commitGroupBox_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html#GitMergeDialog.on_commitGroupBox_toggled" /> + <keyword name="GitMergeDialog.on_commitMessageEdit_textChanged" id="GitMergeDialog.on_commitMessageEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html#GitMergeDialog.on_commitMessageEdit_textChanged" /> + <keyword name="GitMergeDialog.on_idButton_toggled" id="GitMergeDialog.on_idButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html#GitMergeDialog.on_idButton_toggled" /> + <keyword name="GitMergeDialog.on_idEdit_textChanged" id="GitMergeDialog.on_idEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html#GitMergeDialog.on_idEdit_textChanged" /> + <keyword name="GitMergeDialog.on_noneButton_toggled" id="GitMergeDialog.on_noneButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html#GitMergeDialog.on_noneButton_toggled" /> + <keyword name="GitMergeDialog.on_remoteBranchButton_toggled" id="GitMergeDialog.on_remoteBranchButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html#GitMergeDialog.on_remoteBranchButton_toggled" /> + <keyword name="GitMergeDialog.on_remoteBranchCombo_editTextChanged" id="GitMergeDialog.on_remoteBranchCombo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html#GitMergeDialog.on_remoteBranchCombo_editTextChanged" /> + <keyword name="GitMergeDialog.on_tagButton_toggled" id="GitMergeDialog.on_tagButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html#GitMergeDialog.on_tagButton_toggled" /> + <keyword name="GitMergeDialog.on_tagCombo_editTextChanged" id="GitMergeDialog.on_tagCombo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html#GitMergeDialog.on_tagCombo_editTextChanged" /> + <keyword name="GitNewProjectOptionsDialog" id="GitNewProjectOptionsDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitNewProjectOptionsDialog.html#GitNewProjectOptionsDialog" /> + <keyword name="GitNewProjectOptionsDialog (Constructor)" id="GitNewProjectOptionsDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitNewProjectOptionsDialog.html#GitNewProjectOptionsDialog.__init__" /> + <keyword name="GitNewProjectOptionsDialog (Module)" id="GitNewProjectOptionsDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitNewProjectOptionsDialog.html" /> + <keyword name="GitNewProjectOptionsDialog.__saveHistory" id="GitNewProjectOptionsDialog.__saveHistory" ref="eric6.Plugins.VcsPlugins.vcsGit.GitNewProjectOptionsDialog.html#GitNewProjectOptionsDialog.__saveHistory" /> + <keyword name="GitNewProjectOptionsDialog.getData" id="GitNewProjectOptionsDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsGit.GitNewProjectOptionsDialog.html#GitNewProjectOptionsDialog.getData" /> + <keyword name="GitNewProjectOptionsDialog.on_projectDirButton_clicked" id="GitNewProjectOptionsDialog.on_projectDirButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitNewProjectOptionsDialog.html#GitNewProjectOptionsDialog.on_projectDirButton_clicked" /> + <keyword name="GitNewProjectOptionsDialog.on_vcsProjectDirEdit_textChanged" id="GitNewProjectOptionsDialog.on_vcsProjectDirEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitNewProjectOptionsDialog.html#GitNewProjectOptionsDialog.on_vcsProjectDirEdit_textChanged" /> + <keyword name="GitNewProjectOptionsDialog.on_vcsUrlButton_clicked" id="GitNewProjectOptionsDialog.on_vcsUrlButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitNewProjectOptionsDialog.html#GitNewProjectOptionsDialog.on_vcsUrlButton_clicked" /> + <keyword name="GitNewProjectOptionsDialog.on_vcsUrlClearHistoryButton_clicked" id="GitNewProjectOptionsDialog.on_vcsUrlClearHistoryButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitNewProjectOptionsDialog.html#GitNewProjectOptionsDialog.on_vcsUrlClearHistoryButton_clicked" /> + <keyword name="GitNewProjectOptionsDialog.on_vcsUrlCombo_editTextChanged" id="GitNewProjectOptionsDialog.on_vcsUrlCombo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitNewProjectOptionsDialog.html#GitNewProjectOptionsDialog.on_vcsUrlCombo_editTextChanged" /> + <keyword name="GitOptionsDialog" id="GitOptionsDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitOptionsDialog.html#GitOptionsDialog" /> + <keyword name="GitOptionsDialog (Constructor)" id="GitOptionsDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitOptionsDialog.html#GitOptionsDialog.__init__" /> + <keyword name="GitOptionsDialog (Module)" id="GitOptionsDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitOptionsDialog.html" /> + <keyword name="GitOptionsDialog.getData" id="GitOptionsDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsGit.GitOptionsDialog.html#GitOptionsDialog.getData" /> + <keyword name="GitPage" id="GitPage" ref="eric6.Plugins.VcsPlugins.vcsGit.ConfigurationPage.GitPage.html#GitPage" /> + <keyword name="GitPage (Constructor)" id="GitPage (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.ConfigurationPage.GitPage.html#GitPage.__init__" /> + <keyword name="GitPage (Module)" id="GitPage (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.ConfigurationPage.GitPage.html" /> + <keyword name="GitPage.on_configButton_clicked" id="GitPage.on_configButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.ConfigurationPage.GitPage.html#GitPage.on_configButton_clicked" /> + <keyword name="GitPage.save" id="GitPage.save" ref="eric6.Plugins.VcsPlugins.vcsGit.ConfigurationPage.GitPage.html#GitPage.save" /> + <keyword name="GitPatchFilesDialog" id="GitPatchFilesDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPatchFilesDialog.html#GitPatchFilesDialog" /> + <keyword name="GitPatchFilesDialog (Constructor)" id="GitPatchFilesDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPatchFilesDialog.html#GitPatchFilesDialog.__init__" /> + <keyword name="GitPatchFilesDialog (Module)" id="GitPatchFilesDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPatchFilesDialog.html" /> + <keyword name="GitPatchFilesDialog.__getPatchFilesList" id="GitPatchFilesDialog.__getPatchFilesList" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPatchFilesDialog.html#GitPatchFilesDialog.__getPatchFilesList" /> + <keyword name="GitPatchFilesDialog.getData" id="GitPatchFilesDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPatchFilesDialog.html#GitPatchFilesDialog.getData" /> + <keyword name="GitPatchFilesDialog.on_addButton_clicked" id="GitPatchFilesDialog.on_addButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPatchFilesDialog.html#GitPatchFilesDialog.on_addButton_clicked" /> + <keyword name="GitPatchFilesDialog.on_deleteButton_clicked" id="GitPatchFilesDialog.on_deleteButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPatchFilesDialog.html#GitPatchFilesDialog.on_deleteButton_clicked" /> + <keyword name="GitPatchFilesDialog.on_downButton_clicked" id="GitPatchFilesDialog.on_downButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPatchFilesDialog.html#GitPatchFilesDialog.on_downButton_clicked" /> + <keyword name="GitPatchFilesDialog.on_patchFilesList_itemSelectionChanged" id="GitPatchFilesDialog.on_patchFilesList_itemSelectionChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPatchFilesDialog.html#GitPatchFilesDialog.on_patchFilesList_itemSelectionChanged" /> + <keyword name="GitPatchFilesDialog.on_upButton_clicked" id="GitPatchFilesDialog.on_upButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPatchFilesDialog.html#GitPatchFilesDialog.on_upButton_clicked" /> + <keyword name="GitPatchStatisticsDialog" id="GitPatchStatisticsDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPatchStatisticsDialog.html#GitPatchStatisticsDialog" /> + <keyword name="GitPatchStatisticsDialog (Constructor)" id="GitPatchStatisticsDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPatchStatisticsDialog.html#GitPatchStatisticsDialog.__init__" /> + <keyword name="GitPatchStatisticsDialog (Module)" id="GitPatchStatisticsDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPatchStatisticsDialog.html" /> + <keyword name="GitPatchStatisticsDialog.__createStatisticsItem" id="GitPatchStatisticsDialog.__createStatisticsItem" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPatchStatisticsDialog.html#GitPatchStatisticsDialog.__createStatisticsItem" /> + <keyword name="GitPatchStatisticsDialog.__resizeColumns" id="GitPatchStatisticsDialog.__resizeColumns" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPatchStatisticsDialog.html#GitPatchStatisticsDialog.__resizeColumns" /> + <keyword name="GitPatchStatisticsDialog.getData" id="GitPatchStatisticsDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPatchStatisticsDialog.html#GitPatchStatisticsDialog.getData" /> + <keyword name="GitPatchStatisticsDialog.start" id="GitPatchStatisticsDialog.start" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPatchStatisticsDialog.html#GitPatchStatisticsDialog.start" /> + <keyword name="GitProjectBrowserHelper" id="GitProjectBrowserHelper" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.html#GitProjectBrowserHelper" /> + <keyword name="GitProjectBrowserHelper (Constructor)" id="GitProjectBrowserHelper (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.html#GitProjectBrowserHelper.__init__" /> + <keyword name="GitProjectBrowserHelper.__GitBlame" id="GitProjectBrowserHelper.__GitBlame" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.html#GitProjectBrowserHelper.__GitBlame" /> + <keyword name="GitProjectBrowserHelper.__GitConfigure" id="GitProjectBrowserHelper.__GitConfigure" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.html#GitProjectBrowserHelper.__GitConfigure" /> + <keyword name="GitProjectBrowserHelper.__GitCopy" id="GitProjectBrowserHelper.__GitCopy" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.html#GitProjectBrowserHelper.__GitCopy" /> + <keyword name="GitProjectBrowserHelper.__GitExtendedDiff" id="GitProjectBrowserHelper.__GitExtendedDiff" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.html#GitProjectBrowserHelper.__GitExtendedDiff" /> + <keyword name="GitProjectBrowserHelper.__GitForget" id="GitProjectBrowserHelper.__GitForget" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.html#GitProjectBrowserHelper.__GitForget" /> + <keyword name="GitProjectBrowserHelper.__GitMove" id="GitProjectBrowserHelper.__GitMove" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.html#GitProjectBrowserHelper.__GitMove" /> + <keyword name="GitProjectBrowserHelper.__GitRevert" id="GitProjectBrowserHelper.__GitRevert" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.html#GitProjectBrowserHelper.__GitRevert" /> + <keyword name="GitProjectBrowserHelper.__GitSbsDiff" id="GitProjectBrowserHelper.__GitSbsDiff" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.html#GitProjectBrowserHelper.__GitSbsDiff" /> + <keyword name="GitProjectBrowserHelper.__GitSbsExtendedDiff" id="GitProjectBrowserHelper.__GitSbsExtendedDiff" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.html#GitProjectBrowserHelper.__GitSbsExtendedDiff" /> + <keyword name="GitProjectBrowserHelper.__GitUnstage" id="GitProjectBrowserHelper.__GitUnstage" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.html#GitProjectBrowserHelper.__GitUnstage" /> + <keyword name="GitProjectBrowserHelper._addVCSMenu" id="GitProjectBrowserHelper._addVCSMenu" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.html#GitProjectBrowserHelper._addVCSMenu" /> + <keyword name="GitProjectBrowserHelper._addVCSMenuBack" id="GitProjectBrowserHelper._addVCSMenuBack" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.html#GitProjectBrowserHelper._addVCSMenuBack" /> + <keyword name="GitProjectBrowserHelper._addVCSMenuDir" id="GitProjectBrowserHelper._addVCSMenuDir" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.html#GitProjectBrowserHelper._addVCSMenuDir" /> + <keyword name="GitProjectBrowserHelper._addVCSMenuDirMulti" id="GitProjectBrowserHelper._addVCSMenuDirMulti" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.html#GitProjectBrowserHelper._addVCSMenuDirMulti" /> + <keyword name="GitProjectBrowserHelper._addVCSMenuMulti" id="GitProjectBrowserHelper._addVCSMenuMulti" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.html#GitProjectBrowserHelper._addVCSMenuMulti" /> + <keyword name="GitProjectBrowserHelper.showContextMenu" id="GitProjectBrowserHelper.showContextMenu" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.html#GitProjectBrowserHelper.showContextMenu" /> + <keyword name="GitProjectBrowserHelper.showContextMenuDir" id="GitProjectBrowserHelper.showContextMenuDir" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.html#GitProjectBrowserHelper.showContextMenuDir" /> + <keyword name="GitProjectBrowserHelper.showContextMenuDirMulti" id="GitProjectBrowserHelper.showContextMenuDirMulti" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.html#GitProjectBrowserHelper.showContextMenuDirMulti" /> + <keyword name="GitProjectBrowserHelper.showContextMenuMulti" id="GitProjectBrowserHelper.showContextMenuMulti" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.html#GitProjectBrowserHelper.showContextMenuMulti" /> + <keyword name="GitProjectHelper" id="GitProjectHelper" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper" /> + <keyword name="GitProjectHelper (Constructor)" id="GitProjectHelper (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__init__" /> + <keyword name="GitProjectHelper.__gitAddRemote" id="GitProjectHelper.__gitAddRemote" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitAddRemote" /> + <keyword name="GitProjectHelper.__gitApplyPatches" id="GitProjectHelper.__gitApplyPatches" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitApplyPatches" /> + <keyword name="GitProjectHelper.__gitBisectBad" id="GitProjectHelper.__gitBisectBad" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitBisectBad" /> + <keyword name="GitProjectHelper.__gitBisectCreateReplay" id="GitProjectHelper.__gitBisectCreateReplay" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitBisectCreateReplay" /> + <keyword name="GitProjectHelper.__gitBisectEditReplay" id="GitProjectHelper.__gitBisectEditReplay" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitBisectEditReplay" /> + <keyword name="GitProjectHelper.__gitBisectGood" id="GitProjectHelper.__gitBisectGood" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitBisectGood" /> + <keyword name="GitProjectHelper.__gitBisectLogBrowser" id="GitProjectHelper.__gitBisectLogBrowser" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitBisectLogBrowser" /> + <keyword name="GitProjectHelper.__gitBisectReplay" id="GitProjectHelper.__gitBisectReplay" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitBisectReplay" /> + <keyword name="GitProjectHelper.__gitBisectReset" id="GitProjectHelper.__gitBisectReset" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitBisectReset" /> + <keyword name="GitProjectHelper.__gitBisectSkip" id="GitProjectHelper.__gitBisectSkip" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitBisectSkip" /> + <keyword name="GitProjectHelper.__gitBisectStart" id="GitProjectHelper.__gitBisectStart" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitBisectStart" /> + <keyword name="GitProjectHelper.__gitBisectStartExtended" id="GitProjectHelper.__gitBisectStartExtended" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitBisectStartExtended" /> + <keyword name="GitProjectHelper.__gitBranch" id="GitProjectHelper.__gitBranch" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitBranch" /> + <keyword name="GitProjectHelper.__gitBranchList" id="GitProjectHelper.__gitBranchList" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitBranchList" /> + <keyword name="GitProjectHelper.__gitBundle" id="GitProjectHelper.__gitBundle" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitBundle" /> + <keyword name="GitProjectHelper.__gitBundleFetch" id="GitProjectHelper.__gitBundleFetch" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitBundleFetch" /> + <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.__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" /> + <keyword name="GitProjectHelper.__gitCherryPickContinue" id="GitProjectHelper.__gitCherryPickContinue" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitCherryPickContinue" /> + <keyword name="GitProjectHelper.__gitCherryPickQuit" id="GitProjectHelper.__gitCherryPickQuit" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitCherryPickQuit" /> + <keyword name="GitProjectHelper.__gitCommitMerge" id="GitProjectHelper.__gitCommitMerge" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitCommitMerge" /> + <keyword name="GitProjectHelper.__gitConfigure" id="GitProjectHelper.__gitConfigure" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitConfigure" /> + <keyword name="GitProjectHelper.__gitCreateArchive" id="GitProjectHelper.__gitCreateArchive" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitCreateArchive" /> + <keyword name="GitProjectHelper.__gitCreateIgnore" id="GitProjectHelper.__gitCreateIgnore" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitCreateIgnore" /> + <keyword name="GitProjectHelper.__gitDeleteBranch" id="GitProjectHelper.__gitDeleteBranch" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitDeleteBranch" /> + <keyword name="GitProjectHelper.__gitDescribeTag" id="GitProjectHelper.__gitDescribeTag" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitDescribeTag" /> + <keyword name="GitProjectHelper.__gitEditRepoConfig" id="GitProjectHelper.__gitEditRepoConfig" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitEditRepoConfig" /> + <keyword name="GitProjectHelper.__gitEditUserConfig" id="GitProjectHelper.__gitEditUserConfig" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitEditUserConfig" /> + <keyword name="GitProjectHelper.__gitExtendedDiff" id="GitProjectHelper.__gitExtendedDiff" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitExtendedDiff" /> + <keyword name="GitProjectHelper.__gitFetch" id="GitProjectHelper.__gitFetch" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitFetch" /> + <keyword name="GitProjectHelper.__gitHouseKeeping" id="GitProjectHelper.__gitHouseKeeping" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitHouseKeeping" /> + <keyword name="GitProjectHelper.__gitMergedBranchList" id="GitProjectHelper.__gitMergedBranchList" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitMergedBranchList" /> + <keyword name="GitProjectHelper.__gitNotMergedBranchList" id="GitProjectHelper.__gitNotMergedBranchList" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitNotMergedBranchList" /> + <keyword name="GitProjectHelper.__gitPruneRemote" id="GitProjectHelper.__gitPruneRemote" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitPruneRemote" /> + <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.__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" /> + <keyword name="GitProjectHelper.__gitShowBranch" id="GitProjectHelper.__gitShowBranch" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitShowBranch" /> + <keyword name="GitProjectHelper.__gitShowConfig" id="GitProjectHelper.__gitShowConfig" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitShowConfig" /> + <keyword name="GitProjectHelper.__gitShowPatchStatistics" id="GitProjectHelper.__gitShowPatchStatistics" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitShowPatchStatistics" /> + <keyword name="GitProjectHelper.__gitShowRemote" id="GitProjectHelper.__gitShowRemote" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitShowRemote" /> + <keyword name="GitProjectHelper.__gitShowRemotes" id="GitProjectHelper.__gitShowRemotes" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitShowRemotes" /> + <keyword name="GitProjectHelper.__gitStashApply" id="GitProjectHelper.__gitStashApply" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitStashApply" /> + <keyword name="GitProjectHelper.__gitStashBranch" id="GitProjectHelper.__gitStashBranch" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitStashBranch" /> + <keyword name="GitProjectHelper.__gitStashBrowser" id="GitProjectHelper.__gitStashBrowser" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitStashBrowser" /> + <keyword name="GitProjectHelper.__gitStashClear" id="GitProjectHelper.__gitStashClear" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitStashClear" /> + <keyword name="GitProjectHelper.__gitStashDrop" id="GitProjectHelper.__gitStashDrop" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitStashDrop" /> + <keyword name="GitProjectHelper.__gitStashPop" id="GitProjectHelper.__gitStashPop" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitStashPop" /> + <keyword name="GitProjectHelper.__gitStashSave" id="GitProjectHelper.__gitStashSave" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitStashSave" /> + <keyword name="GitProjectHelper.__gitStashShow" id="GitProjectHelper.__gitStashShow" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitStashShow" /> + <keyword name="GitProjectHelper.__gitStatistics" id="GitProjectHelper.__gitStatistics" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitStatistics" /> + <keyword name="GitProjectHelper.__gitSubmoduleAdd" id="GitProjectHelper.__gitSubmoduleAdd" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitSubmoduleAdd" /> + <keyword name="GitProjectHelper.__gitSubmodulesDeinit" id="GitProjectHelper.__gitSubmodulesDeinit" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitSubmodulesDeinit" /> + <keyword name="GitProjectHelper.__gitSubmodulesInit" id="GitProjectHelper.__gitSubmodulesInit" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitSubmodulesInit" /> + <keyword name="GitProjectHelper.__gitSubmodulesList" id="GitProjectHelper.__gitSubmodulesList" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitSubmodulesList" /> + <keyword name="GitProjectHelper.__gitSubmodulesStatus" id="GitProjectHelper.__gitSubmodulesStatus" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitSubmodulesStatus" /> + <keyword name="GitProjectHelper.__gitSubmodulesSummary" id="GitProjectHelper.__gitSubmodulesSummary" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitSubmodulesSummary" /> + <keyword name="GitProjectHelper.__gitSubmodulesSync" id="GitProjectHelper.__gitSubmodulesSync" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitSubmodulesSync" /> + <keyword name="GitProjectHelper.__gitSubmodulesUpdate" id="GitProjectHelper.__gitSubmodulesUpdate" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitSubmodulesUpdate" /> + <keyword name="GitProjectHelper.__gitSubmodulesUpdateInit" id="GitProjectHelper.__gitSubmodulesUpdateInit" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitSubmodulesUpdateInit" /> + <keyword name="GitProjectHelper.__gitSubmodulesUpdateOptions" id="GitProjectHelper.__gitSubmodulesUpdateOptions" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitSubmodulesUpdateOptions" /> + <keyword name="GitProjectHelper.__gitSubmodulesUpdateRemote" id="GitProjectHelper.__gitSubmodulesUpdateRemote" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitSubmodulesUpdateRemote" /> + <keyword name="GitProjectHelper.__gitTagList" id="GitProjectHelper.__gitTagList" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitTagList" /> + <keyword name="GitProjectHelper.__gitUnstage" id="GitProjectHelper.__gitUnstage" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitUnstage" /> + <keyword name="GitProjectHelper.__gitVerify" id="GitProjectHelper.__gitVerify" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitVerify" /> + <keyword name="GitProjectHelper.__gitVerifyBundle" id="GitProjectHelper.__gitVerifyBundle" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.__gitVerifyBundle" /> + <keyword name="GitProjectHelper.getActions" id="GitProjectHelper.getActions" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.getActions" /> + <keyword name="GitProjectHelper.getProject" id="GitProjectHelper.getProject" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.getProject" /> + <keyword name="GitProjectHelper.initActions" id="GitProjectHelper.initActions" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.initActions" /> + <keyword name="GitProjectHelper.initMenu" id="GitProjectHelper.initMenu" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.initMenu" /> + <keyword name="GitProjectHelper.initToolbar" id="GitProjectHelper.initToolbar" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.initToolbar" /> + <keyword name="GitProjectHelper.removeToolbar" id="GitProjectHelper.removeToolbar" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.removeToolbar" /> + <keyword name="GitProjectHelper.setObjects" id="GitProjectHelper.setObjects" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.setObjects" /> + <keyword name="GitProjectHelper.shutdown" id="GitProjectHelper.shutdown" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html#GitProjectHelper.shutdown" /> + <keyword name="GitPullDialog" id="GitPullDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPullDialog.html#GitPullDialog" /> + <keyword name="GitPullDialog (Constructor)" id="GitPullDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPullDialog.html#GitPullDialog.__init__" /> + <keyword name="GitPullDialog (Module)" id="GitPullDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPullDialog.html" /> + <keyword name="GitPullDialog.__okButtonEnable" id="GitPullDialog.__okButtonEnable" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPullDialog.html#GitPullDialog.__okButtonEnable" /> + <keyword name="GitPullDialog.__updateButtonEnable" id="GitPullDialog.__updateButtonEnable" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPullDialog.html#GitPullDialog.__updateButtonEnable" /> + <keyword name="GitPullDialog.getData" id="GitPullDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPullDialog.html#GitPullDialog.getData" /> + <keyword name="GitPullDialog.on_remoteEdit_textChanged" id="GitPullDialog.on_remoteEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPullDialog.html#GitPullDialog.on_remoteEdit_textChanged" /> + <keyword name="GitPullDialog.on_remotesComboBox_currentTextChanged" id="GitPullDialog.on_remotesComboBox_currentTextChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPullDialog.html#GitPullDialog.on_remotesComboBox_currentTextChanged" /> + <keyword name="GitPullDialog.on_updateButton_clicked" id="GitPullDialog.on_updateButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPullDialog.html#GitPullDialog.on_updateButton_clicked" /> + <keyword name="GitPushDialog" id="GitPushDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPushDialog.html#GitPushDialog" /> + <keyword name="GitPushDialog (Constructor)" id="GitPushDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPushDialog.html#GitPushDialog.__init__" /> + <keyword name="GitPushDialog (Module)" id="GitPushDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPushDialog.html" /> + <keyword name="GitPushDialog.__resizeColumns" id="GitPushDialog.__resizeColumns" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPushDialog.html#GitPushDialog.__resizeColumns" /> + <keyword name="GitPushDialog.getData" id="GitPushDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPushDialog.html#GitPushDialog.getData" /> + <keyword name="GitPushDialog.on_branchesTree_itemChanged" id="GitPushDialog.on_branchesTree_itemChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPushDialog.html#GitPushDialog.on_branchesTree_itemChanged" /> + <keyword name="GitPushDialog.on_remotesComboBox_currentTextChanged" id="GitPushDialog.on_remotesComboBox_currentTextChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPushDialog.html#GitPushDialog.on_remotesComboBox_currentTextChanged" /> + <keyword name="GitPushDialog.on_selectAllCheckBox_stateChanged" id="GitPushDialog.on_selectAllCheckBox_stateChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitPushDialog.html#GitPushDialog.on_selectAllCheckBox_stateChanged" /> + <keyword name="GitReflogBrowserDialog" id="GitReflogBrowserDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.html#GitReflogBrowserDialog" /> + <keyword name="GitReflogBrowserDialog (Constructor)" id="GitReflogBrowserDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.html#GitReflogBrowserDialog.__init__" /> + <keyword name="GitReflogBrowserDialog (Module)" id="GitReflogBrowserDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.html" /> + <keyword name="GitReflogBrowserDialog.__finish" id="GitReflogBrowserDialog.__finish" ref="eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.html#GitReflogBrowserDialog.__finish" /> + <keyword name="GitReflogBrowserDialog.__generateReflogItem" id="GitReflogBrowserDialog.__generateReflogItem" ref="eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.html#GitReflogBrowserDialog.__generateReflogItem" /> + <keyword name="GitReflogBrowserDialog.__getReflogEntries" id="GitReflogBrowserDialog.__getReflogEntries" ref="eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.html#GitReflogBrowserDialog.__getReflogEntries" /> + <keyword name="GitReflogBrowserDialog.__initData" id="GitReflogBrowserDialog.__initData" ref="eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.html#GitReflogBrowserDialog.__initData" /> + <keyword name="GitReflogBrowserDialog.__procFinished" id="GitReflogBrowserDialog.__procFinished" ref="eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.html#GitReflogBrowserDialog.__procFinished" /> + <keyword name="GitReflogBrowserDialog.__processBuffer" id="GitReflogBrowserDialog.__processBuffer" ref="eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.html#GitReflogBrowserDialog.__processBuffer" /> + <keyword name="GitReflogBrowserDialog.__readStderr" id="GitReflogBrowserDialog.__readStderr" ref="eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.html#GitReflogBrowserDialog.__readStderr" /> + <keyword name="GitReflogBrowserDialog.__readStdout" id="GitReflogBrowserDialog.__readStdout" ref="eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.html#GitReflogBrowserDialog.__readStdout" /> + <keyword name="GitReflogBrowserDialog.__resetUI" id="GitReflogBrowserDialog.__resetUI" ref="eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.html#GitReflogBrowserDialog.__resetUI" /> + <keyword name="GitReflogBrowserDialog.__resizeColumnsLog" id="GitReflogBrowserDialog.__resizeColumnsLog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.html#GitReflogBrowserDialog.__resizeColumnsLog" /> + <keyword name="GitReflogBrowserDialog.__showError" id="GitReflogBrowserDialog.__showError" ref="eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.html#GitReflogBrowserDialog.__showError" /> + <keyword name="GitReflogBrowserDialog.closeEvent" id="GitReflogBrowserDialog.closeEvent" ref="eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.html#GitReflogBrowserDialog.closeEvent" /> + <keyword name="GitReflogBrowserDialog.keyPressEvent" id="GitReflogBrowserDialog.keyPressEvent" ref="eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.html#GitReflogBrowserDialog.keyPressEvent" /> + <keyword name="GitReflogBrowserDialog.on_buttonBox_clicked" id="GitReflogBrowserDialog.on_buttonBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.html#GitReflogBrowserDialog.on_buttonBox_clicked" /> + <keyword name="GitReflogBrowserDialog.on_input_returnPressed" id="GitReflogBrowserDialog.on_input_returnPressed" ref="eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.html#GitReflogBrowserDialog.on_input_returnPressed" /> + <keyword name="GitReflogBrowserDialog.on_nextButton_clicked" id="GitReflogBrowserDialog.on_nextButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.html#GitReflogBrowserDialog.on_nextButton_clicked" /> + <keyword name="GitReflogBrowserDialog.on_passwordCheckBox_toggled" id="GitReflogBrowserDialog.on_passwordCheckBox_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.html#GitReflogBrowserDialog.on_passwordCheckBox_toggled" /> + <keyword name="GitReflogBrowserDialog.on_refreshButton_clicked" id="GitReflogBrowserDialog.on_refreshButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.html#GitReflogBrowserDialog.on_refreshButton_clicked" /> + <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="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" /> + <keyword name="GitRemoteRepositoriesDialog.__finish" id="GitRemoteRepositoriesDialog.__finish" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.html#GitRemoteRepositoriesDialog.__finish" /> + <keyword name="GitRemoteRepositoriesDialog.__generateItem" id="GitRemoteRepositoriesDialog.__generateItem" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.html#GitRemoteRepositoriesDialog.__generateItem" /> + <keyword name="GitRemoteRepositoriesDialog.__procFinished" id="GitRemoteRepositoriesDialog.__procFinished" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.html#GitRemoteRepositoriesDialog.__procFinished" /> + <keyword name="GitRemoteRepositoriesDialog.__readStderr" id="GitRemoteRepositoriesDialog.__readStderr" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.html#GitRemoteRepositoriesDialog.__readStderr" /> + <keyword name="GitRemoteRepositoriesDialog.__readStdout" id="GitRemoteRepositoriesDialog.__readStdout" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.html#GitRemoteRepositoriesDialog.__readStdout" /> + <keyword name="GitRemoteRepositoriesDialog.__resizeColumns" id="GitRemoteRepositoriesDialog.__resizeColumns" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.html#GitRemoteRepositoriesDialog.__resizeColumns" /> + <keyword name="GitRemoteRepositoriesDialog.__resort" id="GitRemoteRepositoriesDialog.__resort" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.html#GitRemoteRepositoriesDialog.__resort" /> + <keyword name="GitRemoteRepositoriesDialog.__updateButtons" id="GitRemoteRepositoriesDialog.__updateButtons" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.html#GitRemoteRepositoriesDialog.__updateButtons" /> + <keyword name="GitRemoteRepositoriesDialog.closeEvent" id="GitRemoteRepositoriesDialog.closeEvent" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.html#GitRemoteRepositoriesDialog.closeEvent" /> + <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_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" /> + <keyword name="GitRemoteRepositoriesDialog.on_refreshButton_clicked" id="GitRemoteRepositoriesDialog.on_refreshButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.html#GitRemoteRepositoriesDialog.on_refreshButton_clicked" /> + <keyword name="GitRemoteRepositoriesDialog.on_removeButton_clicked" id="GitRemoteRepositoriesDialog.on_removeButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.html#GitRemoteRepositoriesDialog.on_removeButton_clicked" /> + <keyword name="GitRemoteRepositoriesDialog.on_renameButton_clicked" id="GitRemoteRepositoriesDialog.on_renameButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.html#GitRemoteRepositoriesDialog.on_renameButton_clicked" /> + <keyword name="GitRemoteRepositoriesDialog.on_repolist_itemSelectionChanged" id="GitRemoteRepositoriesDialog.on_repolist_itemSelectionChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.html#GitRemoteRepositoriesDialog.on_repolist_itemSelectionChanged" /> + <keyword name="GitRemoteRepositoriesDialog.on_sendButton_clicked" id="GitRemoteRepositoriesDialog.on_sendButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.html#GitRemoteRepositoriesDialog.on_sendButton_clicked" /> + <keyword name="GitRemoteRepositoriesDialog.on_showInfoButton_clicked" id="GitRemoteRepositoriesDialog.on_showInfoButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.html#GitRemoteRepositoriesDialog.on_showInfoButton_clicked" /> + <keyword name="GitRemoteRepositoriesDialog.start" id="GitRemoteRepositoriesDialog.start" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.html#GitRemoteRepositoriesDialog.start" /> + <keyword name="GitRevisionSelectionDialog" id="GitRevisionSelectionDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionSelectionDialog.html#GitRevisionSelectionDialog" /> + <keyword name="GitRevisionSelectionDialog (Constructor)" id="GitRevisionSelectionDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionSelectionDialog.html#GitRevisionSelectionDialog.__init__" /> + <keyword name="GitRevisionSelectionDialog (Module)" id="GitRevisionSelectionDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionSelectionDialog.html" /> + <keyword name="GitRevisionSelectionDialog.__updateOK" id="GitRevisionSelectionDialog.__updateOK" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionSelectionDialog.html#GitRevisionSelectionDialog.__updateOK" /> + <keyword name="GitRevisionSelectionDialog.getRevision" id="GitRevisionSelectionDialog.getRevision" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionSelectionDialog.html#GitRevisionSelectionDialog.getRevision" /> + <keyword name="GitRevisionSelectionDialog.on_branchButton_toggled" id="GitRevisionSelectionDialog.on_branchButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionSelectionDialog.html#GitRevisionSelectionDialog.on_branchButton_toggled" /> + <keyword name="GitRevisionSelectionDialog.on_branchCombo_editTextChanged" id="GitRevisionSelectionDialog.on_branchCombo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionSelectionDialog.html#GitRevisionSelectionDialog.on_branchCombo_editTextChanged" /> + <keyword name="GitRevisionSelectionDialog.on_remoteBranchButton_toggled" id="GitRevisionSelectionDialog.on_remoteBranchButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionSelectionDialog.html#GitRevisionSelectionDialog.on_remoteBranchButton_toggled" /> + <keyword name="GitRevisionSelectionDialog.on_remoteBranchCombo_editTextChanged" id="GitRevisionSelectionDialog.on_remoteBranchCombo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionSelectionDialog.html#GitRevisionSelectionDialog.on_remoteBranchCombo_editTextChanged" /> + <keyword name="GitRevisionSelectionDialog.on_revButton_toggled" id="GitRevisionSelectionDialog.on_revButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionSelectionDialog.html#GitRevisionSelectionDialog.on_revButton_toggled" /> + <keyword name="GitRevisionSelectionDialog.on_revEdit_textChanged" id="GitRevisionSelectionDialog.on_revEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionSelectionDialog.html#GitRevisionSelectionDialog.on_revEdit_textChanged" /> + <keyword name="GitRevisionSelectionDialog.on_tagButton_toggled" id="GitRevisionSelectionDialog.on_tagButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionSelectionDialog.html#GitRevisionSelectionDialog.on_tagButton_toggled" /> + <keyword name="GitRevisionSelectionDialog.on_tagCombo_editTextChanged" id="GitRevisionSelectionDialog.on_tagCombo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionSelectionDialog.html#GitRevisionSelectionDialog.on_tagCombo_editTextChanged" /> + <keyword name="GitRevisionsSelectionDialog" id="GitRevisionsSelectionDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.html#GitRevisionsSelectionDialog" /> + <keyword name="GitRevisionsSelectionDialog (Constructor)" id="GitRevisionsSelectionDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.html#GitRevisionsSelectionDialog.__init__" /> + <keyword name="GitRevisionsSelectionDialog (Module)" id="GitRevisionsSelectionDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.html" /> + <keyword name="GitRevisionsSelectionDialog.__getRevision" id="GitRevisionsSelectionDialog.__getRevision" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.html#GitRevisionsSelectionDialog.__getRevision" /> + <keyword name="GitRevisionsSelectionDialog.__updateOK" id="GitRevisionsSelectionDialog.__updateOK" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.html#GitRevisionsSelectionDialog.__updateOK" /> + <keyword name="GitRevisionsSelectionDialog.getRevisions" id="GitRevisionsSelectionDialog.getRevisions" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.html#GitRevisionsSelectionDialog.getRevisions" /> + <keyword name="GitRevisionsSelectionDialog.on_branch1Button_toggled" id="GitRevisionsSelectionDialog.on_branch1Button_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.html#GitRevisionsSelectionDialog.on_branch1Button_toggled" /> + <keyword name="GitRevisionsSelectionDialog.on_branch1Combo_editTextChanged" id="GitRevisionsSelectionDialog.on_branch1Combo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.html#GitRevisionsSelectionDialog.on_branch1Combo_editTextChanged" /> + <keyword name="GitRevisionsSelectionDialog.on_branch2Button_toggled" id="GitRevisionsSelectionDialog.on_branch2Button_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.html#GitRevisionsSelectionDialog.on_branch2Button_toggled" /> + <keyword name="GitRevisionsSelectionDialog.on_branch2Combo_editTextChanged" id="GitRevisionsSelectionDialog.on_branch2Combo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.html#GitRevisionsSelectionDialog.on_branch2Combo_editTextChanged" /> + <keyword name="GitRevisionsSelectionDialog.on_rev1Button_toggled" id="GitRevisionsSelectionDialog.on_rev1Button_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.html#GitRevisionsSelectionDialog.on_rev1Button_toggled" /> + <keyword name="GitRevisionsSelectionDialog.on_rev1Edit_textChanged" id="GitRevisionsSelectionDialog.on_rev1Edit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.html#GitRevisionsSelectionDialog.on_rev1Edit_textChanged" /> + <keyword name="GitRevisionsSelectionDialog.on_rev2Button_toggled" id="GitRevisionsSelectionDialog.on_rev2Button_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.html#GitRevisionsSelectionDialog.on_rev2Button_toggled" /> + <keyword name="GitRevisionsSelectionDialog.on_rev2Edit_textChanged" id="GitRevisionsSelectionDialog.on_rev2Edit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.html#GitRevisionsSelectionDialog.on_rev2Edit_textChanged" /> + <keyword name="GitRevisionsSelectionDialog.on_tag1Button_toggled" id="GitRevisionsSelectionDialog.on_tag1Button_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.html#GitRevisionsSelectionDialog.on_tag1Button_toggled" /> + <keyword name="GitRevisionsSelectionDialog.on_tag1Combo_editTextChanged" id="GitRevisionsSelectionDialog.on_tag1Combo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.html#GitRevisionsSelectionDialog.on_tag1Combo_editTextChanged" /> + <keyword name="GitRevisionsSelectionDialog.on_tag2Button_toggled" id="GitRevisionsSelectionDialog.on_tag2Button_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.html#GitRevisionsSelectionDialog.on_tag2Button_toggled" /> + <keyword name="GitRevisionsSelectionDialog.on_tag2Combo_editTextChanged" id="GitRevisionsSelectionDialog.on_tag2Combo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.html#GitRevisionsSelectionDialog.on_tag2Combo_editTextChanged" /> + <keyword name="GitStashBrowserDialog" id="GitStashBrowserDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.html#GitStashBrowserDialog" /> + <keyword name="GitStashBrowserDialog (Constructor)" id="GitStashBrowserDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.html#GitStashBrowserDialog.__init__" /> + <keyword name="GitStashBrowserDialog (Module)" id="GitStashBrowserDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.html" /> + <keyword name="GitStashBrowserDialog.__apply" id="GitStashBrowserDialog.__apply" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.html#GitStashBrowserDialog.__apply" /> + <keyword name="GitStashBrowserDialog.__branch" id="GitStashBrowserDialog.__branch" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.html#GitStashBrowserDialog.__branch" /> + <keyword name="GitStashBrowserDialog.__clear" id="GitStashBrowserDialog.__clear" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.html#GitStashBrowserDialog.__clear" /> + <keyword name="GitStashBrowserDialog.__drop" id="GitStashBrowserDialog.__drop" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.html#GitStashBrowserDialog.__drop" /> + <keyword name="GitStashBrowserDialog.__finish" id="GitStashBrowserDialog.__finish" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.html#GitStashBrowserDialog.__finish" /> + <keyword name="GitStashBrowserDialog.__generateStashEntry" id="GitStashBrowserDialog.__generateStashEntry" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.html#GitStashBrowserDialog.__generateStashEntry" /> + <keyword name="GitStashBrowserDialog.__getStashEntries" id="GitStashBrowserDialog.__getStashEntries" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.html#GitStashBrowserDialog.__getStashEntries" /> + <keyword name="GitStashBrowserDialog.__pop" id="GitStashBrowserDialog.__pop" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.html#GitStashBrowserDialog.__pop" /> + <keyword name="GitStashBrowserDialog.__procFinished" id="GitStashBrowserDialog.__procFinished" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.html#GitStashBrowserDialog.__procFinished" /> + <keyword name="GitStashBrowserDialog.__processBuffer" id="GitStashBrowserDialog.__processBuffer" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.html#GitStashBrowserDialog.__processBuffer" /> + <keyword name="GitStashBrowserDialog.__readStderr" id="GitStashBrowserDialog.__readStderr" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.html#GitStashBrowserDialog.__readStderr" /> + <keyword name="GitStashBrowserDialog.__readStdout" id="GitStashBrowserDialog.__readStdout" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.html#GitStashBrowserDialog.__readStdout" /> + <keyword name="GitStashBrowserDialog.__resetUI" id="GitStashBrowserDialog.__resetUI" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.html#GitStashBrowserDialog.__resetUI" /> + <keyword name="GitStashBrowserDialog.__resizeColumnsStashes" id="GitStashBrowserDialog.__resizeColumnsStashes" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.html#GitStashBrowserDialog.__resizeColumnsStashes" /> + <keyword name="GitStashBrowserDialog.__showPatch" id="GitStashBrowserDialog.__showPatch" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.html#GitStashBrowserDialog.__showPatch" /> + <keyword name="GitStashBrowserDialog.closeEvent" id="GitStashBrowserDialog.closeEvent" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.html#GitStashBrowserDialog.closeEvent" /> + <keyword name="GitStashBrowserDialog.keyPressEvent" id="GitStashBrowserDialog.keyPressEvent" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.html#GitStashBrowserDialog.keyPressEvent" /> + <keyword name="GitStashBrowserDialog.on_buttonBox_clicked" id="GitStashBrowserDialog.on_buttonBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.html#GitStashBrowserDialog.on_buttonBox_clicked" /> + <keyword name="GitStashBrowserDialog.on_input_returnPressed" id="GitStashBrowserDialog.on_input_returnPressed" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.html#GitStashBrowserDialog.on_input_returnPressed" /> + <keyword name="GitStashBrowserDialog.on_passwordCheckBox_toggled" id="GitStashBrowserDialog.on_passwordCheckBox_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.html#GitStashBrowserDialog.on_passwordCheckBox_toggled" /> + <keyword name="GitStashBrowserDialog.on_refreshButton_clicked" id="GitStashBrowserDialog.on_refreshButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.html#GitStashBrowserDialog.on_refreshButton_clicked" /> + <keyword name="GitStashBrowserDialog.on_sendButton_clicked" id="GitStashBrowserDialog.on_sendButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.html#GitStashBrowserDialog.on_sendButton_clicked" /> + <keyword name="GitStashBrowserDialog.on_stashList_currentItemChanged" id="GitStashBrowserDialog.on_stashList_currentItemChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.html#GitStashBrowserDialog.on_stashList_currentItemChanged" /> + <keyword name="GitStashBrowserDialog.on_stashList_customContextMenuRequested" id="GitStashBrowserDialog.on_stashList_customContextMenuRequested" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.html#GitStashBrowserDialog.on_stashList_customContextMenuRequested" /> + <keyword name="GitStashBrowserDialog.show" id="GitStashBrowserDialog.show" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.html#GitStashBrowserDialog.show" /> + <keyword name="GitStashBrowserDialog.start" id="GitStashBrowserDialog.start" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.html#GitStashBrowserDialog.start" /> + <keyword name="GitStashDataDialog" id="GitStashDataDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashDataDialog.html#GitStashDataDialog" /> + <keyword name="GitStashDataDialog (Constructor)" id="GitStashDataDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashDataDialog.html#GitStashDataDialog.__init__" /> + <keyword name="GitStashDataDialog (Module)" id="GitStashDataDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashDataDialog.html" /> + <keyword name="GitStashDataDialog.getData" id="GitStashDataDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStashDataDialog.html#GitStashDataDialog.getData" /> + <keyword name="GitStatusDialog" id="GitStatusDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog" /> + <keyword name="GitStatusDialog (Constructor)" id="GitStatusDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__init__" /> + <keyword name="GitStatusDialog (Module)" id="GitStatusDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html" /> + <keyword name="GitStatusDialog.__actionsMenuHovered" id="GitStatusDialog.__actionsMenuHovered" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__actionsMenuHovered" /> + <keyword name="GitStatusDialog.__add" id="GitStatusDialog.__add" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__add" /> + <keyword name="GitStatusDialog.__amend" id="GitStatusDialog.__amend" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__amend" /> + <keyword name="GitStatusDialog.__commit" id="GitStatusDialog.__commit" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__commit" /> + <keyword name="GitStatusDialog.__commitDeselectAll" id="GitStatusDialog.__commitDeselectAll" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__commitDeselectAll" /> + <keyword name="GitStatusDialog.__commitSelect" id="GitStatusDialog.__commitSelect" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__commitSelect" /> + <keyword name="GitStatusDialog.__commitSelectAll" id="GitStatusDialog.__commitSelectAll" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__commitSelectAll" /> + <keyword name="GitStatusDialog.__committed" id="GitStatusDialog.__committed" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__committed" /> + <keyword name="GitStatusDialog.__diff" id="GitStatusDialog.__diff" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__diff" /> + <keyword name="GitStatusDialog.__editConflict" id="GitStatusDialog.__editConflict" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__editConflict" /> + <keyword name="GitStatusDialog.__finish" id="GitStatusDialog.__finish" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__finish" /> + <keyword name="GitStatusDialog.__forget" id="GitStatusDialog.__forget" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__forget" /> + <keyword name="GitStatusDialog.__generateDiffs" id="GitStatusDialog.__generateDiffs" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__generateDiffs" /> + <keyword name="GitStatusDialog.__generateItem" id="GitStatusDialog.__generateItem" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__generateItem" /> + <keyword name="GitStatusDialog.__generatorFinished" id="GitStatusDialog.__generatorFinished" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__generatorFinished" /> + <keyword name="GitStatusDialog.__getCommitableItems" id="GitStatusDialog.__getCommitableItems" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__getCommitableItems" /> + <keyword name="GitStatusDialog.__getCommitableUnselectedItems" id="GitStatusDialog.__getCommitableUnselectedItems" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__getCommitableUnselectedItems" /> + <keyword name="GitStatusDialog.__getConflictingItems" id="GitStatusDialog.__getConflictingItems" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__getConflictingItems" /> + <keyword name="GitStatusDialog.__getMissingItems" id="GitStatusDialog.__getMissingItems" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__getMissingItems" /> + <keyword name="GitStatusDialog.__getModifiedItems" id="GitStatusDialog.__getModifiedItems" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__getModifiedItems" /> + <keyword name="GitStatusDialog.__getModifiedOnlyItems" id="GitStatusDialog.__getModifiedOnlyItems" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__getModifiedOnlyItems" /> + <keyword name="GitStatusDialog.__getStageableItems" id="GitStatusDialog.__getStageableItems" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__getStageableItems" /> + <keyword name="GitStatusDialog.__getUnstageableItems" id="GitStatusDialog.__getUnstageableItems" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__getUnstageableItems" /> + <keyword name="GitStatusDialog.__getUnversionedItems" id="GitStatusDialog.__getUnversionedItems" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__getUnversionedItems" /> + <keyword name="GitStatusDialog.__initActionsMenu" id="GitStatusDialog.__initActionsMenu" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__initActionsMenu" /> + <keyword name="GitStatusDialog.__procFinished" id="GitStatusDialog.__procFinished" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__procFinished" /> + <keyword name="GitStatusDialog.__readStderr" id="GitStatusDialog.__readStderr" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__readStderr" /> + <keyword name="GitStatusDialog.__readStdout" id="GitStatusDialog.__readStdout" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__readStdout" /> + <keyword name="GitStatusDialog.__refreshDiff" id="GitStatusDialog.__refreshDiff" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__refreshDiff" /> + <keyword name="GitStatusDialog.__resizeColumns" id="GitStatusDialog.__resizeColumns" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__resizeColumns" /> + <keyword name="GitStatusDialog.__resort" id="GitStatusDialog.__resort" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__resort" /> + <keyword name="GitStatusDialog.__restoreMissing" id="GitStatusDialog.__restoreMissing" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__restoreMissing" /> + <keyword name="GitStatusDialog.__revert" id="GitStatusDialog.__revert" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__revert" /> + <keyword name="GitStatusDialog.__revertHunkOrLines" id="GitStatusDialog.__revertHunkOrLines" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__revertHunkOrLines" /> + <keyword name="GitStatusDialog.__sbsDiff" id="GitStatusDialog.__sbsDiff" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__sbsDiff" /> + <keyword name="GitStatusDialog.__selectedLinesIndexes" id="GitStatusDialog.__selectedLinesIndexes" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__selectedLinesIndexes" /> + <keyword name="GitStatusDialog.__showActionsMenu" id="GitStatusDialog.__showActionsMenu" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__showActionsMenu" /> + <keyword name="GitStatusDialog.__showLDiffContextMenu" id="GitStatusDialog.__showLDiffContextMenu" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__showLDiffContextMenu" /> + <keyword name="GitStatusDialog.__showRDiffContextMenu" id="GitStatusDialog.__showRDiffContextMenu" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__showRDiffContextMenu" /> + <keyword name="GitStatusDialog.__stage" id="GitStatusDialog.__stage" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__stage" /> + <keyword name="GitStatusDialog.__stageHunkOrLines" id="GitStatusDialog.__stageHunkOrLines" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__stageHunkOrLines" /> + <keyword name="GitStatusDialog.__tmpPatchFileName" id="GitStatusDialog.__tmpPatchFileName" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__tmpPatchFileName" /> + <keyword name="GitStatusDialog.__unstage" id="GitStatusDialog.__unstage" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__unstage" /> + <keyword name="GitStatusDialog.__unstageHunkOrLines" id="GitStatusDialog.__unstageHunkOrLines" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.__unstageHunkOrLines" /> + <keyword name="GitStatusDialog.closeEvent" id="GitStatusDialog.closeEvent" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.closeEvent" /> + <keyword name="GitStatusDialog.keyPressEvent" id="GitStatusDialog.keyPressEvent" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.keyPressEvent" /> + <keyword name="GitStatusDialog.on_buttonBox_clicked" id="GitStatusDialog.on_buttonBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.on_buttonBox_clicked" /> + <keyword name="GitStatusDialog.on_input_returnPressed" id="GitStatusDialog.on_input_returnPressed" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.on_input_returnPressed" /> + <keyword name="GitStatusDialog.on_passwordCheckBox_toggled" id="GitStatusDialog.on_passwordCheckBox_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.on_passwordCheckBox_toggled" /> + <keyword name="GitStatusDialog.on_refreshButton_clicked" id="GitStatusDialog.on_refreshButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.on_refreshButton_clicked" /> + <keyword name="GitStatusDialog.on_sendButton_clicked" id="GitStatusDialog.on_sendButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.on_sendButton_clicked" /> + <keyword name="GitStatusDialog.on_statusFilterCombo_activated" id="GitStatusDialog.on_statusFilterCombo_activated" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.on_statusFilterCombo_activated" /> + <keyword name="GitStatusDialog.on_statusList_itemSelectionChanged" id="GitStatusDialog.on_statusList_itemSelectionChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.on_statusList_itemSelectionChanged" /> + <keyword name="GitStatusDialog.show" id="GitStatusDialog.show" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.show" /> + <keyword name="GitStatusDialog.start" id="GitStatusDialog.start" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html#GitStatusDialog.start" /> + <keyword name="GitStatusMonitorThread" id="GitStatusMonitorThread" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusMonitorThread.html#GitStatusMonitorThread" /> + <keyword name="GitStatusMonitorThread (Constructor)" id="GitStatusMonitorThread (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusMonitorThread.html#GitStatusMonitorThread.__init__" /> + <keyword name="GitStatusMonitorThread (Module)" id="GitStatusMonitorThread (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusMonitorThread.html" /> + <keyword name="GitStatusMonitorThread._performMonitor" id="GitStatusMonitorThread._performMonitor" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusMonitorThread.html#GitStatusMonitorThread._performMonitor" /> + <keyword name="GitStatusMonitorThread._shutdown" id="GitStatusMonitorThread._shutdown" ref="eric6.Plugins.VcsPlugins.vcsGit.GitStatusMonitorThread.html#GitStatusMonitorThread._shutdown" /> + <keyword name="GitSubmoduleAddDialog" id="GitSubmoduleAddDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmoduleAddDialog.html#GitSubmoduleAddDialog" /> + <keyword name="GitSubmoduleAddDialog (Constructor)" id="GitSubmoduleAddDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmoduleAddDialog.html#GitSubmoduleAddDialog.__init__" /> + <keyword name="GitSubmoduleAddDialog (Module)" id="GitSubmoduleAddDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmoduleAddDialog.html" /> + <keyword name="GitSubmoduleAddDialog.__getRelativePath" id="GitSubmoduleAddDialog.__getRelativePath" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmoduleAddDialog.html#GitSubmoduleAddDialog.__getRelativePath" /> + <keyword name="GitSubmoduleAddDialog.__saveHistory" id="GitSubmoduleAddDialog.__saveHistory" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmoduleAddDialog.html#GitSubmoduleAddDialog.__saveHistory" /> + <keyword name="GitSubmoduleAddDialog.getData" id="GitSubmoduleAddDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmoduleAddDialog.html#GitSubmoduleAddDialog.getData" /> + <keyword name="GitSubmoduleAddDialog.on_submoduleDirButton_clicked" id="GitSubmoduleAddDialog.on_submoduleDirButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmoduleAddDialog.html#GitSubmoduleAddDialog.on_submoduleDirButton_clicked" /> + <keyword name="GitSubmoduleAddDialog.on_submoduleUrlButton_clicked" id="GitSubmoduleAddDialog.on_submoduleUrlButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmoduleAddDialog.html#GitSubmoduleAddDialog.on_submoduleUrlButton_clicked" /> + <keyword name="GitSubmoduleAddDialog.on_submoduleUrlClearHistoryButton_clicked" id="GitSubmoduleAddDialog.on_submoduleUrlClearHistoryButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmoduleAddDialog.html#GitSubmoduleAddDialog.on_submoduleUrlClearHistoryButton_clicked" /> + <keyword name="GitSubmoduleAddDialog.on_submoduleUrlCombo_editTextChanged" id="GitSubmoduleAddDialog.on_submoduleUrlCombo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmoduleAddDialog.html#GitSubmoduleAddDialog.on_submoduleUrlCombo_editTextChanged" /> + <keyword name="GitSubmodulesDeinitDialog" id="GitSubmodulesDeinitDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesDeinitDialog.html#GitSubmodulesDeinitDialog" /> + <keyword name="GitSubmodulesDeinitDialog (Constructor)" id="GitSubmodulesDeinitDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesDeinitDialog.html#GitSubmodulesDeinitDialog.__init__" /> + <keyword name="GitSubmodulesDeinitDialog (Module)" id="GitSubmodulesDeinitDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesDeinitDialog.html" /> + <keyword name="GitSubmodulesDeinitDialog.__updateOK" id="GitSubmodulesDeinitDialog.__updateOK" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesDeinitDialog.html#GitSubmodulesDeinitDialog.__updateOK" /> + <keyword name="GitSubmodulesDeinitDialog.getData" id="GitSubmodulesDeinitDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesDeinitDialog.html#GitSubmodulesDeinitDialog.getData" /> + <keyword name="GitSubmodulesDeinitDialog.on_allCheckBox_toggled" id="GitSubmodulesDeinitDialog.on_allCheckBox_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesDeinitDialog.html#GitSubmodulesDeinitDialog.on_allCheckBox_toggled" /> + <keyword name="GitSubmodulesDeinitDialog.on_submodulesList_itemSelectionChanged" id="GitSubmodulesDeinitDialog.on_submodulesList_itemSelectionChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesDeinitDialog.html#GitSubmodulesDeinitDialog.on_submodulesList_itemSelectionChanged" /> + <keyword name="GitSubmodulesListDialog" id="GitSubmodulesListDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesListDialog.html#GitSubmodulesListDialog" /> + <keyword name="GitSubmodulesListDialog (Constructor)" id="GitSubmodulesListDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesListDialog.html#GitSubmodulesListDialog.__init__" /> + <keyword name="GitSubmodulesListDialog (Module)" id="GitSubmodulesListDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesListDialog.html" /> + <keyword name="GitSubmodulesStatusDialog" id="GitSubmodulesStatusDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesStatusDialog.html#GitSubmodulesStatusDialog" /> + <keyword name="GitSubmodulesStatusDialog (Constructor)" id="GitSubmodulesStatusDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesStatusDialog.html#GitSubmodulesStatusDialog.__init__" /> + <keyword name="GitSubmodulesStatusDialog (Module)" id="GitSubmodulesStatusDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesStatusDialog.html" /> + <keyword name="GitSubmodulesStatusDialog.__processOutput" id="GitSubmodulesStatusDialog.__processOutput" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesStatusDialog.html#GitSubmodulesStatusDialog.__processOutput" /> + <keyword name="GitSubmodulesStatusDialog.on_buttonBox_clicked" id="GitSubmodulesStatusDialog.on_buttonBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesStatusDialog.html#GitSubmodulesStatusDialog.on_buttonBox_clicked" /> + <keyword name="GitSubmodulesStatusDialog.on_indexCheckBox_toggled" id="GitSubmodulesStatusDialog.on_indexCheckBox_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesStatusDialog.html#GitSubmodulesStatusDialog.on_indexCheckBox_toggled" /> + <keyword name="GitSubmodulesStatusDialog.on_recursiveCheckBox_toggled" id="GitSubmodulesStatusDialog.on_recursiveCheckBox_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesStatusDialog.html#GitSubmodulesStatusDialog.on_recursiveCheckBox_toggled" /> + <keyword name="GitSubmodulesStatusDialog.on_refreshButton_clicked" id="GitSubmodulesStatusDialog.on_refreshButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesStatusDialog.html#GitSubmodulesStatusDialog.on_refreshButton_clicked" /> + <keyword name="GitSubmodulesStatusDialog.start" id="GitSubmodulesStatusDialog.start" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesStatusDialog.html#GitSubmodulesStatusDialog.start" /> + <keyword name="GitSubmodulesSummaryOptionsDialog" id="GitSubmodulesSummaryOptionsDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesSummaryOptionsDialog.html#GitSubmodulesSummaryOptionsDialog" /> + <keyword name="GitSubmodulesSummaryOptionsDialog (Constructor)" id="GitSubmodulesSummaryOptionsDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesSummaryOptionsDialog.html#GitSubmodulesSummaryOptionsDialog.__init__" /> + <keyword name="GitSubmodulesSummaryOptionsDialog (Module)" id="GitSubmodulesSummaryOptionsDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesSummaryOptionsDialog.html" /> + <keyword name="GitSubmodulesSummaryOptionsDialog.getData" id="GitSubmodulesSummaryOptionsDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesSummaryOptionsDialog.html#GitSubmodulesSummaryOptionsDialog.getData" /> + <keyword name="GitSubmodulesSyncDialog" id="GitSubmodulesSyncDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesSyncDialog.html#GitSubmodulesSyncDialog" /> + <keyword name="GitSubmodulesSyncDialog (Constructor)" id="GitSubmodulesSyncDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesSyncDialog.html#GitSubmodulesSyncDialog.__init__" /> + <keyword name="GitSubmodulesSyncDialog (Module)" id="GitSubmodulesSyncDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesSyncDialog.html" /> + <keyword name="GitSubmodulesSyncDialog.getData" id="GitSubmodulesSyncDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesSyncDialog.html#GitSubmodulesSyncDialog.getData" /> + <keyword name="GitSubmodulesUpdateOptionsDialog" id="GitSubmodulesUpdateOptionsDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesUpdateOptionsDialog.html#GitSubmodulesUpdateOptionsDialog" /> + <keyword name="GitSubmodulesUpdateOptionsDialog (Constructor)" id="GitSubmodulesUpdateOptionsDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesUpdateOptionsDialog.html#GitSubmodulesUpdateOptionsDialog.__init__" /> + <keyword name="GitSubmodulesUpdateOptionsDialog (Module)" id="GitSubmodulesUpdateOptionsDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesUpdateOptionsDialog.html" /> + <keyword name="GitSubmodulesUpdateOptionsDialog.getData" id="GitSubmodulesUpdateOptionsDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesUpdateOptionsDialog.html#GitSubmodulesUpdateOptionsDialog.getData" /> + <keyword name="GitTagBranchListDialog" id="GitTagBranchListDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitTagBranchListDialog.html#GitTagBranchListDialog" /> + <keyword name="GitTagBranchListDialog (Constructor)" id="GitTagBranchListDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitTagBranchListDialog.html#GitTagBranchListDialog.__init__" /> + <keyword name="GitTagBranchListDialog (Module)" id="GitTagBranchListDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitTagBranchListDialog.html" /> + <keyword name="GitTagBranchListDialog.__finish" id="GitTagBranchListDialog.__finish" ref="eric6.Plugins.VcsPlugins.vcsGit.GitTagBranchListDialog.html#GitTagBranchListDialog.__finish" /> + <keyword name="GitTagBranchListDialog.__generateItem" id="GitTagBranchListDialog.__generateItem" ref="eric6.Plugins.VcsPlugins.vcsGit.GitTagBranchListDialog.html#GitTagBranchListDialog.__generateItem" /> + <keyword name="GitTagBranchListDialog.__getCommit" id="GitTagBranchListDialog.__getCommit" ref="eric6.Plugins.VcsPlugins.vcsGit.GitTagBranchListDialog.html#GitTagBranchListDialog.__getCommit" /> + <keyword name="GitTagBranchListDialog.__procFinished" id="GitTagBranchListDialog.__procFinished" ref="eric6.Plugins.VcsPlugins.vcsGit.GitTagBranchListDialog.html#GitTagBranchListDialog.__procFinished" /> + <keyword name="GitTagBranchListDialog.__processOutputLine" id="GitTagBranchListDialog.__processOutputLine" ref="eric6.Plugins.VcsPlugins.vcsGit.GitTagBranchListDialog.html#GitTagBranchListDialog.__processOutputLine" /> + <keyword name="GitTagBranchListDialog.__readStderr" id="GitTagBranchListDialog.__readStderr" ref="eric6.Plugins.VcsPlugins.vcsGit.GitTagBranchListDialog.html#GitTagBranchListDialog.__readStderr" /> + <keyword name="GitTagBranchListDialog.__readStdout" id="GitTagBranchListDialog.__readStdout" ref="eric6.Plugins.VcsPlugins.vcsGit.GitTagBranchListDialog.html#GitTagBranchListDialog.__readStdout" /> + <keyword name="GitTagBranchListDialog.__resizeColumns" id="GitTagBranchListDialog.__resizeColumns" ref="eric6.Plugins.VcsPlugins.vcsGit.GitTagBranchListDialog.html#GitTagBranchListDialog.__resizeColumns" /> + <keyword name="GitTagBranchListDialog.__resort" id="GitTagBranchListDialog.__resort" ref="eric6.Plugins.VcsPlugins.vcsGit.GitTagBranchListDialog.html#GitTagBranchListDialog.__resort" /> + <keyword name="GitTagBranchListDialog.__showError" id="GitTagBranchListDialog.__showError" ref="eric6.Plugins.VcsPlugins.vcsGit.GitTagBranchListDialog.html#GitTagBranchListDialog.__showError" /> + <keyword name="GitTagBranchListDialog.closeEvent" id="GitTagBranchListDialog.closeEvent" ref="eric6.Plugins.VcsPlugins.vcsGit.GitTagBranchListDialog.html#GitTagBranchListDialog.closeEvent" /> + <keyword name="GitTagBranchListDialog.keyPressEvent" id="GitTagBranchListDialog.keyPressEvent" ref="eric6.Plugins.VcsPlugins.vcsGit.GitTagBranchListDialog.html#GitTagBranchListDialog.keyPressEvent" /> + <keyword name="GitTagBranchListDialog.on_buttonBox_clicked" id="GitTagBranchListDialog.on_buttonBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitTagBranchListDialog.html#GitTagBranchListDialog.on_buttonBox_clicked" /> + <keyword name="GitTagBranchListDialog.on_input_returnPressed" id="GitTagBranchListDialog.on_input_returnPressed" ref="eric6.Plugins.VcsPlugins.vcsGit.GitTagBranchListDialog.html#GitTagBranchListDialog.on_input_returnPressed" /> + <keyword name="GitTagBranchListDialog.on_passwordCheckBox_toggled" id="GitTagBranchListDialog.on_passwordCheckBox_toggled" ref="eric6.Plugins.VcsPlugins.vcsGit.GitTagBranchListDialog.html#GitTagBranchListDialog.on_passwordCheckBox_toggled" /> + <keyword name="GitTagBranchListDialog.on_sendButton_clicked" id="GitTagBranchListDialog.on_sendButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsGit.GitTagBranchListDialog.html#GitTagBranchListDialog.on_sendButton_clicked" /> + <keyword name="GitTagBranchListDialog.start" id="GitTagBranchListDialog.start" ref="eric6.Plugins.VcsPlugins.vcsGit.GitTagBranchListDialog.html#GitTagBranchListDialog.start" /> + <keyword name="GitTagDialog" id="GitTagDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitTagDialog.html#GitTagDialog" /> + <keyword name="GitTagDialog (Constructor)" id="GitTagDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitTagDialog.html#GitTagDialog.__init__" /> + <keyword name="GitTagDialog (Module)" id="GitTagDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitTagDialog.html" /> + <keyword name="GitTagDialog.getParameters" id="GitTagDialog.getParameters" ref="eric6.Plugins.VcsPlugins.vcsGit.GitTagDialog.html#GitTagDialog.getParameters" /> + <keyword name="GitTagDialog.on_tagCombo_editTextChanged" id="GitTagDialog.on_tagCombo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsGit.GitTagDialog.html#GitTagDialog.on_tagCombo_editTextChanged" /> + <keyword name="GitUserConfigDataDialog" id="GitUserConfigDataDialog" ref="eric6.Plugins.VcsPlugins.vcsGit.GitUserConfigDataDialog.html#GitUserConfigDataDialog" /> + <keyword name="GitUserConfigDataDialog (Constructor)" id="GitUserConfigDataDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitUserConfigDataDialog.html#GitUserConfigDataDialog.__init__" /> + <keyword name="GitUserConfigDataDialog (Module)" id="GitUserConfigDataDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitUserConfigDataDialog.html" /> + <keyword name="GitUserConfigDataDialog.getData" id="GitUserConfigDataDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsGit.GitUserConfigDataDialog.html#GitUserConfigDataDialog.getData" /> + <keyword name="GitUtilities (Module)" id="GitUtilities (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.GitUtilities.html" /> <keyword name="Globals (Package)" id="Globals (Package)" ref="index-eric6.Globals.html" /> <keyword name="GlosbeEngine" id="GlosbeEngine" ref="eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.GlosbeEngine.html#GlosbeEngine" /> <keyword name="GlosbeEngine (Constructor)" id="GlosbeEngine (Constructor)" ref="eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.GlosbeEngine.html#GlosbeEngine.__init__" /> @@ -11307,6 +12207,7 @@ <keyword name="PluginUninstallWidget.on_pluginDirectoryCombo_currentIndexChanged" id="PluginUninstallWidget.on_pluginDirectoryCombo_currentIndexChanged" ref="eric6.PluginManager.PluginUninstallDialog.html#PluginUninstallWidget.on_pluginDirectoryCombo_currentIndexChanged" /> <keyword name="PluginUninstallWindow" id="PluginUninstallWindow" ref="eric6.PluginManager.PluginUninstallDialog.html#PluginUninstallWindow" /> <keyword name="PluginUninstallWindow (Constructor)" id="PluginUninstallWindow (Constructor)" ref="eric6.PluginManager.PluginUninstallDialog.html#PluginUninstallWindow.__init__" /> + <keyword name="PluginVcsGit (Module)" id="PluginVcsGit (Module)" ref="eric6.Plugins.PluginVcsGit.html" /> <keyword name="PluginVcsMercurial (Module)" id="PluginVcsMercurial (Module)" ref="eric6.Plugins.PluginVcsMercurial.html" /> <keyword name="PluginVcsPySvn (Module)" id="PluginVcsPySvn (Module)" ref="eric6.Plugins.PluginVcsPySvn.html" /> <keyword name="PluginVcsSubversion (Module)" id="PluginVcsSubversion (Module)" ref="eric6.Plugins.PluginVcsSubversion.html" /> @@ -11688,6 +12589,7 @@ <keyword name="ProjectBrowserFileItem" id="ProjectBrowserFileItem" ref="eric6.Project.ProjectBrowserModel.html#ProjectBrowserFileItem" /> <keyword name="ProjectBrowserFileItem (Constructor)" id="ProjectBrowserFileItem (Constructor)" ref="eric6.Project.ProjectBrowserModel.html#ProjectBrowserFileItem.__init__" /> <keyword name="ProjectBrowserFlags (Module)" id="ProjectBrowserFlags (Module)" ref="eric6.Project.ProjectBrowserFlags.html" /> + <keyword name="ProjectBrowserHelper (Module)" id="ProjectBrowserHelper (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.html" /> <keyword name="ProjectBrowserHelper (Module)" id="ProjectBrowserHelper (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.ProjectBrowserHelper.html" /> <keyword name="ProjectBrowserHelper (Module)" id="ProjectBrowserHelper (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html" /> <keyword name="ProjectBrowserHelper (Module)" id="ProjectBrowserHelper (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.html" /> @@ -11778,6 +12680,7 @@ <keyword name="ProjectFormsBrowser._openItem" id="ProjectFormsBrowser._openItem" ref="eric6.Project.ProjectFormsBrowser.html#ProjectFormsBrowser._openItem" /> <keyword name="ProjectFormsBrowser.compileChangedForms" id="ProjectFormsBrowser.compileChangedForms" ref="eric6.Project.ProjectFormsBrowser.html#ProjectFormsBrowser.compileChangedForms" /> <keyword name="ProjectFormsBrowser.handlePreferencesChanged" id="ProjectFormsBrowser.handlePreferencesChanged" ref="eric6.Project.ProjectFormsBrowser.html#ProjectFormsBrowser.handlePreferencesChanged" /> + <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html" /> <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.ProjectHelper.html" /> <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.ProjectHelper.html" /> <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.ProjectHelper.html" /> @@ -14739,6 +15642,7 @@ <keyword name="SyntaxCheckerPlugin.activate" id="SyntaxCheckerPlugin.activate" ref="eric6.Plugins.PluginSyntaxChecker.html#SyntaxCheckerPlugin.activate" /> <keyword name="SyntaxCheckerPlugin.deactivate" id="SyntaxCheckerPlugin.deactivate" ref="eric6.Plugins.PluginSyntaxChecker.html#SyntaxCheckerPlugin.deactivate" /> <keyword name="TERMINAL" id="TERMINAL" ref="eric6.E5Gui.E5GenericDiffHighlighter.html#TERMINAL" /> + <keyword name="TERMINAL" id="TERMINAL" ref="eric6.Plugins.VcsPlugins.vcsGit.GitDiffHighlighter.html#TERMINAL" /> <keyword name="TRPreviewer" id="TRPreviewer" ref="eric6.Tools.TRPreviewer.html#TRPreviewer" /> <keyword name="TRPreviewer (Constructor)" id="TRPreviewer (Constructor)" ref="eric6.Tools.TRPreviewer.html#TRPreviewer.__init__" /> <keyword name="TRPreviewer (Module)" id="TRPreviewer (Module)" ref="eric6.Tools.TRPreviewer.html" /> @@ -15870,6 +16774,18 @@ <keyword name="VcsCommandOptionsDialog" id="VcsCommandOptionsDialog" ref="eric6.VCS.CommandOptionsDialog.html#VcsCommandOptionsDialog" /> <keyword name="VcsCommandOptionsDialog (Constructor)" id="VcsCommandOptionsDialog (Constructor)" ref="eric6.VCS.CommandOptionsDialog.html#VcsCommandOptionsDialog.__init__" /> <keyword name="VcsCommandOptionsDialog.getOptions" id="VcsCommandOptionsDialog.getOptions" ref="eric6.VCS.CommandOptionsDialog.html#VcsCommandOptionsDialog.getOptions" /> + <keyword name="VcsGitPlugin" id="VcsGitPlugin" ref="eric6.Plugins.PluginVcsGit.html#VcsGitPlugin" /> + <keyword name="VcsGitPlugin (Constructor)" id="VcsGitPlugin (Constructor)" ref="eric6.Plugins.PluginVcsGit.html#VcsGitPlugin.__init__" /> + <keyword name="VcsGitPlugin.__loadTranslator" id="VcsGitPlugin.__loadTranslator" ref="eric6.Plugins.PluginVcsGit.html#VcsGitPlugin.__loadTranslator" /> + <keyword name="VcsGitPlugin.activate" id="VcsGitPlugin.activate" ref="eric6.Plugins.PluginVcsGit.html#VcsGitPlugin.activate" /> + <keyword name="VcsGitPlugin.deactivate" id="VcsGitPlugin.deactivate" ref="eric6.Plugins.PluginVcsGit.html#VcsGitPlugin.deactivate" /> + <keyword name="VcsGitPlugin.getConfigPath" id="VcsGitPlugin.getConfigPath" ref="eric6.Plugins.PluginVcsGit.html#VcsGitPlugin.getConfigPath" /> + <keyword name="VcsGitPlugin.getPreferences" id="VcsGitPlugin.getPreferences" ref="eric6.Plugins.PluginVcsGit.html#VcsGitPlugin.getPreferences" /> + <keyword name="VcsGitPlugin.getProjectHelper" id="VcsGitPlugin.getProjectHelper" ref="eric6.Plugins.PluginVcsGit.html#VcsGitPlugin.getProjectHelper" /> + <keyword name="VcsGitPlugin.initToolbar" id="VcsGitPlugin.initToolbar" ref="eric6.Plugins.PluginVcsGit.html#VcsGitPlugin.initToolbar" /> + <keyword name="VcsGitPlugin.prepareUninstall" id="VcsGitPlugin.prepareUninstall" ref="eric6.Plugins.PluginVcsGit.html#VcsGitPlugin.prepareUninstall" /> + <keyword name="VcsGitPlugin.prepareUnload" id="VcsGitPlugin.prepareUnload" ref="eric6.Plugins.PluginVcsGit.html#VcsGitPlugin.prepareUnload" /> + <keyword name="VcsGitPlugin.setPreferences" id="VcsGitPlugin.setPreferences" ref="eric6.Plugins.PluginVcsGit.html#VcsGitPlugin.setPreferences" /> <keyword name="VcsMercurialPlugin" id="VcsMercurialPlugin" ref="eric6.Plugins.PluginVcsMercurial.html#VcsMercurialPlugin" /> <keyword name="VcsMercurialPlugin (Constructor)" id="VcsMercurialPlugin (Constructor)" ref="eric6.Plugins.PluginVcsMercurial.html#VcsMercurialPlugin.__init__" /> <keyword name="VcsMercurialPlugin.activate" id="VcsMercurialPlugin.activate" ref="eric6.Plugins.PluginVcsMercurial.html#VcsMercurialPlugin.activate" /> @@ -17309,6 +18225,7 @@ <keyword name="cleanupSource" id="cleanupSource" ref="eric6.install-debugclients.html#cleanupSource" /> <keyword name="cleanupSource" id="cleanupSource" ref="eric6.install.html#cleanupSource" /> <keyword name="cleanupSource (Module)" id="cleanupSource (Module)" ref="eric6.cleanupSource.html" /> + <keyword name="clearPrivateData" id="clearPrivateData" ref="eric6.Plugins.PluginVcsGit.html#clearPrivateData" /> <keyword name="clearPrivateData" id="clearPrivateData" ref="eric6.Plugins.PluginVcsMercurial.html#clearPrivateData" /> <keyword name="codeStyleBatchCheck" id="codeStyleBatchCheck" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.html#codeStyleBatchCheck" /> <keyword name="codeStyleCheck" id="codeStyleCheck" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.html#codeStyleCheck" /> @@ -17397,6 +18314,7 @@ <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.WebBrowserSpellCheckingPage.html#create" /> <keyword name="createActionGroup" id="createActionGroup" ref="eric6.E5Gui.E5Action.html#createActionGroup" /> <keyword name="createConfig" id="createConfig" ref="eric6.install.html#createConfig" /> + <keyword name="createConfigurationPage" id="createConfigurationPage" ref="eric6.Plugins.PluginVcsGit.html#createConfigurationPage" /> <keyword name="createConfigurationPage" id="createConfigurationPage" ref="eric6.Plugins.PluginVcsMercurial.html#createConfigurationPage" /> <keyword name="createConfigurationPage" id="createConfigurationPage" ref="eric6.Plugins.PluginVcsPySvn.html#createConfigurationPage" /> <keyword name="createConfigurationPage" id="createConfigurationPage" ref="eric6.Plugins.PluginVcsSubversion.html#createConfigurationPage" /> @@ -17452,6 +18370,7 @@ <keyword name="determinePyQtVariant" id="determinePyQtVariant" ref="eric6.install.html#determinePyQtVariant" /> <keyword name="determinePythonVersion" id="determinePythonVersion" ref="eric6.Utilities.__init__.html#determinePythonVersion" /> <keyword name="direntries" id="direntries" ref="eric6.Utilities.__init__.html#direntries" /> + <keyword name="displayString" id="displayString" ref="eric6.Plugins.PluginVcsGit.html#displayString" /> <keyword name="displayString" id="displayString" ref="eric6.Plugins.PluginVcsMercurial.html#displayString" /> <keyword name="displayString" id="displayString" ref="eric6.Plugins.PluginVcsPySvn.html#displayString" /> <keyword name="displayString" id="displayString" ref="eric6.Plugins.PluginVcsSubversion.html#displayString" /> @@ -17495,6 +18414,7 @@ <keyword name="escape_uentities" id="escape_uentities" ref="eric6.Utilities.__init__.html#escape_uentities" /> <keyword name="excepthook" id="excepthook" ref="eric6.eric6.html#excepthook" /> <keyword name="exeDisplayData" id="exeDisplayData" ref="eric6.Plugins.PluginEricapi.html#exeDisplayData" /> + <keyword name="exeDisplayData" id="exeDisplayData" ref="eric6.Plugins.PluginVcsGit.html#exeDisplayData" /> <keyword name="exeDisplayData" id="exeDisplayData" ref="eric6.Plugins.PluginVcsMercurial.html#exeDisplayData" /> <keyword name="exeDisplayData" id="exeDisplayData" ref="eric6.Plugins.PluginVcsPySvn.html#exeDisplayData" /> <keyword name="exeDisplayData" id="exeDisplayData" ref="eric6.Plugins.PluginVcsSubversion.html#exeDisplayData" /> @@ -17546,12 +18466,14 @@ <keyword name="getConfig" id="getConfig" ref="eric6.eric6config.html#getConfig" /> <keyword name="getConfigData" id="getConfigData" ref="eric6.Plugins.PluginPipInterface.html#getConfigData" /> <keyword name="getConfigData" id="getConfigData" ref="eric6.Plugins.PluginTranslator.html#getConfigData" /> + <keyword name="getConfigData" id="getConfigData" ref="eric6.Plugins.PluginVcsGit.html#getConfigData" /> <keyword name="getConfigData" id="getConfigData" ref="eric6.Plugins.PluginVcsMercurial.html#getConfigData" /> <keyword name="getConfigData" id="getConfigData" ref="eric6.Plugins.PluginVcsPySvn.html#getConfigData" /> <keyword name="getConfigData" id="getConfigData" ref="eric6.Plugins.PluginVcsSubversion.html#getConfigData" /> <keyword name="getConfigDir" id="getConfigDir" ref="eric6.Globals.__init__.html#getConfigDir" /> <keyword name="getConfigDir" id="getConfigDir" ref="eric6.install-i18n.html#getConfigDir" /> <keyword name="getConfigDir" id="getConfigDir" ref="eric6.uninstall.html#getConfigDir" /> + <keyword name="getConfigPath" id="getConfigPath" ref="eric6.Plugins.VcsPlugins.vcsGit.GitUtilities.html#getConfigPath" /> <keyword name="getConfigPath" id="getConfigPath" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities.html#getConfigPath" /> <keyword name="getConfigPath" id="getConfigPath" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnUtilities.html#getConfigPath" /> <keyword name="getConfigPath" id="getConfigPath" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnUtilities.html#getConfigPath" /> @@ -17675,6 +18597,7 @@ <keyword name="getUserName" id="getUserName" ref="eric6.Utilities.__init__.html#getUserName" /> <keyword name="getVCS" id="getVCS" ref="eric6.Preferences.__init__.html#getVCS" /> <keyword name="getVarFilters" id="getVarFilters" ref="eric6.Preferences.__init__.html#getVarFilters" /> + <keyword name="getVcsSystemIndicator" id="getVcsSystemIndicator" ref="eric6.Plugins.PluginVcsGit.html#getVcsSystemIndicator" /> <keyword name="getVcsSystemIndicator" id="getVcsSystemIndicator" ref="eric6.Plugins.PluginVcsMercurial.html#getVcsSystemIndicator" /> <keyword name="getVcsSystemIndicator" id="getVcsSystemIndicator" ref="eric6.Plugins.PluginVcsPySvn.html#getVcsSystemIndicator" /> <keyword name="getVcsSystemIndicator" id="getVcsSystemIndicator" ref="eric6.Plugins.PluginVcsSubversion.html#getVcsSystemIndicator" /> @@ -17690,6 +18613,7 @@ <keyword name="getpass" id="getpass" ref="eric6.DebugClients.Python.getpass.html#getpass" /> <keyword name="getpass (Module)" id="getpass (Module)" ref="eric6.DebugClients.Python.getpass.html" /> <keyword name="getuser" id="getuser" ref="eric6.DebugClients.Python.getpass.html#getuser" /> + <keyword name="git (Module)" id="git (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html" /> <keyword name="gpg (Module)" id="gpg (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.gpg.html" /> <keyword name="handleArgs" id="handleArgs" ref="eric6.Toolbox.Startup.html#handleArgs" /> <keyword name="handleSingleApplication" id="handleSingleApplication" ref="eric6.eric6.html#handleSingleApplication" /> @@ -17839,10 +18763,12 @@ <keyword name="prepareDocumentationViewerHtmlWarningDocument" id="prepareDocumentationViewerHtmlWarningDocument" ref="eric6.UI.CodeDocumentationViewerTemplate.html#prepareDocumentationViewerHtmlWarningDocument" /> <keyword name="prepareInfoFile" id="prepareInfoFile" ref="eric6.install.html#prepareInfoFile" /> <keyword name="prepareJsonCommand" id="prepareJsonCommand" ref="eric6.DebugClients.Python.DebugUtilities.html#prepareJsonCommand" /> + <keyword name="prepareProcess" id="prepareProcess" ref="eric6.Plugins.VcsPlugins.vcsGit.GitUtilities.html#prepareProcess" /> <keyword name="prepareProcess" id="prepareProcess" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities.html#prepareProcess" /> <keyword name="prepareQtMacBundle" id="prepareQtMacBundle" ref="eric6.Utilities.__init__.html#prepareQtMacBundle" /> <keyword name="prepareUninstall" id="prepareUninstall" ref="eric6.Plugins.PluginPipInterface.html#prepareUninstall" /> <keyword name="prepareUninstall" id="prepareUninstall" ref="eric6.Plugins.PluginTranslator.html#prepareUninstall" /> + <keyword name="prepareUninstall" id="prepareUninstall" ref="eric6.Plugins.PluginVcsGit.html#prepareUninstall" /> <keyword name="prepareUninstall" id="prepareUninstall" ref="eric6.Plugins.PluginVcsMercurial.html#prepareUninstall" /> <keyword name="prepareUninstall" id="prepareUninstall" ref="eric6.Plugins.PluginVcsPySvn.html#prepareUninstall" /> <keyword name="prepareUninstall" id="prepareUninstall" ref="eric6.Plugins.PluginVcsSubversion.html#prepareUninstall" /> @@ -17993,6 +18919,7 @@ <keyword name="stdin_get_value" id="stdin_get_value" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#stdin_get_value" /> <keyword name="strGroup" id="strGroup" ref="eric6.Globals.__init__.html#strGroup" /> <keyword name="strToQByteArray" id="strToQByteArray" ref="eric6.Globals.__init__.html#strToQByteArray" /> + <keyword name="strToQByteArray" id="strToQByteArray" ref="eric6.Plugins.VcsPlugins.vcsGit.GitUtilities.html#strToQByteArray" /> <keyword name="strip (Module)" id="strip (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.StripExtension.strip.html" /> <keyword name="strip_PKCS7_padding" id="strip_PKCS7_padding" ref="eric6.Utilities.crypto.py3AES.html#strip_PKCS7_padding" /> <keyword name="subversion (Module)" id="subversion (Module)" ref="eric6.Plugins.VcsPlugins.vcsPySvn.subversion.html" /> @@ -18044,6 +18971,7 @@ <keyword name="usage" id="usage" ref="eric6.patch_modpython.html#usage" /> <keyword name="usage" id="usage" ref="eric6.uninstall-debugclients.html#usage" /> <keyword name="usage" id="usage" ref="eric6.uninstall.html#usage" /> + <keyword name="vcsGit (Package)" id="vcsGit (Package)" ref="index-eric6.Plugins.VcsPlugins.vcsGit.html" /> <keyword name="vcsMercurial (Package)" id="vcsMercurial (Package)" ref="index-eric6.Plugins.VcsPlugins.vcsMercurial.html" /> <keyword name="vcsPySvn (Package)" id="vcsPySvn (Package)" ref="index-eric6.Plugins.VcsPlugins.vcsPySvn.html" /> <keyword name="vcsSubversion (Package)" id="vcsSubversion (Package)" ref="index-eric6.Plugins.VcsPlugins.vcsSubversion.html" /> @@ -18469,6 +19397,7 @@ <file>eric6.Plugins.PluginSyntaxChecker.html</file> <file>eric6.Plugins.PluginTabnanny.html</file> <file>eric6.Plugins.PluginTranslator.html</file> + <file>eric6.Plugins.PluginVcsGit.html</file> <file>eric6.Plugins.PluginVcsMercurial.html</file> <file>eric6.Plugins.PluginVcsPySvn.html</file> <file>eric6.Plugins.PluginVcsSubversion.html</file> @@ -18513,6 +19442,59 @@ <file>eric6.Plugins.UiExtensionPlugins.Translator.TranslatorWidget.html</file> <file>eric6.Plugins.UiExtensionPlugins.VirtualenvInterface.VirtualenvConfigurationDialog.html</file> <file>eric6.Plugins.UiExtensionPlugins.VirtualenvInterface.VirtualenvExecDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.Config.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.ConfigurationPage.GitPage.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitAddRemoteDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitApplyBundleDataDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitArchiveDataDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitBisectStartDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitBlameDialog.html</file> + <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.GitCherryPickDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitCommandDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitCommitDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitCopyDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitDescribeDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitDiffDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitDiffGenerator.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitDiffHighlighter.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitDiffParser.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitFetchDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitListDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitNewProjectOptionsDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitOptionsDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitPatchFilesDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitPatchStatisticsDialog.html</file> + <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.GitRemoteRepositoriesDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitRevisionSelectionDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitStashDataDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitStatusMonitorThread.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitSubmoduleAddDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesDeinitDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesListDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesStatusDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesSummaryOptionsDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesSyncDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesUpdateOptionsDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitTagBranchListDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitTagDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitUserConfigDataDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.GitUtilities.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html</file> + <file>eric6.Plugins.VcsPlugins.vcsGit.git.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.Config.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.HgFetchDialog.html</file> @@ -19246,6 +20228,8 @@ <file>index-eric6.Plugins.UiExtensionPlugins.VirtualenvInterface.html</file> <file>index-eric6.Plugins.UiExtensionPlugins.html</file> <file>index-eric6.Plugins.VcsPlugins.html</file> + <file>index-eric6.Plugins.VcsPlugins.vcsGit.ConfigurationPage.html</file> + <file>index-eric6.Plugins.VcsPlugins.vcsGit.html</file> <file>index-eric6.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.html</file> <file>index-eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.html</file> <file>index-eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.html</file>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.Plugins.PluginVcsGit.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,314 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.PluginVcsGit</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.PluginVcsGit</h1> +<p> +Module implementing the Git version control plugin. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>author</td></tr><tr><td>autoactivate</td></tr><tr><td>className</td></tr><tr><td>deactivateable</td></tr><tr><td>error</td></tr><tr><td>gitCfgPluginObject</td></tr><tr><td>longDescription</td></tr><tr><td>name</td></tr><tr><td>packageName</td></tr><tr><td>pluginType</td></tr><tr><td>pluginTypename</td></tr><tr><td>pyqtApi</td></tr><tr><td>python2Compatible</td></tr><tr><td>shortDescription</td></tr><tr><td>version</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#VcsGitPlugin">VcsGitPlugin</a></td> +<td>Class implementing the Git version control plugin.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr> +<td><a href="#clearPrivateData">clearPrivateData</a></td> +<td>Module function to clear the private data of the plug-in.</td> +</tr><tr> +<td><a href="#createConfigurationPage">createConfigurationPage</a></td> +<td>Module function to create the configuration page.</td> +</tr><tr> +<td><a href="#displayString">displayString</a></td> +<td>Public function to get the display string.</td> +</tr><tr> +<td><a href="#exeDisplayData">exeDisplayData</a></td> +<td>Public method to support the display of some executable info.</td> +</tr><tr> +<td><a href="#getConfigData">getConfigData</a></td> +<td>Module function returning data as required by the configuration dialog.</td> +</tr><tr> +<td><a href="#getVcsSystemIndicator">getVcsSystemIndicator</a></td> +<td>Public function to get the indicators for this version control system.</td> +</tr><tr> +<td><a href="#prepareUninstall">prepareUninstall</a></td> +<td>Module function to prepare for an uninstallation.</td> +</tr> +</table> +<hr /><hr /> +<a NAME="VcsGitPlugin" ID="VcsGitPlugin"></a> +<h2>VcsGitPlugin</h2> +<p> + Class implementing the Git version control plugin. +</p> +<h3>Derived from</h3> +QObject +<h3>Class Attributes</h3> +<table> +<tr><td>GitDefaults</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr> +<td><a href="#VcsGitPlugin.getPreferences">getPreferences</a></td> +<td>Class method to retrieve the various settings.</td> +</tr><tr> +<td><a href="#VcsGitPlugin.setPreferences">setPreferences</a></td> +<td>Class method to store the various settings.</td> +</tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#VcsGitPlugin.__init__">VcsGitPlugin</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#VcsGitPlugin.__loadTranslator">__loadTranslator</a></td> +<td>Private method to load the translation file.</td> +</tr><tr> +<td><a href="#VcsGitPlugin.activate">activate</a></td> +<td>Public method to activate this plugin.</td> +</tr><tr> +<td><a href="#VcsGitPlugin.deactivate">deactivate</a></td> +<td>Public method to deactivate this plugin.</td> +</tr><tr> +<td><a href="#VcsGitPlugin.getConfigPath">getConfigPath</a></td> +<td>Public method to get the filename of the config file.</td> +</tr><tr> +<td><a href="#VcsGitPlugin.getProjectHelper">getProjectHelper</a></td> +<td>Public method to get a reference to the project helper object.</td> +</tr><tr> +<td><a href="#VcsGitPlugin.initToolbar">initToolbar</a></td> +<td>Public slot to initialize the VCS toolbar.</td> +</tr><tr> +<td><a href="#VcsGitPlugin.prepareUninstall">prepareUninstall</a></td> +<td>Public method to prepare for an uninstallation.</td> +</tr><tr> +<td><a href="#VcsGitPlugin.prepareUnload">prepareUnload</a></td> +<td>Public method to prepare for an unload.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="VcsGitPlugin.getPreferences" ID="VcsGitPlugin.getPreferences"></a> +<h4>VcsGitPlugin.getPreferences (class method)</h4> +<b>getPreferences</b>(<i>key</i>) +<p> + Class method to retrieve the various settings. +</p><dl> +<dt><i>key</i></dt> +<dd> +the key of the value to get +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +the requested setting +</dd> +</dl><a NAME="VcsGitPlugin.setPreferences" ID="VcsGitPlugin.setPreferences"></a> +<h4>VcsGitPlugin.setPreferences (class method)</h4> +<b>setPreferences</b>(<i>key, value</i>) +<p> + Class method to store the various settings. +</p><dl> +<dt><i>key</i></dt> +<dd> +the key of the setting to be set +</dd><dt><i>value</i></dt> +<dd> +the value to be set +</dd> +</dl><a NAME="VcsGitPlugin.__init__" ID="VcsGitPlugin.__init__"></a> +<h4>VcsGitPlugin (Constructor)</h4> +<b>VcsGitPlugin</b>(<i>ui</i>) +<p> + Constructor +</p><dl> +<dt><i>ui</i></dt> +<dd> +reference to the user interface object (UI.UserInterface) +</dd> +</dl><a NAME="VcsGitPlugin.__loadTranslator" ID="VcsGitPlugin.__loadTranslator"></a> +<h4>VcsGitPlugin.__loadTranslator</h4> +<b>__loadTranslator</b>(<i></i>) +<p> + Private method to load the translation file. +</p><a NAME="VcsGitPlugin.activate" ID="VcsGitPlugin.activate"></a> +<h4>VcsGitPlugin.activate</h4> +<b>activate</b>(<i></i>) +<p> + Public method to activate this plugin. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple of reference to instantiated viewmanager and + activation status (boolean) +</dd> +</dl><a NAME="VcsGitPlugin.deactivate" ID="VcsGitPlugin.deactivate"></a> +<h4>VcsGitPlugin.deactivate</h4> +<b>deactivate</b>(<i></i>) +<p> + Public method to deactivate this plugin. +</p><a NAME="VcsGitPlugin.getConfigPath" ID="VcsGitPlugin.getConfigPath"></a> +<h4>VcsGitPlugin.getConfigPath</h4> +<b>getConfigPath</b>(<i></i>) +<p> + Public method to get the filename of the config file. +</p><dl> +<dt>Returns:</dt> +<dd> +filename of the config file (string) +</dd> +</dl><a NAME="VcsGitPlugin.getProjectHelper" ID="VcsGitPlugin.getProjectHelper"></a> +<h4>VcsGitPlugin.getProjectHelper</h4> +<b>getProjectHelper</b>(<i></i>) +<p> + Public method to get a reference to the project helper object. +</p><dl> +<dt>Returns:</dt> +<dd> +reference to the project helper object +</dd> +</dl><a NAME="VcsGitPlugin.initToolbar" ID="VcsGitPlugin.initToolbar"></a> +<h4>VcsGitPlugin.initToolbar</h4> +<b>initToolbar</b>(<i>ui, toolbarManager</i>) +<p> + Public slot to initialize the VCS toolbar. +</p><dl> +<dt><i>ui</i></dt> +<dd> +reference to the main window (UserInterface) +</dd><dt><i>toolbarManager</i></dt> +<dd> +reference to a toolbar manager object + (E5ToolBarManager) +</dd> +</dl><a NAME="VcsGitPlugin.prepareUninstall" ID="VcsGitPlugin.prepareUninstall"></a> +<h4>VcsGitPlugin.prepareUninstall</h4> +<b>prepareUninstall</b>(<i></i>) +<p> + Public method to prepare for an uninstallation. +</p><a NAME="VcsGitPlugin.prepareUnload" ID="VcsGitPlugin.prepareUnload"></a> +<h4>VcsGitPlugin.prepareUnload</h4> +<b>prepareUnload</b>(<i></i>) +<p> + Public method to prepare for an unload. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="clearPrivateData" ID="clearPrivateData"></a> +<h2>clearPrivateData</h2> +<b>clearPrivateData</b>(<i></i>) +<p> + Module function to clear the private data of the plug-in. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="createConfigurationPage" ID="createConfigurationPage"></a> +<h2>createConfigurationPage</h2> +<b>createConfigurationPage</b>(<i>configDlg</i>) +<p> + Module function to create the configuration page. +</p><dl> +<dt><i>configDlg</i></dt> +<dd> +reference to the configuration dialog (QDialog) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +reference to the configuration page +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="displayString" ID="displayString"></a> +<h2>displayString</h2> +<b>displayString</b>(<i></i>) +<p> + Public function to get the display string. +</p><dl> +<dt>Returns:</dt> +<dd> +display string (string) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="exeDisplayData" ID="exeDisplayData"></a> +<h2>exeDisplayData</h2> +<b>exeDisplayData</b>(<i></i>) +<p> + Public method to support the display of some executable info. +</p><dl> +<dt>Returns:</dt> +<dd> +dictionary containing the data to query the presence of + the executable +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="getConfigData" ID="getConfigData"></a> +<h2>getConfigData</h2> +<b>getConfigData</b>(<i></i>) +<p> + Module function returning data as required by the configuration dialog. +</p><dl> +<dt>Returns:</dt> +<dd> +dictionary with key "zzz_gitPage" containing the relevant + data +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="getVcsSystemIndicator" ID="getVcsSystemIndicator"></a> +<h2>getVcsSystemIndicator</h2> +<b>getVcsSystemIndicator</b>(<i></i>) +<p> + Public function to get the indicators for this version control system. +</p><dl> +<dt>Returns:</dt> +<dd> +dictionary with indicator as key and a tuple with the vcs name + (string) and vcs display string (string) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="prepareUninstall" ID="prepareUninstall"></a> +<h2>prepareUninstall</h2> +<b>prepareUninstall</b>(<i></i>) +<p> + Module function to prepare for an uninstallation. +</p> +<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.Config.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,39 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.Config</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.Config</h1> +<p> +Module defining configuration variables for the Git package. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>ConfigGitSchemes</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<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.ConfigurationPage.GitPage.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,97 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.ConfigurationPage.GitPage</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.ConfigurationPage.GitPage</h1> +<p> +Module implementing the Git configuration page. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitPage">GitPage</a></td> +<td>Class implementing the Git configuration page.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitPage" ID="GitPage"></a> +<h2>GitPage</h2> +<p> + Class implementing the Git configuration page. +</p> +<h3>Derived from</h3> +ConfigurationPageBase, Ui_GitPage +<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="#GitPage.__init__">GitPage</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitPage.on_configButton_clicked">on_configButton_clicked</a></td> +<td>Private slot to edit the (per user) Git configuration file.</td> +</tr><tr> +<td><a href="#GitPage.save">save</a></td> +<td>Public slot to save the Git configuration.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitPage.__init__" ID="GitPage.__init__"></a> +<h4>GitPage (Constructor)</h4> +<b>GitPage</b>(<i>plugin</i>) +<p> + Constructor +</p><dl> +<dt><i>plugin</i></dt> +<dd> +reference to the plugin object +</dd> +</dl><a NAME="GitPage.on_configButton_clicked" ID="GitPage.on_configButton_clicked"></a> +<h4>GitPage.on_configButton_clicked</h4> +<b>on_configButton_clicked</b>(<i></i>) +<p> + Private slot to edit the (per user) Git configuration file. +</p><a NAME="GitPage.save" ID="GitPage.save"></a> +<h4>GitPage.save</h4> +<b>save</b>(<i></i>) +<p> + Public slot to save the Git configuration. +</p> +<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.GitAddRemoteDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,129 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitAddRemoteDialog</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.GitAddRemoteDialog</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="#GitAddRemoteDialog">GitAddRemoteDialog</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="GitAddRemoteDialog" ID="GitAddRemoteDialog"></a> +<h2>GitAddRemoteDialog</h2> +<p> + Class implementing a dialog to enter the data of a remote repository. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitAddRemoteDialog +<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="#GitAddRemoteDialog.__init__">GitAddRemoteDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitAddRemoteDialog.__updateOK">__updateOK</a></td> +<td>Private method to update the status of the OK button.</td> +</tr><tr> +<td><a href="#GitAddRemoteDialog.getData">getData</a></td> +<td>Public method to get the entered data.</td> +</tr><tr> +<td><a href="#GitAddRemoteDialog.on_nameEdit_textChanged">on_nameEdit_textChanged</a></td> +<td>Private slot handling changes of the entered name.</td> +</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> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitAddRemoteDialog.__init__" ID="GitAddRemoteDialog.__init__"></a> +<h4>GitAddRemoteDialog (Constructor)</h4> +<b>GitAddRemoteDialog</b>(<i>parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd> +</dl><a NAME="GitAddRemoteDialog.__updateOK" ID="GitAddRemoteDialog.__updateOK"></a> +<h4>GitAddRemoteDialog.__updateOK</h4> +<b>__updateOK</b>(<i></i>) +<p> + Private method to update the status of the OK button. +</p><a NAME="GitAddRemoteDialog.getData" ID="GitAddRemoteDialog.getData"></a> +<h4>GitAddRemoteDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to get the entered data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple with the name (string) and URL (string) of + the remote repository +</dd> +</dl><a NAME="GitAddRemoteDialog.on_nameEdit_textChanged" ID="GitAddRemoteDialog.on_nameEdit_textChanged"></a> +<h4>GitAddRemoteDialog.on_nameEdit_textChanged</h4> +<b>on_nameEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot handling changes of the entered name. +</p><dl> +<dt><i>txt</i></dt> +<dd> +current text (string) +</dd> +</dl><a NAME="GitAddRemoteDialog.on_urlEdit_textChanged" ID="GitAddRemoteDialog.on_urlEdit_textChanged"></a> +<h4>GitAddRemoteDialog.on_urlEdit_textChanged</h4> +<b>on_urlEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot handling changes of the entered URL. +</p><dl> +<dt><i>txt</i></dt> +<dd> +current text (string) +</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.GitApplyBundleDataDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,102 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitApplyBundleDataDialog</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.GitApplyBundleDataDialog</h1> +<p> +Module implementing a dialog to enter the data for applying a bundle. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitApplyBundleDataDialog">GitApplyBundleDataDialog</a></td> +<td>Class implementing a dialog to enter the data for applying a bundle.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitApplyBundleDataDialog" ID="GitApplyBundleDataDialog"></a> +<h2>GitApplyBundleDataDialog</h2> +<p> + Class implementing a dialog to enter the data for applying a bundle. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitApplyBundleDataDialog +<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="#GitApplyBundleDataDialog.__init__">GitApplyBundleDataDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitApplyBundleDataDialog.getData">getData</a></td> +<td>Public method to get the entered data.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitApplyBundleDataDialog.__init__" ID="GitApplyBundleDataDialog.__init__"></a> +<h4>GitApplyBundleDataDialog (Constructor)</h4> +<b>GitApplyBundleDataDialog</b>(<i>bundleHeads, branches, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>bundleHeads</i></dt> +<dd> +list of heads contained in a bundle + (list of strings) +</dd><dt><i>branches</i></dt> +<dd> +list of available branch names (list of strings) +</dd><dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd> +</dl><a NAME="GitApplyBundleDataDialog.getData" ID="GitApplyBundleDataDialog.getData"></a> +<h4>GitApplyBundleDataDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to get the entered data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple with the bundle head (string) and the local branch + name (string) +</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.GitArchiveDataDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,212 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitArchiveDataDialog</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.GitArchiveDataDialog</h1> +<p> +Module implementing a dialog to enter the data for the creation of an archive. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitArchiveDataDialog">GitArchiveDataDialog</a></td> +<td>Class implementing a dialog to enter the data for the creation of an archive.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitArchiveDataDialog" ID="GitArchiveDataDialog"></a> +<h2>GitArchiveDataDialog</h2> +<p> + Class implementing a dialog to enter the data for the creation of an + archive. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitArchiveDataDialog +<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="#GitArchiveDataDialog.__init__">GitArchiveDataDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitArchiveDataDialog.__updateOK">__updateOK</a></td> +<td>Private slot to update the OK button.</td> +</tr><tr> +<td><a href="#GitArchiveDataDialog.getData">getData</a></td> +<td>Public method to retrieve the entered data.</td> +</tr><tr> +<td><a href="#GitArchiveDataDialog.on_branchButton_toggled">on_branchButton_toggled</a></td> +<td>Private slot to handle changes of the Branch select button.</td> +</tr><tr> +<td><a href="#GitArchiveDataDialog.on_branchCombo_editTextChanged">on_branchCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Branch combo.</td> +</tr><tr> +<td><a href="#GitArchiveDataDialog.on_fileButton_clicked">on_fileButton_clicked</a></td> +<td>Private slot to select a file via a file selection dialog.</td> +</tr><tr> +<td><a href="#GitArchiveDataDialog.on_fileEdit_textChanged">on_fileEdit_textChanged</a></td> +<td>Private slot to handle changes of the file edit.</td> +</tr><tr> +<td><a href="#GitArchiveDataDialog.on_revButton_toggled">on_revButton_toggled</a></td> +<td>Private slot to handle changes of the rev select button.</td> +</tr><tr> +<td><a href="#GitArchiveDataDialog.on_revEdit_textChanged">on_revEdit_textChanged</a></td> +<td>Private slot to handle changes of the rev edit.</td> +</tr><tr> +<td><a href="#GitArchiveDataDialog.on_tagButton_toggled">on_tagButton_toggled</a></td> +<td>Private slot to handle changes of the Tag select button.</td> +</tr><tr> +<td><a href="#GitArchiveDataDialog.on_tagCombo_editTextChanged">on_tagCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Tag combo.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitArchiveDataDialog.__init__" ID="GitArchiveDataDialog.__init__"></a> +<h4>GitArchiveDataDialog (Constructor)</h4> +<b>GitArchiveDataDialog</b>(<i>tagsList, branchesList, formatsList, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>tagsList</i></dt> +<dd> +list of tags (list of strings) +</dd><dt><i>branchesList</i></dt> +<dd> +list of branches (list of strings) +</dd><dt><i>formatsList</i></dt> +<dd> +list of archive formats (list of strings) +</dd><dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd> +</dl><a NAME="GitArchiveDataDialog.__updateOK" ID="GitArchiveDataDialog.__updateOK"></a> +<h4>GitArchiveDataDialog.__updateOK</h4> +<b>__updateOK</b>(<i></i>) +<p> + Private slot to update the OK button. +</p><a NAME="GitArchiveDataDialog.getData" ID="GitArchiveDataDialog.getData"></a> +<h4>GitArchiveDataDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to retrieve the entered data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple of selected revision (string), archive format (string), + archive file (string) and prefix (string) +</dd> +</dl><a NAME="GitArchiveDataDialog.on_branchButton_toggled" ID="GitArchiveDataDialog.on_branchButton_toggled"></a> +<h4>GitArchiveDataDialog.on_branchButton_toggled</h4> +<b>on_branchButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Branch select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="GitArchiveDataDialog.on_branchCombo_editTextChanged" ID="GitArchiveDataDialog.on_branchCombo_editTextChanged"></a> +<h4>GitArchiveDataDialog.on_branchCombo_editTextChanged</h4> +<b>on_branchCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Branch combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl><a NAME="GitArchiveDataDialog.on_fileButton_clicked" ID="GitArchiveDataDialog.on_fileButton_clicked"></a> +<h4>GitArchiveDataDialog.on_fileButton_clicked</h4> +<b>on_fileButton_clicked</b>(<i></i>) +<p> + Private slot to select a file via a file selection dialog. +</p><a NAME="GitArchiveDataDialog.on_fileEdit_textChanged" ID="GitArchiveDataDialog.on_fileEdit_textChanged"></a> +<h4>GitArchiveDataDialog.on_fileEdit_textChanged</h4> +<b>on_fileEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the file edit. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the edit (string) +</dd> +</dl><a NAME="GitArchiveDataDialog.on_revButton_toggled" ID="GitArchiveDataDialog.on_revButton_toggled"></a> +<h4>GitArchiveDataDialog.on_revButton_toggled</h4> +<b>on_revButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the rev select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="GitArchiveDataDialog.on_revEdit_textChanged" ID="GitArchiveDataDialog.on_revEdit_textChanged"></a> +<h4>GitArchiveDataDialog.on_revEdit_textChanged</h4> +<b>on_revEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the rev edit. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the edit (string) +</dd> +</dl><a NAME="GitArchiveDataDialog.on_tagButton_toggled" ID="GitArchiveDataDialog.on_tagButton_toggled"></a> +<h4>GitArchiveDataDialog.on_tagButton_toggled</h4> +<b>on_tagButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Tag select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="GitArchiveDataDialog.on_tagCombo_editTextChanged" ID="GitArchiveDataDialog.on_tagCombo_editTextChanged"></a> +<h4>GitArchiveDataDialog.on_tagCombo_editTextChanged</h4> +<b>on_tagCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Tag combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</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.GitBisectLogBrowserDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,304 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog</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.GitBisectLogBrowserDialog</h1> +<p> +Module implementing a dialog to browse the bisect log history. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitBisectLogBrowserDialog">GitBisectLogBrowserDialog</a></td> +<td>Class implementing a dialog to browse the bisect log history.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitBisectLogBrowserDialog" ID="GitBisectLogBrowserDialog"></a> +<h2>GitBisectLogBrowserDialog</h2> +<p> + Class implementing a dialog to browse the bisect log history. +</p> +<h3>Derived from</h3> +QWidget, Ui_GitBisectLogBrowserDialog +<h3>Class Attributes</h3> +<table> +<tr><td>CommitIdColumn</td></tr><tr><td>OperationColumn</td></tr><tr><td>SubjectColumn</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#GitBisectLogBrowserDialog.__init__">GitBisectLogBrowserDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitBisectLogBrowserDialog.__finish">__finish</a></td> +<td>Private slot called when the process finished or the user pressed the button.</td> +</tr><tr> +<td><a href="#GitBisectLogBrowserDialog.__generateLogItem">__generateLogItem</a></td> +<td>Private method to generate a bisect log tree entry.</td> +</tr><tr> +<td><a href="#GitBisectLogBrowserDialog.__getLogEntries">__getLogEntries</a></td> +<td>Private method to retrieve bisect log entries from the repository.</td> +</tr><tr> +<td><a href="#GitBisectLogBrowserDialog.__initData">__initData</a></td> +<td>Private method to (re-)initialize some data.</td> +</tr><tr> +<td><a href="#GitBisectLogBrowserDialog.__procFinished">__procFinished</a></td> +<td>Private slot connected to the finished signal.</td> +</tr><tr> +<td><a href="#GitBisectLogBrowserDialog.__processBuffer">__processBuffer</a></td> +<td>Private method to process the buffered output of the git log command.</td> +</tr><tr> +<td><a href="#GitBisectLogBrowserDialog.__readStderr">__readStderr</a></td> +<td>Private slot to handle the readyReadStandardError signal.</td> +</tr><tr> +<td><a href="#GitBisectLogBrowserDialog.__readStdout">__readStdout</a></td> +<td>Private slot to handle the readyReadStandardOutput signal.</td> +</tr><tr> +<td><a href="#GitBisectLogBrowserDialog.__resetUI">__resetUI</a></td> +<td>Private method to reset the user interface.</td> +</tr><tr> +<td><a href="#GitBisectLogBrowserDialog.__resizeColumnsLog">__resizeColumnsLog</a></td> +<td>Private method to resize the log tree columns.</td> +</tr><tr> +<td><a href="#GitBisectLogBrowserDialog.__showError">__showError</a></td> +<td>Private slot to show some error.</td> +</tr><tr> +<td><a href="#GitBisectLogBrowserDialog.closeEvent">closeEvent</a></td> +<td>Protected slot implementing a close event handler.</td> +</tr><tr> +<td><a href="#GitBisectLogBrowserDialog.keyPressEvent">keyPressEvent</a></td> +<td>Protected slot to handle a key press event.</td> +</tr><tr> +<td><a href="#GitBisectLogBrowserDialog.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="#GitBisectLogBrowserDialog.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> +<td><a href="#GitBisectLogBrowserDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> +<td>Private slot to handle the password checkbox toggled.</td> +</tr><tr> +<td><a href="#GitBisectLogBrowserDialog.on_refreshButton_clicked">on_refreshButton_clicked</a></td> +<td>Private slot to refresh the log.</td> +</tr><tr> +<td><a href="#GitBisectLogBrowserDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> +<td>Private slot to send the input to the git process.</td> +</tr><tr> +<td><a href="#GitBisectLogBrowserDialog.show">show</a></td> +<td>Public slot to show the dialog.</td> +</tr><tr> +<td><a href="#GitBisectLogBrowserDialog.start">start</a></td> +<td>Public slot to start the git bisect log command.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitBisectLogBrowserDialog.__init__" ID="GitBisectLogBrowserDialog.__init__"></a> +<h4>GitBisectLogBrowserDialog (Constructor)</h4> +<b>GitBisectLogBrowserDialog</b>(<i>vcs, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>vcs</i></dt> +<dd> +reference to the vcs object +</dd><dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd> +</dl><a NAME="GitBisectLogBrowserDialog.__finish" ID="GitBisectLogBrowserDialog.__finish"></a> +<h4>GitBisectLogBrowserDialog.__finish</h4> +<b>__finish</b>(<i></i>) +<p> + Private slot called when the process finished or the user pressed + the button. +</p><a NAME="GitBisectLogBrowserDialog.__generateLogItem" ID="GitBisectLogBrowserDialog.__generateLogItem"></a> +<h4>GitBisectLogBrowserDialog.__generateLogItem</h4> +<b>__generateLogItem</b>(<i>commitId, operation, subject</i>) +<p> + Private method to generate a bisect log tree entry. +</p><dl> +<dt><i>commitId</i></dt> +<dd> +commit id info (string) +</dd><dt><i>operation</i></dt> +<dd> +bisect operation (string) +</dd><dt><i>subject</i></dt> +<dd> +subject of the bisect log entry (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +reference to the generated item (QTreeWidgetItem) +</dd> +</dl><a NAME="GitBisectLogBrowserDialog.__getLogEntries" ID="GitBisectLogBrowserDialog.__getLogEntries"></a> +<h4>GitBisectLogBrowserDialog.__getLogEntries</h4> +<b>__getLogEntries</b>(<i></i>) +<p> + Private method to retrieve bisect log entries from the repository. +</p><a NAME="GitBisectLogBrowserDialog.__initData" ID="GitBisectLogBrowserDialog.__initData"></a> +<h4>GitBisectLogBrowserDialog.__initData</h4> +<b>__initData</b>(<i></i>) +<p> + Private method to (re-)initialize some data. +</p><a NAME="GitBisectLogBrowserDialog.__procFinished" ID="GitBisectLogBrowserDialog.__procFinished"></a> +<h4>GitBisectLogBrowserDialog.__procFinished</h4> +<b>__procFinished</b>(<i>exitCode, exitStatus</i>) +<p> + Private slot connected to the finished signal. +</p><dl> +<dt><i>exitCode</i></dt> +<dd> +exit code of the process (integer) +</dd><dt><i>exitStatus</i></dt> +<dd> +exit status of the process (QProcess.ExitStatus) +</dd> +</dl><a NAME="GitBisectLogBrowserDialog.__processBuffer" ID="GitBisectLogBrowserDialog.__processBuffer"></a> +<h4>GitBisectLogBrowserDialog.__processBuffer</h4> +<b>__processBuffer</b>(<i></i>) +<p> + Private method to process the buffered output of the git log command. +</p><a NAME="GitBisectLogBrowserDialog.__readStderr" ID="GitBisectLogBrowserDialog.__readStderr"></a> +<h4>GitBisectLogBrowserDialog.__readStderr</h4> +<b>__readStderr</b>(<i></i>) +<p> + Private slot to handle the readyReadStandardError signal. +</p><p> + It reads the error output of the process and inserts it into the + error pane. +</p><a NAME="GitBisectLogBrowserDialog.__readStdout" ID="GitBisectLogBrowserDialog.__readStdout"></a> +<h4>GitBisectLogBrowserDialog.__readStdout</h4> +<b>__readStdout</b>(<i></i>) +<p> + Private slot to handle the readyReadStandardOutput signal. +</p><p> + It reads the output of the process and inserts it into a buffer. +</p><a NAME="GitBisectLogBrowserDialog.__resetUI" ID="GitBisectLogBrowserDialog.__resetUI"></a> +<h4>GitBisectLogBrowserDialog.__resetUI</h4> +<b>__resetUI</b>(<i></i>) +<p> + Private method to reset the user interface. +</p><a NAME="GitBisectLogBrowserDialog.__resizeColumnsLog" ID="GitBisectLogBrowserDialog.__resizeColumnsLog"></a> +<h4>GitBisectLogBrowserDialog.__resizeColumnsLog</h4> +<b>__resizeColumnsLog</b>(<i></i>) +<p> + Private method to resize the log tree columns. +</p><a NAME="GitBisectLogBrowserDialog.__showError" ID="GitBisectLogBrowserDialog.__showError"></a> +<h4>GitBisectLogBrowserDialog.__showError</h4> +<b>__showError</b>(<i>out</i>) +<p> + Private slot to show some error. +</p><dl> +<dt><i>out</i></dt> +<dd> +error to be shown (string) +</dd> +</dl><a NAME="GitBisectLogBrowserDialog.closeEvent" ID="GitBisectLogBrowserDialog.closeEvent"></a> +<h4>GitBisectLogBrowserDialog.closeEvent</h4> +<b>closeEvent</b>(<i>e</i>) +<p> + Protected slot implementing a close event handler. +</p><dl> +<dt><i>e</i></dt> +<dd> +close event (QCloseEvent) +</dd> +</dl><a NAME="GitBisectLogBrowserDialog.keyPressEvent" ID="GitBisectLogBrowserDialog.keyPressEvent"></a> +<h4>GitBisectLogBrowserDialog.keyPressEvent</h4> +<b>keyPressEvent</b>(<i>evt</i>) +<p> + Protected slot to handle a key press event. +</p><dl> +<dt><i>evt</i></dt> +<dd> +the key press event (QKeyEvent) +</dd> +</dl><a NAME="GitBisectLogBrowserDialog.on_buttonBox_clicked" ID="GitBisectLogBrowserDialog.on_buttonBox_clicked"></a> +<h4>GitBisectLogBrowserDialog.on_buttonBox_clicked</h4> +<b>on_buttonBox_clicked</b>(<i>button</i>) +<p> + Private slot called by a button of the button box clicked. +</p><dl> +<dt><i>button</i></dt> +<dd> +button that was clicked (QAbstractButton) +</dd> +</dl><a NAME="GitBisectLogBrowserDialog.on_input_returnPressed" ID="GitBisectLogBrowserDialog.on_input_returnPressed"></a> +<h4>GitBisectLogBrowserDialog.on_input_returnPressed</h4> +<b>on_input_returnPressed</b>(<i></i>) +<p> + Private slot to handle the press of the return key in the input field. +</p><a NAME="GitBisectLogBrowserDialog.on_passwordCheckBox_toggled" ID="GitBisectLogBrowserDialog.on_passwordCheckBox_toggled"></a> +<h4>GitBisectLogBrowserDialog.on_passwordCheckBox_toggled</h4> +<b>on_passwordCheckBox_toggled</b>(<i>isOn</i>) +<p> + Private slot to handle the password checkbox toggled. +</p><dl> +<dt><i>isOn</i></dt> +<dd> +flag indicating the status of the check box (boolean) +</dd> +</dl><a NAME="GitBisectLogBrowserDialog.on_refreshButton_clicked" ID="GitBisectLogBrowserDialog.on_refreshButton_clicked"></a> +<h4>GitBisectLogBrowserDialog.on_refreshButton_clicked</h4> +<b>on_refreshButton_clicked</b>(<i></i>) +<p> + Private slot to refresh the log. +</p><a NAME="GitBisectLogBrowserDialog.on_sendButton_clicked" ID="GitBisectLogBrowserDialog.on_sendButton_clicked"></a> +<h4>GitBisectLogBrowserDialog.on_sendButton_clicked</h4> +<b>on_sendButton_clicked</b>(<i></i>) +<p> + Private slot to send the input to the git process. +</p><a NAME="GitBisectLogBrowserDialog.show" ID="GitBisectLogBrowserDialog.show"></a> +<h4>GitBisectLogBrowserDialog.show</h4> +<b>show</b>(<i></i>) +<p> + Public slot to show the dialog. +</p><a NAME="GitBisectLogBrowserDialog.start" ID="GitBisectLogBrowserDialog.start"></a> +<h4>GitBisectLogBrowserDialog.start</h4> +<b>start</b>(<i>projectdir</i>) +<p> + Public slot to start the git bisect log command. +</p><dl> +<dt><i>projectdir</i></dt> +<dd> +directory name of the project (string) +</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.GitBisectStartDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,117 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitBisectStartDialog</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.GitBisectStartDialog</h1> +<p> +Module implementing a dialog to enter the data for an extended bisect start. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitBisectStartDialog">GitBisectStartDialog</a></td> +<td>Class implementing a dialog to enter the data for an extended bisect start.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitBisectStartDialog" ID="GitBisectStartDialog"></a> +<h2>GitBisectStartDialog</h2> +<p> + Class implementing a dialog to enter the data for an extended bisect start. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitBisectStartDialog +<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="#GitBisectStartDialog.__init__">GitBisectStartDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitBisectStartDialog.__updateOK">__updateOK</a></td> +<td>Private method used to enable/disable the OK-button.</td> +</tr><tr> +<td><a href="#GitBisectStartDialog.getData">getData</a></td> +<td>Public method to get the entered data.</td> +</tr><tr> +<td><a href="#GitBisectStartDialog.on_badEdit_textChanged">on_badEdit_textChanged</a></td> +<td>Private slot to handle a change of the bad commit.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitBisectStartDialog.__init__" ID="GitBisectStartDialog.__init__"></a> +<h4>GitBisectStartDialog (Constructor)</h4> +<b>GitBisectStartDialog</b>(<i>parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd> +</dl><a NAME="GitBisectStartDialog.__updateOK" ID="GitBisectStartDialog.__updateOK"></a> +<h4>GitBisectStartDialog.__updateOK</h4> +<b>__updateOK</b>(<i></i>) +<p> + Private method used to enable/disable the OK-button. +</p><a NAME="GitBisectStartDialog.getData" ID="GitBisectStartDialog.getData"></a> +<h4>GitBisectStartDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to get the entered data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple containing a bad commit (string), a list of good + commits (list of strings) and a flag indicating to not + checkout the working tree (boolean) +</dd> +</dl><a NAME="GitBisectStartDialog.on_badEdit_textChanged" ID="GitBisectStartDialog.on_badEdit_textChanged"></a> +<h4>GitBisectStartDialog.on_badEdit_textChanged</h4> +<b>on_badEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle a change of the bad commit. +</p><dl> +<dt><i>txt</i></dt> +<dd> +bad commit entered (string) +</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.GitBlameDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,248 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitBlameDialog</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.GitBlameDialog</h1> +<p> +Module implementing a dialog to show the output of git blame. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitBlameDialog">GitBlameDialog</a></td> +<td>Class implementing a dialog to show the output of git blame.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitBlameDialog" ID="GitBlameDialog"></a> +<h2>GitBlameDialog</h2> +<p> + Class implementing a dialog to show the output of git blame. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitBlameDialog +<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="#GitBlameDialog.__init__">GitBlameDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitBlameDialog.__finish">__finish</a></td> +<td>Private slot called when the process finished or the user pressed the button.</td> +</tr><tr> +<td><a href="#GitBlameDialog.__generateItem">__generateItem</a></td> +<td>Private method to generate a blame item in the annotation list.</td> +</tr><tr> +<td><a href="#GitBlameDialog.__procFinished">__procFinished</a></td> +<td>Private slot connected to the finished signal.</td> +</tr><tr> +<td><a href="#GitBlameDialog.__readStderr">__readStderr</a></td> +<td>Private slot to handle the readyReadStderr signal.</td> +</tr><tr> +<td><a href="#GitBlameDialog.__readStdout">__readStdout</a></td> +<td>Private slot to handle the readyReadStdout signal.</td> +</tr><tr> +<td><a href="#GitBlameDialog.__resizeColumns">__resizeColumns</a></td> +<td>Private method to resize the list columns.</td> +</tr><tr> +<td><a href="#GitBlameDialog.closeEvent">closeEvent</a></td> +<td>Protected slot implementing a close event handler.</td> +</tr><tr> +<td><a href="#GitBlameDialog.keyPressEvent">keyPressEvent</a></td> +<td>Protected slot to handle a key press event.</td> +</tr><tr> +<td><a href="#GitBlameDialog.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="#GitBlameDialog.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> +<td><a href="#GitBlameDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> +<td>Private slot to handle the password checkbox toggled.</td> +</tr><tr> +<td><a href="#GitBlameDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> +<td>Private slot to send the input to the git process.</td> +</tr><tr> +<td><a href="#GitBlameDialog.start">start</a></td> +<td>Public slot to start the blame command.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitBlameDialog.__init__" ID="GitBlameDialog.__init__"></a> +<h4>GitBlameDialog (Constructor)</h4> +<b>GitBlameDialog</b>(<i>vcs, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>vcs</i></dt> +<dd> +reference to the vcs object +</dd><dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd> +</dl><a NAME="GitBlameDialog.__finish" ID="GitBlameDialog.__finish"></a> +<h4>GitBlameDialog.__finish</h4> +<b>__finish</b>(<i></i>) +<p> + Private slot called when the process finished or the user pressed + the button. +</p><a NAME="GitBlameDialog.__generateItem" ID="GitBlameDialog.__generateItem"></a> +<h4>GitBlameDialog.__generateItem</h4> +<b>__generateItem</b>(<i>commitId, author, date, time, lineno, text</i>) +<p> + Private method to generate a blame item in the annotation list. +</p><dl> +<dt><i>commitId</i></dt> +<dd> +commit identifier (string) +</dd><dt><i>author</i></dt> +<dd> +author of the change (string) +</dd><dt><i>date</i></dt> +<dd> +date of the change (string) +</dd><dt><i>time</i></dt> +<dd> +time of the change (string) +</dd><dt><i>lineno</i></dt> +<dd> +line number of the change (string) +</dd><dt><i>text</i></dt> +<dd> +name (path) of the tag (string) +</dd> +</dl><a NAME="GitBlameDialog.__procFinished" ID="GitBlameDialog.__procFinished"></a> +<h4>GitBlameDialog.__procFinished</h4> +<b>__procFinished</b>(<i>exitCode, exitStatus</i>) +<p> + Private slot connected to the finished signal. +</p><dl> +<dt><i>exitCode</i></dt> +<dd> +exit code of the process (integer) +</dd><dt><i>exitStatus</i></dt> +<dd> +exit status of the process (QProcess.ExitStatus) +</dd> +</dl><a NAME="GitBlameDialog.__readStderr" ID="GitBlameDialog.__readStderr"></a> +<h4>GitBlameDialog.__readStderr</h4> +<b>__readStderr</b>(<i></i>) +<p> + Private slot to handle the readyReadStderr signal. +</p><p> + It reads the error output of the process and inserts it into the + error pane. +</p><a NAME="GitBlameDialog.__readStdout" ID="GitBlameDialog.__readStdout"></a> +<h4>GitBlameDialog.__readStdout</h4> +<b>__readStdout</b>(<i></i>) +<p> + Private slot to handle the readyReadStdout signal. +</p><p> + It reads the output of the process, formats it and inserts it into + the annotation list. +</p><a NAME="GitBlameDialog.__resizeColumns" ID="GitBlameDialog.__resizeColumns"></a> +<h4>GitBlameDialog.__resizeColumns</h4> +<b>__resizeColumns</b>(<i></i>) +<p> + Private method to resize the list columns. +</p><a NAME="GitBlameDialog.closeEvent" ID="GitBlameDialog.closeEvent"></a> +<h4>GitBlameDialog.closeEvent</h4> +<b>closeEvent</b>(<i>e</i>) +<p> + Protected slot implementing a close event handler. +</p><dl> +<dt><i>e</i></dt> +<dd> +close event (QCloseEvent) +</dd> +</dl><a NAME="GitBlameDialog.keyPressEvent" ID="GitBlameDialog.keyPressEvent"></a> +<h4>GitBlameDialog.keyPressEvent</h4> +<b>keyPressEvent</b>(<i>evt</i>) +<p> + Protected slot to handle a key press event. +</p><dl> +<dt><i>evt</i></dt> +<dd> +the key press event (QKeyEvent) +</dd> +</dl><a NAME="GitBlameDialog.on_buttonBox_clicked" ID="GitBlameDialog.on_buttonBox_clicked"></a> +<h4>GitBlameDialog.on_buttonBox_clicked</h4> +<b>on_buttonBox_clicked</b>(<i>button</i>) +<p> + Private slot called by a button of the button box clicked. +</p><dl> +<dt><i>button</i></dt> +<dd> +button that was clicked (QAbstractButton) +</dd> +</dl><a NAME="GitBlameDialog.on_input_returnPressed" ID="GitBlameDialog.on_input_returnPressed"></a> +<h4>GitBlameDialog.on_input_returnPressed</h4> +<b>on_input_returnPressed</b>(<i></i>) +<p> + Private slot to handle the press of the return key in the input field. +</p><a NAME="GitBlameDialog.on_passwordCheckBox_toggled" ID="GitBlameDialog.on_passwordCheckBox_toggled"></a> +<h4>GitBlameDialog.on_passwordCheckBox_toggled</h4> +<b>on_passwordCheckBox_toggled</b>(<i>checked</i>) +<p> + Private slot to handle the password checkbox toggled. +</p><dl> +<dt><i>checked</i></dt> +<dd> +flag indicating the status of the check box (boolean) +</dd> +</dl><a NAME="GitBlameDialog.on_sendButton_clicked" ID="GitBlameDialog.on_sendButton_clicked"></a> +<h4>GitBlameDialog.on_sendButton_clicked</h4> +<b>on_sendButton_clicked</b>(<i></i>) +<p> + Private slot to send the input to the git process. +</p><a NAME="GitBlameDialog.start" ID="GitBlameDialog.start"></a> +<h4>GitBlameDialog.start</h4> +<b>start</b>(<i>fn</i>) +<p> + Public slot to start the blame command. +</p><dl> +<dt><i>fn</i></dt> +<dd> +filename to show the blame for (string) +</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.GitBranchDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,181 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitBranchDialog</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.GitBranchDialog</h1> +<p> +Module implementing a dialog to enter the data for a branching operation. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitBranchDialog">GitBranchDialog</a></td> +<td>Class implementing a dialog to enter the data for a branching operation.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitBranchDialog" ID="GitBranchDialog"></a> +<h2>GitBranchDialog</h2> +<p> + Class implementing a dialog to enter the data for a branching operation. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitBranchDialog +<h3>Class Attributes</h3> +<table> +<tr><td>CreateBranch</td></tr><tr><td>CreateSwitchBranch</td></tr><tr><td>CreateTrackingBranch</td></tr><tr><td>DeleteBranch</td></tr><tr><td>RenameBranch</td></tr><tr><td>SetTrackingBranch</td></tr><tr><td>UnsetTrackingBranch</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#GitBranchDialog.__init__">GitBranchDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitBranchDialog.__updateOK">__updateOK</a></td> +<td>Private method used to enable/disable the OK-button.</td> +</tr><tr> +<td><a href="#GitBranchDialog.getParameters">getParameters</a></td> +<td>Public method to retrieve the branch data.</td> +</tr><tr> +<td><a href="#GitBranchDialog.on_branchCombo_editTextChanged">on_branchCombo_editTextChanged</a></td> +<td>Private slot to handle a change of the branch.</td> +</tr><tr> +<td><a href="#GitBranchDialog.on_createTrackingButton_toggled">on_createTrackingButton_toggled</a></td> +<td>Private slot to handle the selection of creating a tracking branch.</td> +</tr><tr> +<td><a href="#GitBranchDialog.on_newBranchNameEdit_textChanged">on_newBranchNameEdit_textChanged</a></td> +<td>Private slot to handle a change of the new branch.</td> +</tr><tr> +<td><a href="#GitBranchDialog.on_setTrackingButton_toggled">on_setTrackingButton_toggled</a></td> +<td>Private slot to handle the selection of setting a tracking branch.</td> +</tr><tr> +<td><a href="#GitBranchDialog.on_unsetTrackingButton_toggled">on_unsetTrackingButton_toggled</a></td> +<td>Private slot to handle the selection of unsetting a tracking branch.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitBranchDialog.__init__" ID="GitBranchDialog.__init__"></a> +<h4>GitBranchDialog (Constructor)</h4> +<b>GitBranchDialog</b>(<i>branchlist, revision=None, branchName=None, branchOp=None, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>branchlist</i></dt> +<dd> +list of previously entered branches (list of strings) +</dd><dt><i>revision</i></dt> +<dd> +revision to set tag for (string) +</dd><dt><i>branchName</i></dt> +<dd> +name of the branch (string) +</dd><dt><i>branchOp</i></dt> +<dd> +desired branch operation (integer) +</dd><dt><i>parent</i></dt> +<dd> +parent widget (QWidget) +</dd> +</dl><a NAME="GitBranchDialog.__updateOK" ID="GitBranchDialog.__updateOK"></a> +<h4>GitBranchDialog.__updateOK</h4> +<b>__updateOK</b>(<i></i>) +<p> + Private method used to enable/disable the OK-button. +</p><a NAME="GitBranchDialog.getParameters" ID="GitBranchDialog.getParameters"></a> +<h4>GitBranchDialog.getParameters</h4> +<b>getParameters</b>(<i></i>) +<p> + Public method to retrieve the branch data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple of an int, four strings and a boolean + (branch operation, branch name, revision, new branch name, + remote branch name, enforce operation) +</dd> +</dl><a NAME="GitBranchDialog.on_branchCombo_editTextChanged" ID="GitBranchDialog.on_branchCombo_editTextChanged"></a> +<h4>GitBranchDialog.on_branchCombo_editTextChanged</h4> +<b>on_branchCombo_editTextChanged</b>(<i>text</i>) +<p> + Private slot to handle a change of the branch. +</p><dl> +<dt><i>text</i></dt> +<dd> +branch name entered in the combo (string) +</dd> +</dl><a NAME="GitBranchDialog.on_createTrackingButton_toggled" ID="GitBranchDialog.on_createTrackingButton_toggled"></a> +<h4>GitBranchDialog.on_createTrackingButton_toggled</h4> +<b>on_createTrackingButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle the selection of creating a tracking branch. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the selection (boolean) +</dd> +</dl><a NAME="GitBranchDialog.on_newBranchNameEdit_textChanged" ID="GitBranchDialog.on_newBranchNameEdit_textChanged"></a> +<h4>GitBranchDialog.on_newBranchNameEdit_textChanged</h4> +<b>on_newBranchNameEdit_textChanged</b>(<i>text</i>) +<p> + Private slot to handle a change of the new branch. +</p><dl> +<dt><i>text</i></dt> +<dd> +new branch name entered (string) +</dd> +</dl><a NAME="GitBranchDialog.on_setTrackingButton_toggled" ID="GitBranchDialog.on_setTrackingButton_toggled"></a> +<h4>GitBranchDialog.on_setTrackingButton_toggled</h4> +<b>on_setTrackingButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle the selection of setting a tracking branch. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the selection (boolean) +</dd> +</dl><a NAME="GitBranchDialog.on_unsetTrackingButton_toggled" ID="GitBranchDialog.on_unsetTrackingButton_toggled"></a> +<h4>GitBranchDialog.on_unsetTrackingButton_toggled</h4> +<b>on_unsetTrackingButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle the selection of unsetting a tracking branch. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the selection (boolean) +</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.GitBranchPushDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,117 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitBranchPushDialog</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.GitBranchPushDialog</h1> +<p> +Module implementing a dialog to select the data for pushing a branch. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitBranchPushDialog">GitBranchPushDialog</a></td> +<td>Class implementing a dialog to select the data for pushing a branch.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitBranchPushDialog" ID="GitBranchPushDialog"></a> +<h2>GitBranchPushDialog</h2> +<p> + Class implementing a dialog to select the data for pushing a branch. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitBranchPushDialog +<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="#GitBranchPushDialog.__init__">GitBranchPushDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitBranchPushDialog.getData">getData</a></td> +<td>Public method to get the selected data.</td> +</tr><tr> +<td><a href="#GitBranchPushDialog.on_branchComboBox_editTextChanged">on_branchComboBox_editTextChanged</a></td> +<td>Private slot to handle a change of the branch name.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitBranchPushDialog.__init__" ID="GitBranchPushDialog.__init__"></a> +<h4>GitBranchPushDialog (Constructor)</h4> +<b>GitBranchPushDialog</b>(<i>branches, remotes, delete=False, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>branches</i></dt> +<dd> +list of branch names (list of string) +</dd><dt><i>remotes</i></dt> +<dd> +list of remote names (list of string) +</dd><dt><i>delete</i></dt> +<dd> +flag indicating a delete branch action (boolean) +</dd><dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd> +</dl><a NAME="GitBranchPushDialog.getData" ID="GitBranchPushDialog.getData"></a> +<h4>GitBranchPushDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to get the selected data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple of selected branch name, remote name and a flag + indicating all branches (tuple of two strings and a boolean) +</dd> +</dl><a NAME="GitBranchPushDialog.on_branchComboBox_editTextChanged" ID="GitBranchPushDialog.on_branchComboBox_editTextChanged"></a> +<h4>GitBranchPushDialog.on_branchComboBox_editTextChanged</h4> +<b>on_branchComboBox_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle a change of the branch name. +</p><dl> +<dt><i>txt</i></dt> +<dd> +branch name (string) +</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.GitBundleDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,186 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitBundleDialog</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.GitBundleDialog</h1> +<p> +Module implementing a dialog to enter the data for a bundle operation. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitBundleDialog">GitBundleDialog</a></td> +<td>Class implementing a dialog to enter the data for a bundle operation.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitBundleDialog" ID="GitBundleDialog"></a> +<h2>GitBundleDialog</h2> +<p> + Class implementing a dialog to enter the data for a bundle operation. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitBundleDialog +<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="#GitBundleDialog.__init__">GitBundleDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitBundleDialog.__updateOK">__updateOK</a></td> +<td>Private slot to update the OK button.</td> +</tr><tr> +<td><a href="#GitBundleDialog.getData">getData</a></td> +<td>Public method to retrieve the bundle data.</td> +</tr><tr> +<td><a href="#GitBundleDialog.on_branchButton_toggled">on_branchButton_toggled</a></td> +<td>Private slot to handle changes of the Branch select button.</td> +</tr><tr> +<td><a href="#GitBundleDialog.on_branchCombo_editTextChanged">on_branchCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Branch combo.</td> +</tr><tr> +<td><a href="#GitBundleDialog.on_revisionsButton_toggled">on_revisionsButton_toggled</a></td> +<td>Private slot to handle changes of the revisions select button.</td> +</tr><tr> +<td><a href="#GitBundleDialog.on_revisionsEdit_textChanged">on_revisionsEdit_textChanged</a></td> +<td>Private slot to handle changes of the Revisions edit.</td> +</tr><tr> +<td><a href="#GitBundleDialog.on_tagButton_toggled">on_tagButton_toggled</a></td> +<td>Private slot to handle changes of the Tag select button.</td> +</tr><tr> +<td><a href="#GitBundleDialog.on_tagCombo_editTextChanged">on_tagCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Tag combo.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitBundleDialog.__init__" ID="GitBundleDialog.__init__"></a> +<h4>GitBundleDialog (Constructor)</h4> +<b>GitBundleDialog</b>(<i>tagsList, branchesList, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>tagsList</i></dt> +<dd> +list of tags (list of strings) +</dd><dt><i>branchesList</i></dt> +<dd> +list of branches (list of strings) +</dd><dt><i>parent</i></dt> +<dd> +parent widget (QWidget) +</dd> +</dl><a NAME="GitBundleDialog.__updateOK" ID="GitBundleDialog.__updateOK"></a> +<h4>GitBundleDialog.__updateOK</h4> +<b>__updateOK</b>(<i></i>) +<p> + Private slot to update the OK button. +</p><a NAME="GitBundleDialog.getData" ID="GitBundleDialog.getData"></a> +<h4>GitBundleDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to retrieve the bundle data. +</p><dl> +<dt>Returns:</dt> +<dd> +list of revision expressions (list of strings) +</dd> +</dl><a NAME="GitBundleDialog.on_branchButton_toggled" ID="GitBundleDialog.on_branchButton_toggled"></a> +<h4>GitBundleDialog.on_branchButton_toggled</h4> +<b>on_branchButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Branch select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="GitBundleDialog.on_branchCombo_editTextChanged" ID="GitBundleDialog.on_branchCombo_editTextChanged"></a> +<h4>GitBundleDialog.on_branchCombo_editTextChanged</h4> +<b>on_branchCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Branch combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl><a NAME="GitBundleDialog.on_revisionsButton_toggled" ID="GitBundleDialog.on_revisionsButton_toggled"></a> +<h4>GitBundleDialog.on_revisionsButton_toggled</h4> +<b>on_revisionsButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the revisions select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="GitBundleDialog.on_revisionsEdit_textChanged" ID="GitBundleDialog.on_revisionsEdit_textChanged"></a> +<h4>GitBundleDialog.on_revisionsEdit_textChanged</h4> +<b>on_revisionsEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Revisions edit. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the line edit (string) +</dd> +</dl><a NAME="GitBundleDialog.on_tagButton_toggled" ID="GitBundleDialog.on_tagButton_toggled"></a> +<h4>GitBundleDialog.on_tagButton_toggled</h4> +<b>on_tagButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Tag select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="GitBundleDialog.on_tagCombo_editTextChanged" ID="GitBundleDialog.on_tagCombo_editTextChanged"></a> +<h4>GitBundleDialog.on_tagCombo_editTextChanged</h4> +<b>on_tagCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Tag combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</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.GitCherryPickDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,109 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitCherryPickDialog</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.GitCherryPickDialog</h1> +<p> +Module implementing a dialog to enter cherry-pick data. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitCherryPickDialog">GitCherryPickDialog</a></td> +<td>Class implementing a dialog to enter cherry-pick data.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitCherryPickDialog" ID="GitCherryPickDialog"></a> +<h2>GitCherryPickDialog</h2> +<p> + Class implementing a dialog to enter cherry-pick data. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitCherryPickDialog +<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="#GitCherryPickDialog.__init__">GitCherryPickDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitCherryPickDialog.getData">getData</a></td> +<td>Public method to retrieve the entered data.</td> +</tr><tr> +<td><a href="#GitCherryPickDialog.on_commitsEdit_textChanged">on_commitsEdit_textChanged</a></td> +<td>Private slot to react upon changes of commits.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitCherryPickDialog.__init__" ID="GitCherryPickDialog.__init__"></a> +<h4>GitCherryPickDialog (Constructor)</h4> +<b>GitCherryPickDialog</b>(<i>commits=None, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>commits</i></dt> +<dd> +list of commits to show in the commits pane (list of + strings) +</dd><dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd> +</dl><a NAME="GitCherryPickDialog.getData" ID="GitCherryPickDialog.getData"></a> +<h4>GitCherryPickDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to retrieve the entered data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple with list of commits, a flag indicating to append + cherry-pick info to the commit message, a flag indicating to append + a signed-off-by line to the commit message and a flag indicating to + not commit the action (list of strings, boolean, boolean, boolean) +</dd> +</dl><a NAME="GitCherryPickDialog.on_commitsEdit_textChanged" ID="GitCherryPickDialog.on_commitsEdit_textChanged"></a> +<h4>GitCherryPickDialog.on_commitsEdit_textChanged</h4> +<b>on_commitsEdit_textChanged</b>(<i></i>) +<p> + Private slot to react upon changes of commits. +</p> +<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.GitCommandDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,117 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitCommandDialog</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.GitCommandDialog</h1> +<p> +Module implementing the Git command dialog. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitCommandDialog">GitCommandDialog</a></td> +<td>Class implementing the Git command dialog.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitCommandDialog" ID="GitCommandDialog"></a> +<h2>GitCommandDialog</h2> +<p> + Class implementing the Git command dialog. +</p><p> + It implements a dialog that is used to enter an + arbitrary Git command. It asks the user to enter + the commandline parameters. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitCommandDialog +<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="#GitCommandDialog.__init__">GitCommandDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitCommandDialog.getData">getData</a></td> +<td>Public method to retrieve the data entered into this dialog.</td> +</tr><tr> +<td><a href="#GitCommandDialog.on_commandCombo_editTextChanged">on_commandCombo_editTextChanged</a></td> +<td>Private method used to enable/disable the OK-button.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitCommandDialog.__init__" ID="GitCommandDialog.__init__"></a> +<h4>GitCommandDialog (Constructor)</h4> +<b>GitCommandDialog</b>(<i>argvList, ppath, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>argvList</i></dt> +<dd> +history list of commandline arguments (list of strings) +</dd><dt><i>ppath</i></dt> +<dd> +pathname of the project directory (string) +</dd><dt><i>parent</i></dt> +<dd> +parent widget of this dialog (QWidget) +</dd> +</dl><a NAME="GitCommandDialog.getData" ID="GitCommandDialog.getData"></a> +<h4>GitCommandDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to retrieve the data entered into this dialog. +</p><dl> +<dt>Returns:</dt> +<dd> +commandline parameters (string) +</dd> +</dl><a NAME="GitCommandDialog.on_commandCombo_editTextChanged" ID="GitCommandDialog.on_commandCombo_editTextChanged"></a> +<h4>GitCommandDialog.on_commandCombo_editTextChanged</h4> +<b>on_commandCombo_editTextChanged</b>(<i>text</i>) +<p> + Private method used to enable/disable the OK-button. +</p><dl> +<dt><i>text</i></dt> +<dd> +ignored +</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.GitCommitDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,209 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitCommitDialog</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.GitCommitDialog</h1> +<p> +Module implementing a dialog to enter the commit message. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitCommitDialog">GitCommitDialog</a></td> +<td>Class implementing a dialog to enter the commit message.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitCommitDialog" ID="GitCommitDialog"></a> +<h2>GitCommitDialog</h2> +<p> + Class implementing a dialog to enter the commit message. +</p><h3>Signals</h3> +<dl> +<dt>accepted()</dt> +<dd> +emitted, if the dialog was accepted +</dd><dt>rejected()</dt> +<dd> +emitted, if the dialog was rejected +</dd> +</dl> +<h3>Derived from</h3> +QWidget, Ui_GitCommitDialog +<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="#GitCommitDialog.__init__">GitCommitDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitCommitDialog.amend">amend</a></td> +<td>Public method to retrieve the state of the amend flag.</td> +</tr><tr> +<td><a href="#GitCommitDialog.logMessage">logMessage</a></td> +<td>Public method to retrieve the log message.</td> +</tr><tr> +<td><a href="#GitCommitDialog.on_buttonBox_accepted">on_buttonBox_accepted</a></td> +<td>Private slot called by the buttonBox accepted signal.</td> +</tr><tr> +<td><a href="#GitCommitDialog.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="#GitCommitDialog.on_buttonBox_rejected">on_buttonBox_rejected</a></td> +<td>Private slot called by the buttonBox rejected signal.</td> +</tr><tr> +<td><a href="#GitCommitDialog.on_recentComboBox_activated">on_recentComboBox_activated</a></td> +<td>Private slot to select a commit message from recent ones.</td> +</tr><tr> +<td><a href="#GitCommitDialog.resetAuthor">resetAuthor</a></td> +<td>Public method to retrieve the state of the reset author flag.</td> +</tr><tr> +<td><a href="#GitCommitDialog.showEvent">showEvent</a></td> +<td>Protected method called when the dialog is about to be shown.</td> +</tr><tr> +<td><a href="#GitCommitDialog.stagedOnly">stagedOnly</a></td> +<td>Public method to retrieve the state of the staged only flag.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitCommitDialog.__init__" ID="GitCommitDialog.__init__"></a> +<h4>GitCommitDialog (Constructor)</h4> +<b>GitCommitDialog</b>(<i>vcs, msg, amend, commitAll, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>vcs</i></dt> +<dd> +reference to the vcs object +</dd><dt><i>msg</i></dt> +<dd> +initial message (string) +</dd><dt><i>amend</i></dt> +<dd> +flag indicating to amend the HEAD commit (boolean) +</dd><dt><i>commitAll</i></dt> +<dd> +flag indicating to commit all local changes (boolean) +</dd><dt><i>parent</i></dt> +<dd> +parent widget (QWidget) +</dd> +</dl><a NAME="GitCommitDialog.amend" ID="GitCommitDialog.amend"></a> +<h4>GitCommitDialog.amend</h4> +<b>amend</b>(<i></i>) +<p> + Public method to retrieve the state of the amend flag. +</p><dl> +<dt>Returns:</dt> +<dd> +state of the amend flag (boolean) +</dd> +</dl><a NAME="GitCommitDialog.logMessage" ID="GitCommitDialog.logMessage"></a> +<h4>GitCommitDialog.logMessage</h4> +<b>logMessage</b>(<i></i>) +<p> + Public method to retrieve the log message. +</p><dl> +<dt>Returns:</dt> +<dd> +the log message (string) +</dd> +</dl><a NAME="GitCommitDialog.on_buttonBox_accepted" ID="GitCommitDialog.on_buttonBox_accepted"></a> +<h4>GitCommitDialog.on_buttonBox_accepted</h4> +<b>on_buttonBox_accepted</b>(<i></i>) +<p> + Private slot called by the buttonBox accepted signal. +</p><a NAME="GitCommitDialog.on_buttonBox_clicked" ID="GitCommitDialog.on_buttonBox_clicked"></a> +<h4>GitCommitDialog.on_buttonBox_clicked</h4> +<b>on_buttonBox_clicked</b>(<i>button</i>) +<p> + Private slot called by a button of the button box clicked. +</p><dl> +<dt><i>button</i></dt> +<dd> +button that was clicked (QAbstractButton) +</dd> +</dl><a NAME="GitCommitDialog.on_buttonBox_rejected" ID="GitCommitDialog.on_buttonBox_rejected"></a> +<h4>GitCommitDialog.on_buttonBox_rejected</h4> +<b>on_buttonBox_rejected</b>(<i></i>) +<p> + Private slot called by the buttonBox rejected signal. +</p><a NAME="GitCommitDialog.on_recentComboBox_activated" ID="GitCommitDialog.on_recentComboBox_activated"></a> +<h4>GitCommitDialog.on_recentComboBox_activated</h4> +<b>on_recentComboBox_activated</b>(<i>txt</i>) +<p> + Private slot to select a commit message from recent ones. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the selected entry (string) +</dd> +</dl><a NAME="GitCommitDialog.resetAuthor" ID="GitCommitDialog.resetAuthor"></a> +<h4>GitCommitDialog.resetAuthor</h4> +<b>resetAuthor</b>(<i></i>) +<p> + Public method to retrieve the state of the reset author flag. +</p><dl> +<dt>Returns:</dt> +<dd> +state of the reset author flag (boolean) +</dd> +</dl><a NAME="GitCommitDialog.showEvent" ID="GitCommitDialog.showEvent"></a> +<h4>GitCommitDialog.showEvent</h4> +<b>showEvent</b>(<i>evt</i>) +<p> + Protected method called when the dialog is about to be shown. +</p><dl> +<dt><i>evt</i></dt> +<dd> +the event (QShowEvent) +</dd> +</dl><a NAME="GitCommitDialog.stagedOnly" ID="GitCommitDialog.stagedOnly"></a> +<h4>GitCommitDialog.stagedOnly</h4> +<b>stagedOnly</b>(<i></i>) +<p> + Public method to retrieve the state of the staged only flag. +</p><dl> +<dt>Returns:</dt> +<dd> +state of the staged only flag (boolean) +</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.GitCopyDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,124 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitCopyDialog</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.GitCopyDialog</h1> +<p> +Module implementing a dialog to enter the data for a copy or rename operation. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitCopyDialog">GitCopyDialog</a></td> +<td>Class implementing a dialog to enter the data for a copy or rename operation.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitCopyDialog" ID="GitCopyDialog"></a> +<h2>GitCopyDialog</h2> +<p> + Class implementing a dialog to enter the data for a copy or rename + operation. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitCopyDialog +<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="#GitCopyDialog.__init__">GitCopyDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitCopyDialog.getData">getData</a></td> +<td>Public method to retrieve the copy data.</td> +</tr><tr> +<td><a href="#GitCopyDialog.on_dirButton_clicked">on_dirButton_clicked</a></td> +<td>Private slot to handle the button press for selecting the target via a selection dialog.</td> +</tr><tr> +<td><a href="#GitCopyDialog.on_targetEdit_textChanged">on_targetEdit_textChanged</a></td> +<td>Private slot to handle changes of the target.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitCopyDialog.__init__" ID="GitCopyDialog.__init__"></a> +<h4>GitCopyDialog (Constructor)</h4> +<b>GitCopyDialog</b>(<i>source, parent=None, move=False</i>) +<p> + Constructor +</p><dl> +<dt><i>source</i></dt> +<dd> +name of the source file/directory (string) +</dd><dt><i>parent</i></dt> +<dd> +parent widget (QWidget) +</dd><dt><i>move</i></dt> +<dd> +flag indicating a move operation (boolean) +</dd> +</dl><a NAME="GitCopyDialog.getData" ID="GitCopyDialog.getData"></a> +<h4>GitCopyDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to retrieve the copy data. +</p><dl> +<dt>Returns:</dt> +<dd> +the target name (string) and a flag indicating + the operation should be enforced (boolean) +</dd> +</dl><a NAME="GitCopyDialog.on_dirButton_clicked" ID="GitCopyDialog.on_dirButton_clicked"></a> +<h4>GitCopyDialog.on_dirButton_clicked</h4> +<b>on_dirButton_clicked</b>(<i></i>) +<p> + Private slot to handle the button press for selecting the target via a + selection dialog. +</p><a NAME="GitCopyDialog.on_targetEdit_textChanged" ID="GitCopyDialog.on_targetEdit_textChanged"></a> +<h4>GitCopyDialog.on_targetEdit_textChanged</h4> +<b>on_targetEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the target. +</p><dl> +<dt><i>txt</i></dt> +<dd> +contents of the target edit (string) +</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.GitDescribeDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,231 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitDescribeDialog</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.GitDescribeDialog</h1> +<p> +Module implementing a dialog to show the results of the git describe action. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitDescribeDialog">GitDescribeDialog</a></td> +<td>Class implementing a dialog to show the results of the git describe action.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitDescribeDialog" ID="GitDescribeDialog"></a> +<h2>GitDescribeDialog</h2> +<p> + Class implementing a dialog to show the results of the git describe action. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitDescribeDialog +<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="#GitDescribeDialog.__init__">GitDescribeDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitDescribeDialog.__finish">__finish</a></td> +<td>Private slot called when the process finished or the user pressed the button.</td> +</tr><tr> +<td><a href="#GitDescribeDialog.__procFinished">__procFinished</a></td> +<td>Private slot connected to the finished signal.</td> +</tr><tr> +<td><a href="#GitDescribeDialog.__readStderr">__readStderr</a></td> +<td>Private slot to handle the readyReadStderr signal.</td> +</tr><tr> +<td><a href="#GitDescribeDialog.__readStdout">__readStdout</a></td> +<td>Private slot to handle the readyReadStdout signal.</td> +</tr><tr> +<td><a href="#GitDescribeDialog.__resizeColumns">__resizeColumns</a></td> +<td>Private method to resize the list columns.</td> +</tr><tr> +<td><a href="#GitDescribeDialog.__resort">__resort</a></td> +<td>Private method to resort the tree.</td> +</tr><tr> +<td><a href="#GitDescribeDialog.closeEvent">closeEvent</a></td> +<td>Protected slot implementing a close event handler.</td> +</tr><tr> +<td><a href="#GitDescribeDialog.keyPressEvent">keyPressEvent</a></td> +<td>Protected slot to handle a key press event.</td> +</tr><tr> +<td><a href="#GitDescribeDialog.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="#GitDescribeDialog.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> +<td><a href="#GitDescribeDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> +<td>Private slot to handle the password checkbox toggled.</td> +</tr><tr> +<td><a href="#GitDescribeDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> +<td>Private slot to send the input to the git process.</td> +</tr><tr> +<td><a href="#GitDescribeDialog.start">start</a></td> +<td>Public slot to start the tag/branch list command.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitDescribeDialog.__init__" ID="GitDescribeDialog.__init__"></a> +<h4>GitDescribeDialog (Constructor)</h4> +<b>GitDescribeDialog</b>(<i>vcs, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>vcs</i></dt> +<dd> +reference to the vcs object +</dd><dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd> +</dl><a NAME="GitDescribeDialog.__finish" ID="GitDescribeDialog.__finish"></a> +<h4>GitDescribeDialog.__finish</h4> +<b>__finish</b>(<i></i>) +<p> + Private slot called when the process finished or the user pressed + the button. +</p><a NAME="GitDescribeDialog.__procFinished" ID="GitDescribeDialog.__procFinished"></a> +<h4>GitDescribeDialog.__procFinished</h4> +<b>__procFinished</b>(<i>exitCode, exitStatus</i>) +<p> + Private slot connected to the finished signal. +</p><dl> +<dt><i>exitCode</i></dt> +<dd> +exit code of the process (integer) +</dd><dt><i>exitStatus</i></dt> +<dd> +exit status of the process (QProcess.ExitStatus) +</dd> +</dl><a NAME="GitDescribeDialog.__readStderr" ID="GitDescribeDialog.__readStderr"></a> +<h4>GitDescribeDialog.__readStderr</h4> +<b>__readStderr</b>(<i></i>) +<p> + Private slot to handle the readyReadStderr signal. +</p><p> + It reads the error output of the process and inserts it into the + error pane. +</p><a NAME="GitDescribeDialog.__readStdout" ID="GitDescribeDialog.__readStdout"></a> +<h4>GitDescribeDialog.__readStdout</h4> +<b>__readStdout</b>(<i></i>) +<p> + Private slot to handle the readyReadStdout signal. +</p><p> + It reads the output of the process, formats it and inserts it into + the contents pane. +</p><a NAME="GitDescribeDialog.__resizeColumns" ID="GitDescribeDialog.__resizeColumns"></a> +<h4>GitDescribeDialog.__resizeColumns</h4> +<b>__resizeColumns</b>(<i></i>) +<p> + Private method to resize the list columns. +</p><a NAME="GitDescribeDialog.__resort" ID="GitDescribeDialog.__resort"></a> +<h4>GitDescribeDialog.__resort</h4> +<b>__resort</b>(<i></i>) +<p> + Private method to resort the tree. +</p><a NAME="GitDescribeDialog.closeEvent" ID="GitDescribeDialog.closeEvent"></a> +<h4>GitDescribeDialog.closeEvent</h4> +<b>closeEvent</b>(<i>e</i>) +<p> + Protected slot implementing a close event handler. +</p><dl> +<dt><i>e</i></dt> +<dd> +close event (QCloseEvent) +</dd> +</dl><a NAME="GitDescribeDialog.keyPressEvent" ID="GitDescribeDialog.keyPressEvent"></a> +<h4>GitDescribeDialog.keyPressEvent</h4> +<b>keyPressEvent</b>(<i>evt</i>) +<p> + Protected slot to handle a key press event. +</p><dl> +<dt><i>evt</i></dt> +<dd> +the key press event (QKeyEvent) +</dd> +</dl><a NAME="GitDescribeDialog.on_buttonBox_clicked" ID="GitDescribeDialog.on_buttonBox_clicked"></a> +<h4>GitDescribeDialog.on_buttonBox_clicked</h4> +<b>on_buttonBox_clicked</b>(<i>button</i>) +<p> + Private slot called by a button of the button box clicked. +</p><dl> +<dt><i>button</i></dt> +<dd> +button that was clicked (QAbstractButton) +</dd> +</dl><a NAME="GitDescribeDialog.on_input_returnPressed" ID="GitDescribeDialog.on_input_returnPressed"></a> +<h4>GitDescribeDialog.on_input_returnPressed</h4> +<b>on_input_returnPressed</b>(<i></i>) +<p> + Private slot to handle the press of the return key in the input field. +</p><a NAME="GitDescribeDialog.on_passwordCheckBox_toggled" ID="GitDescribeDialog.on_passwordCheckBox_toggled"></a> +<h4>GitDescribeDialog.on_passwordCheckBox_toggled</h4> +<b>on_passwordCheckBox_toggled</b>(<i>isOn</i>) +<p> + Private slot to handle the password checkbox toggled. +</p><dl> +<dt><i>isOn</i></dt> +<dd> +flag indicating the status of the check box (boolean) +</dd> +</dl><a NAME="GitDescribeDialog.on_sendButton_clicked" ID="GitDescribeDialog.on_sendButton_clicked"></a> +<h4>GitDescribeDialog.on_sendButton_clicked</h4> +<b>on_sendButton_clicked</b>(<i></i>) +<p> + Private slot to send the input to the git process. +</p><a NAME="GitDescribeDialog.start" ID="GitDescribeDialog.start"></a> +<h4>GitDescribeDialog.start</h4> +<b>start</b>(<i>path, commits</i>) +<p> + Public slot to start the tag/branch list command. +</p><dl> +<dt><i>path</i></dt> +<dd> +name of directory to be listed (string) +</dd><dt><i>commits</i></dt> +<dd> +list of commits to be described (list of string) +</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.GitDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,287 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitDialog</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.GitDialog</h1> +<p> +Module implementing a dialog starting a process and showing its output. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitDialog">GitDialog</a></td> +<td>Class implementing a dialog starting a process and showing its output.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitDialog" ID="GitDialog"></a> +<h2>GitDialog</h2> +<p> + Class implementing a dialog starting a process and showing its output. +</p><p> + It starts a QProcess and displays a dialog that + shows the output of the process. The dialog is modal, + which causes a synchronized execution of the process. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitDialog +<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="#GitDialog.__init__">GitDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitDialog.__finish">__finish</a></td> +<td>Private slot called when the process finished or the user pressed the button.</td> +</tr><tr> +<td><a href="#GitDialog.__procFinished">__procFinished</a></td> +<td>Private slot connected to the finished signal.</td> +</tr><tr> +<td><a href="#GitDialog.__readStderr">__readStderr</a></td> +<td>Private slot to handle the readyReadStandardError signal.</td> +</tr><tr> +<td><a href="#GitDialog.__readStdout">__readStdout</a></td> +<td>Private slot to handle the readyReadStandardOutput signal.</td> +</tr><tr> +<td><a href="#GitDialog.__showError">__showError</a></td> +<td>Private slot to show some error.</td> +</tr><tr> +<td><a href="#GitDialog.__showOutput">__showOutput</a></td> +<td>Private slot to show some output.</td> +</tr><tr> +<td><a href="#GitDialog.hasAddOrDelete">hasAddOrDelete</a></td> +<td>Public method to check, if the last action contained an add or delete.</td> +</tr><tr> +<td><a href="#GitDialog.keyPressEvent">keyPressEvent</a></td> +<td>Protected slot to handle a key press event.</td> +</tr><tr> +<td><a href="#GitDialog.normalExit">normalExit</a></td> +<td>Public method to check for a normal process termination.</td> +</tr><tr> +<td><a href="#GitDialog.normalExitWithoutErrors">normalExitWithoutErrors</a></td> +<td>Public method to check for a normal process termination without error messages.</td> +</tr><tr> +<td><a href="#GitDialog.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="#GitDialog.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> +<td><a href="#GitDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> +<td>Private slot to handle the password checkbox toggled.</td> +</tr><tr> +<td><a href="#GitDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> +<td>Private slot to send the input to the git process.</td> +</tr><tr> +<td><a href="#GitDialog.startProcess">startProcess</a></td> +<td>Public slot used to start the process.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitDialog.__init__" ID="GitDialog.__init__"></a> +<h4>GitDialog (Constructor)</h4> +<b>GitDialog</b>(<i>text, git=None, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>text</i></dt> +<dd> +text to be shown by the label (string) +</dd><dt><i>git</i></dt> +<dd> +reference to the Git interface object (Git) +</dd><dt><i>parent</i></dt> +<dd> +parent widget (QWidget) +</dd> +</dl><a NAME="GitDialog.__finish" ID="GitDialog.__finish"></a> +<h4>GitDialog.__finish</h4> +<b>__finish</b>(<i></i>) +<p> + Private slot called when the process finished or the user pressed + the button. +</p><a NAME="GitDialog.__procFinished" ID="GitDialog.__procFinished"></a> +<h4>GitDialog.__procFinished</h4> +<b>__procFinished</b>(<i>exitCode, exitStatus</i>) +<p> + Private slot connected to the finished signal. +</p><dl> +<dt><i>exitCode</i></dt> +<dd> +exit code of the process (integer) +</dd><dt><i>exitStatus</i></dt> +<dd> +exit status of the process (QProcess.ExitStatus) +</dd> +</dl><a NAME="GitDialog.__readStderr" ID="GitDialog.__readStderr"></a> +<h4>GitDialog.__readStderr</h4> +<b>__readStderr</b>(<i></i>) +<p> + Private slot to handle the readyReadStandardError signal. +</p><p> + It reads the error output of the process and inserts it into the + error pane. +</p><a NAME="GitDialog.__readStdout" ID="GitDialog.__readStdout"></a> +<h4>GitDialog.__readStdout</h4> +<b>__readStdout</b>(<i></i>) +<p> + Private slot to handle the readyReadStandardOutput signal. +</p><p> + It reads the output of the process, formats it and inserts it into + the contents pane. +</p><a NAME="GitDialog.__showError" ID="GitDialog.__showError"></a> +<h4>GitDialog.__showError</h4> +<b>__showError</b>(<i>out</i>) +<p> + Private slot to show some error. +</p><dl> +<dt><i>out</i></dt> +<dd> +error to be shown (string) +</dd> +</dl><a NAME="GitDialog.__showOutput" ID="GitDialog.__showOutput"></a> +<h4>GitDialog.__showOutput</h4> +<b>__showOutput</b>(<i>out</i>) +<p> + Private slot to show some output. +</p><dl> +<dt><i>out</i></dt> +<dd> +output to be shown (string) +</dd> +</dl><a NAME="GitDialog.hasAddOrDelete" ID="GitDialog.hasAddOrDelete"></a> +<h4>GitDialog.hasAddOrDelete</h4> +<b>hasAddOrDelete</b>(<i></i>) +<p> + Public method to check, if the last action contained an add or delete. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the presence of an add or delete (boolean) +</dd> +</dl><a NAME="GitDialog.keyPressEvent" ID="GitDialog.keyPressEvent"></a> +<h4>GitDialog.keyPressEvent</h4> +<b>keyPressEvent</b>(<i>evt</i>) +<p> + Protected slot to handle a key press event. +</p><dl> +<dt><i>evt</i></dt> +<dd> +the key press event (QKeyEvent) +</dd> +</dl><a NAME="GitDialog.normalExit" ID="GitDialog.normalExit"></a> +<h4>GitDialog.normalExit</h4> +<b>normalExit</b>(<i></i>) +<p> + Public method to check for a normal process termination. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating normal process termination (boolean) +</dd> +</dl><a NAME="GitDialog.normalExitWithoutErrors" ID="GitDialog.normalExitWithoutErrors"></a> +<h4>GitDialog.normalExitWithoutErrors</h4> +<b>normalExitWithoutErrors</b>(<i></i>) +<p> + Public method to check for a normal process termination without + error messages. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating normal process termination (boolean) +</dd> +</dl><a NAME="GitDialog.on_buttonBox_clicked" ID="GitDialog.on_buttonBox_clicked"></a> +<h4>GitDialog.on_buttonBox_clicked</h4> +<b>on_buttonBox_clicked</b>(<i>button</i>) +<p> + Private slot called by a button of the button box clicked. +</p><dl> +<dt><i>button</i></dt> +<dd> +button that was clicked (QAbstractButton) +</dd> +</dl><a NAME="GitDialog.on_input_returnPressed" ID="GitDialog.on_input_returnPressed"></a> +<h4>GitDialog.on_input_returnPressed</h4> +<b>on_input_returnPressed</b>(<i></i>) +<p> + Private slot to handle the press of the return key in the input field. +</p><a NAME="GitDialog.on_passwordCheckBox_toggled" ID="GitDialog.on_passwordCheckBox_toggled"></a> +<h4>GitDialog.on_passwordCheckBox_toggled</h4> +<b>on_passwordCheckBox_toggled</b>(<i>isOn</i>) +<p> + Private slot to handle the password checkbox toggled. +</p><dl> +<dt><i>isOn</i></dt> +<dd> +flag indicating the status of the check box (boolean) +</dd> +</dl><a NAME="GitDialog.on_sendButton_clicked" ID="GitDialog.on_sendButton_clicked"></a> +<h4>GitDialog.on_sendButton_clicked</h4> +<b>on_sendButton_clicked</b>(<i></i>) +<p> + Private slot to send the input to the git process. +</p><a NAME="GitDialog.startProcess" ID="GitDialog.startProcess"></a> +<h4>GitDialog.startProcess</h4> +<b>startProcess</b>(<i>args, workingDir=None, showArgs=True, environment=None</i>) +<p> + Public slot used to start the process. +</p><dl> +<dt><i>args</i></dt> +<dd> +list of arguments for the process (list of strings) +</dd><dt><i>workingDir=</i></dt> +<dd> +working directory for the process (string) +</dd><dt><i>showArgs=</i></dt> +<dd> +flag indicating to show the arguments (boolean) +</dd><dt><i>environment=</i></dt> +<dd> +dictionary of environment settings to add + or change for the git process (dict of string and string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating a successful start of the process (boolean) +</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.GitDiffDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,202 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitDiffDialog</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.GitDiffDialog</h1> +<p> +Module implementing a dialog to show the output of the git diff command +process. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitDiffDialog">GitDiffDialog</a></td> +<td>Class implementing a dialog to show the output of the git diff command process.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitDiffDialog" ID="GitDiffDialog"></a> +<h2>GitDiffDialog</h2> +<p> + Class implementing a dialog to show the output of the git diff command + process. +</p> +<h3>Derived from</h3> +QWidget, Ui_GitDiffDialog +<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="#GitDiffDialog.__init__">GitDiffDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitDiffDialog.__generatorFinished">__generatorFinished</a></td> +<td>Private slot connected to the finished signal.</td> +</tr><tr> +<td><a href="#GitDiffDialog.__mergeFileSeparators">__mergeFileSeparators</a></td> +<td>Private method to merge the file separator entries.</td> +</tr><tr> +<td><a href="#GitDiffDialog.closeEvent">closeEvent</a></td> +<td>Protected slot implementing a close event handler.</td> +</tr><tr> +<td><a href="#GitDiffDialog.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="#GitDiffDialog.on_filesCombo_activated">on_filesCombo_activated</a></td> +<td>Private slot to handle the selection of a file.</td> +</tr><tr> +<td><a href="#GitDiffDialog.on_refreshButton_clicked">on_refreshButton_clicked</a></td> +<td>Private slot to refresh the display.</td> +</tr><tr> +<td><a href="#GitDiffDialog.on_saveButton_clicked">on_saveButton_clicked</a></td> +<td>Private slot to handle the Save button press.</td> +</tr><tr> +<td><a href="#GitDiffDialog.start">start</a></td> +<td>Public slot to start the git diff command.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitDiffDialog.__init__" ID="GitDiffDialog.__init__"></a> +<h4>GitDiffDialog (Constructor)</h4> +<b>GitDiffDialog</b>(<i>vcs, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>vcs</i></dt> +<dd> +reference to the vcs object +</dd><dt><i>parent</i></dt> +<dd> +parent widget (QWidget) +</dd> +</dl><a NAME="GitDiffDialog.__generatorFinished" ID="GitDiffDialog.__generatorFinished"></a> +<h4>GitDiffDialog.__generatorFinished</h4> +<b>__generatorFinished</b>(<i></i>) +<p> + Private slot connected to the finished signal. +</p><a NAME="GitDiffDialog.__mergeFileSeparators" ID="GitDiffDialog.__mergeFileSeparators"></a> +<h4>GitDiffDialog.__mergeFileSeparators</h4> +<b>__mergeFileSeparators</b>(<i>fileSeparators</i>) +<p> + Private method to merge the file separator entries. +</p><dl> +<dt><i>fileSeparators</i></dt> +<dd> +list of file separator entries to be merged +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +merged list of file separator entries +</dd> +</dl><a NAME="GitDiffDialog.closeEvent" ID="GitDiffDialog.closeEvent"></a> +<h4>GitDiffDialog.closeEvent</h4> +<b>closeEvent</b>(<i>e</i>) +<p> + Protected slot implementing a close event handler. +</p><dl> +<dt><i>e</i></dt> +<dd> +close event (QCloseEvent) +</dd> +</dl><a NAME="GitDiffDialog.on_buttonBox_clicked" ID="GitDiffDialog.on_buttonBox_clicked"></a> +<h4>GitDiffDialog.on_buttonBox_clicked</h4> +<b>on_buttonBox_clicked</b>(<i>button</i>) +<p> + Private slot called by a button of the button box clicked. +</p><dl> +<dt><i>button</i></dt> +<dd> +button that was clicked (QAbstractButton) +</dd> +</dl><a NAME="GitDiffDialog.on_filesCombo_activated" ID="GitDiffDialog.on_filesCombo_activated"></a> +<h4>GitDiffDialog.on_filesCombo_activated</h4> +<b>on_filesCombo_activated</b>(<i>index</i>) +<p> + Private slot to handle the selection of a file. +</p><dl> +<dt><i>index</i></dt> +<dd> +activated row (integer) +</dd> +</dl><a NAME="GitDiffDialog.on_refreshButton_clicked" ID="GitDiffDialog.on_refreshButton_clicked"></a> +<h4>GitDiffDialog.on_refreshButton_clicked</h4> +<b>on_refreshButton_clicked</b>(<i></i>) +<p> + Private slot to refresh the display. +</p><a NAME="GitDiffDialog.on_saveButton_clicked" ID="GitDiffDialog.on_saveButton_clicked"></a> +<h4>GitDiffDialog.on_saveButton_clicked</h4> +<b>on_saveButton_clicked</b>(<i></i>) +<p> + Private slot to handle the Save button press. +</p><p> + It saves the diff shown in the dialog to a file in the local + filesystem. +</p><a NAME="GitDiffDialog.start" ID="GitDiffDialog.start"></a> +<h4>GitDiffDialog.start</h4> +<b>start</b>(<i>fn, versions=None, diffMode="work2repo", stashName="", refreshable=False</i>) +<p> + Public slot to start the git diff command. +</p><dl> +<dt><i>fn</i></dt> +<dd> +filename to be diffed (string) +</dd><dt><i>versions</i></dt> +<dd> +list of versions to be diffed (list of up to 2 strings + or None) +</dd><dt><i>diffMode</i></dt> +<dd> +indication for the type of diff to be performed ( + 'work2repo' compares the working tree with the HEAD commit, + 'work2stage' compares the working tree with the staging area, + 'stage2repo' compares the staging area with the HEAD commit, + 'work2stage2repo' compares the working tree with the staging area + and the staging area with the HEAD commit, + 'stash' shows the diff for a stash) +</dd><dt><i>stashName</i></dt> +<dd> +name of the stash to show a diff for (string) +</dd><dt><i>refreshable</i></dt> +<dd> +flag indicating a refreshable diff (boolean) +</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.GitDiffGenerator.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,221 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitDiffGenerator</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.GitDiffGenerator</h1> +<p> +Module implementing a class to generate the output of the git diff command +process. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitDiffGenerator">GitDiffGenerator</a></td> +<td>Class implementing the generation of output of the git diff command.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitDiffGenerator" ID="GitDiffGenerator"></a> +<h2>GitDiffGenerator</h2> +<p> + Class implementing the generation of output of the git diff command. +</p><h3>Signals</h3> +<dl> +<dt>finished()</dt> +<dd> +emitted when all processes have finished +</dd> +</dl> +<h3>Derived from</h3> +QObject +<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="#GitDiffGenerator.__init__">GitDiffGenerator</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitDiffGenerator.__procFinished">__procFinished</a></td> +<td>Private slot connected to the finished signal.</td> +</tr><tr> +<td><a href="#GitDiffGenerator.__processFileLine">__processFileLine</a></td> +<td>Private slot to process a line giving the old/new file.</td> +</tr><tr> +<td><a href="#GitDiffGenerator.__processLine">__processLine</a></td> +<td>Private method to process one line of output.</td> +</tr><tr> +<td><a href="#GitDiffGenerator.__readStderr">__readStderr</a></td> +<td>Private slot to handle the readyReadStandardError signal.</td> +</tr><tr> +<td><a href="#GitDiffGenerator.__readStdout">__readStdout</a></td> +<td>Private slot to handle the readyReadStandardOutput signal.</td> +</tr><tr> +<td><a href="#GitDiffGenerator.getResult">getResult</a></td> +<td>Public method to return the result data.</td> +</tr><tr> +<td><a href="#GitDiffGenerator.start">start</a></td> +<td>Public slot to start the git diff command.</td> +</tr><tr> +<td><a href="#GitDiffGenerator.stopProcesses">stopProcesses</a></td> +<td>Public slot to stop the diff processes.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitDiffGenerator.__init__" ID="GitDiffGenerator.__init__"></a> +<h4>GitDiffGenerator (Constructor)</h4> +<b>GitDiffGenerator</b>(<i>vcs, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>vcs</i></dt> +<dd> +reference to the vcs object +</dd><dt><i>parent</i></dt> +<dd> +parent widget (QWidget) +</dd> +</dl><a NAME="GitDiffGenerator.__procFinished" ID="GitDiffGenerator.__procFinished"></a> +<h4>GitDiffGenerator.__procFinished</h4> +<b>__procFinished</b>(<i>exitCode, exitStatus</i>) +<p> + Private slot connected to the finished signal. +</p><dl> +<dt><i>exitCode</i></dt> +<dd> +exit code of the process (integer) +</dd><dt><i>exitStatus</i></dt> +<dd> +exit status of the process (QProcess.ExitStatus) +</dd> +</dl><a NAME="GitDiffGenerator.__processFileLine" ID="GitDiffGenerator.__processFileLine"></a> +<h4>GitDiffGenerator.__processFileLine</h4> +<b>__processFileLine</b>(<i>line, isTopDiff</i>) +<p> + Private slot to process a line giving the old/new file. +</p><dl> +<dt><i>line</i></dt> +<dd> +line to be processed (string) +</dd><dt><i>isTopDiff</i></dt> +<dd> +flag indicating to show the output in the top + output widget (boolean) +</dd> +</dl><a NAME="GitDiffGenerator.__processLine" ID="GitDiffGenerator.__processLine"></a> +<h4>GitDiffGenerator.__processLine</h4> +<b>__processLine</b>(<i>line, isTopDiff</i>) +<p> + Private method to process one line of output. +</p><dl> +<dt><i>line</i></dt> +<dd> +output line to process (string) +</dd><dt><i>isTopDiff</i></dt> +<dd> +flag indicating to show the output in the top + output widget (boolean) +</dd> +</dl><a NAME="GitDiffGenerator.__readStderr" ID="GitDiffGenerator.__readStderr"></a> +<h4>GitDiffGenerator.__readStderr</h4> +<b>__readStderr</b>(<i></i>) +<p> + Private slot to handle the readyReadStandardError signal. +</p><p> + It reads the error output of the process and inserts it into the + error pane. +</p><a NAME="GitDiffGenerator.__readStdout" ID="GitDiffGenerator.__readStdout"></a> +<h4>GitDiffGenerator.__readStdout</h4> +<b>__readStdout</b>(<i></i>) +<p> + Private slot to handle the readyReadStandardOutput signal. +</p><p> + It reads the output of the process, formats it and inserts it into + the contents pane. +</p><a NAME="GitDiffGenerator.getResult" ID="GitDiffGenerator.getResult"></a> +<h4>GitDiffGenerator.getResult</h4> +<b>getResult</b>(<i></i>) +<p> + Public method to return the result data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple of lists of string containing lines of the diff, the diff + between stage and repo for 'work2stage2repo' mode (empty + otherwise), the list of errors and a list of tuples of filenames + and the line into the diff output. +</dd> +</dl><a NAME="GitDiffGenerator.start" ID="GitDiffGenerator.start"></a> +<h4>GitDiffGenerator.start</h4> +<b>start</b>(<i>fn, versions=None, diffMode="work2repo", stashName=""</i>) +<p> + Public slot to start the git diff command. +</p><dl> +<dt><i>fn</i></dt> +<dd> +filename to be diffed (string) +</dd><dt><i>versions</i></dt> +<dd> +list of versions to be diffed (list of up to 2 strings + or None) +</dd><dt><i>diffMode</i></dt> +<dd> +indication for the type of diff to be performed ( + 'work2repo' compares the working tree with the HEAD commit, + 'work2stage' compares the working tree with the staging area, + 'stage2repo' compares the staging area with the HEAD commit, + 'work2stage2repo' compares the working tree with the staging area + and the staging area with the HEAD commit, + 'stash' shows the diff for a stash) +</dd><dt><i>stashName</i></dt> +<dd> +name of the stash to show a diff for (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating the start status (boolean) +</dd> +</dl><a NAME="GitDiffGenerator.stopProcesses" ID="GitDiffGenerator.stopProcesses"></a> +<h4>GitDiffGenerator.stopProcesses</h4> +<b>stopProcesses</b>(<i></i>) +<p> + Public slot to stop the diff processes. +</p> +<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.GitDiffHighlighter.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,238 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitDiffHighlighter</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.GitDiffHighlighter</h1> +<p> +Module implementing a syntax highlighter for diff outputs. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#E5GenericDiffHighlighter">E5GenericDiffHighlighter</a></td> +<td>Class implementing a generic diff highlighter.</td> +</tr><tr> +<td><a href="#GitDiffHighlighter">GitDiffHighlighter</a></td> +<td>Class implementing a diff highlighter for Git.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr> +<td><a href="#TERMINAL">TERMINAL</a></td> +<td>Function to mark a pattern as the final one to search for.</td> +</tr> +</table> +<hr /><hr /> +<a NAME="E5GenericDiffHighlighter" ID="E5GenericDiffHighlighter"></a> +<h2>E5GenericDiffHighlighter</h2> +<p> + Class implementing a generic diff highlighter. +</p> +<h3>Derived from</h3> +QSyntaxHighlighter +<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="#E5GenericDiffHighlighter.__init__">E5GenericDiffHighlighter</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#E5GenericDiffHighlighter.createRules">createRules</a></td> +<td>Public method to create the highlighting rules.</td> +</tr><tr> +<td><a href="#E5GenericDiffHighlighter.formats">formats</a></td> +<td>Public method to determine the highlighting formats for a line of text.</td> +</tr><tr> +<td><a href="#E5GenericDiffHighlighter.generateRules">generateRules</a></td> +<td>Public method to generate the rule set.</td> +</tr><tr> +<td><a href="#E5GenericDiffHighlighter.highlightBlock">highlightBlock</a></td> +<td>Public method to highlight a block of text.</td> +</tr><tr> +<td><a href="#E5GenericDiffHighlighter.makeFormat">makeFormat</a></td> +<td>Public method to generate a format definition.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="E5GenericDiffHighlighter.__init__" ID="E5GenericDiffHighlighter.__init__"></a> +<h4>E5GenericDiffHighlighter (Constructor)</h4> +<b>E5GenericDiffHighlighter</b>(<i>doc</i>) +<p> + Constructor +</p><dl> +<dt><i>doc</i></dt> +<dd> +reference to the text document (QTextDocument) +</dd> +</dl><a NAME="E5GenericDiffHighlighter.createRules" ID="E5GenericDiffHighlighter.createRules"></a> +<h4>E5GenericDiffHighlighter.createRules</h4> +<b>createRules</b>(<i>*rules</i>) +<p> + Public method to create the highlighting rules. +</p><dl> +<dt><i>rules</i></dt> +<dd> +set of highlighting rules (list of tuples of rule + pattern (string) and highlighting format (QTextCharFormat)) +</dd> +</dl><a NAME="E5GenericDiffHighlighter.formats" ID="E5GenericDiffHighlighter.formats"></a> +<h4>E5GenericDiffHighlighter.formats</h4> +<b>formats</b>(<i>line</i>) +<p> + Public method to determine the highlighting formats for a line of + text. +</p><dl> +<dt><i>line</i></dt> +<dd> +text line to be highlighted (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +list of matched highlighting rules (list of tuples of match + object and format (QTextCharFormat)) +</dd> +</dl><a NAME="E5GenericDiffHighlighter.generateRules" ID="E5GenericDiffHighlighter.generateRules"></a> +<h4>E5GenericDiffHighlighter.generateRules</h4> +<b>generateRules</b>(<i></i>) +<p> + Public method to generate the rule set. +</p><p> + Note: This method must me implemented by derived syntax + highlighters. +</p><a NAME="E5GenericDiffHighlighter.highlightBlock" ID="E5GenericDiffHighlighter.highlightBlock"></a> +<h4>E5GenericDiffHighlighter.highlightBlock</h4> +<b>highlightBlock</b>(<i>text</i>) +<p> + Public method to highlight a block of text. +</p><dl> +<dt><i>text</i></dt> +<dd> +text to be highlighted (string) +</dd> +</dl><a NAME="E5GenericDiffHighlighter.makeFormat" ID="E5GenericDiffHighlighter.makeFormat"></a> +<h4>E5GenericDiffHighlighter.makeFormat</h4> +<b>makeFormat</b>(<i>fg=None, bg=None, bold=False</i>) +<p> + Public method to generate a format definition. +</p><dl> +<dt><i>fg</i></dt> +<dd> +foreground color (QColor) +</dd><dt><i>bg</i></dt> +<dd> +background color (QColor) +</dd><dt><i>bold</i></dt> +<dd> +flag indicating bold text (boolean) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +format definiton (QTextCharFormat) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="GitDiffHighlighter" ID="GitDiffHighlighter"></a> +<h2>GitDiffHighlighter</h2> +<p> + Class implementing a diff highlighter for Git. +</p> +<h3>Derived from</h3> +E5GenericDiffHighlighter +<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="#GitDiffHighlighter.__init__">GitDiffHighlighter</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitDiffHighlighter.generateRules">generateRules</a></td> +<td>Public method to generate the rule set.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitDiffHighlighter.__init__" ID="GitDiffHighlighter.__init__"></a> +<h4>GitDiffHighlighter (Constructor)</h4> +<b>GitDiffHighlighter</b>(<i>doc, whitespace=True</i>) +<p> + Constructor +</p><dl> +<dt><i>doc</i></dt> +<dd> +reference to the text document (QTextDocument) +</dd><dt><i>whitespace</i></dt> +<dd> +flag indicating to highlight whitespace + at the end of a line (boolean) +</dd> +</dl><a NAME="GitDiffHighlighter.generateRules" ID="GitDiffHighlighter.generateRules"></a> +<h4>GitDiffHighlighter.generateRules</h4> +<b>generateRules</b>(<i></i>) +<p> + Public method to generate the rule set. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="TERMINAL" ID="TERMINAL"></a> +<h2>TERMINAL</h2> +<b>TERMINAL</b>(<i>pattern</i>) +<p> + Function to mark a pattern as the final one to search for. +</p><dl> +<dt><i>pattern</i></dt> +<dd> +pattern to be marked (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +marked pattern (string) +</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.GitDiffParser.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,232 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitDiffParser</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.GitDiffParser</h1> +<p> +Module implementing a class to store and parse diff output. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitDiffParser">GitDiffParser</a></td> +<td>Class implementing a class to store and parse diff output.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitDiffParser" ID="GitDiffParser"></a> +<h2>GitDiffParser</h2> +<p> + Class implementing a class to store and parse diff output. +</p> +<h3>Derived from</h3> +object +<h3>Class Attributes</h3> +<table> +<tr><td>HunkHeaderRegexp</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#GitDiffParser.__init__">GitDiffParser</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitDiffParser.__generateHunkHeader">__generateHunkHeader</a></td> +<td>Private method to generate a hunk header line.</td> +</tr><tr> +<td><a href="#GitDiffParser.__generateRange">__generateRange</a></td> +<td>Private method to generate a hunk header range.</td> +</tr><tr> +<td><a href="#GitDiffParser.__initHunk">__initHunk</a></td> +<td>Private method to initialize a hunk data structure.</td> +</tr><tr> +<td><a href="#GitDiffParser.__parseDiff">__parseDiff</a></td> +<td>Private method to parse the diff output.</td> +</tr><tr> +<td><a href="#GitDiffParser.__parseRange">__parseRange</a></td> +<td>Private method to parse the hunk header range part.</td> +</tr><tr> +<td><a href="#GitDiffParser.createHunkPatch">createHunkPatch</a></td> +<td>Public method to create a hunk based patch.</td> +</tr><tr> +<td><a href="#GitDiffParser.createLinesPatch">createLinesPatch</a></td> +<td>Public method to create a selected lines based patch.</td> +</tr><tr> +<td><a href="#GitDiffParser.headerLength">headerLength</a></td> +<td>Public method to get the header length.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitDiffParser.__init__" ID="GitDiffParser.__init__"></a> +<h4>GitDiffParser (Constructor)</h4> +<b>GitDiffParser</b>(<i>diff</i>) +<p> + Constructor +</p><dl> +<dt><i>diff</i></dt> +<dd> +output of the diff command (list of string) +</dd> +</dl><a NAME="GitDiffParser.__generateHunkHeader" ID="GitDiffParser.__generateHunkHeader"></a> +<h4>GitDiffParser.__generateHunkHeader</h4> +<b>__generateHunkHeader</b>(<i>oldStart, oldCount, newStart, newCount, heading=os.linesep</i>) +<p> + Private method to generate a hunk header line. +</p><dl> +<dt><i>oldStart</i></dt> +<dd> +start line of the old part (integer) +</dd><dt><i>oldCount</i></dt> +<dd> +line count of the old part (integer) +</dd><dt><i>newStart</i></dt> +<dd> +start line of the new part (integer) +</dd><dt><i>newCount</i></dt> +<dd> +line count of the new part (integer) +</dd><dt><i>heading</i></dt> +<dd> +hunk heading (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +hunk header (string) +</dd> +</dl><a NAME="GitDiffParser.__generateRange" ID="GitDiffParser.__generateRange"></a> +<h4>GitDiffParser.__generateRange</h4> +<b>__generateRange</b>(<i>start, count</i>) +<p> + Private method to generate a hunk header range. +</p><dl> +<dt><i>start</i></dt> +<dd> +start line (integer) +</dd><dt><i>count</i></dt> +<dd> +line count (integer) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +hunk header range (string) +</dd> +</dl><a NAME="GitDiffParser.__initHunk" ID="GitDiffParser.__initHunk"></a> +<h4>GitDiffParser.__initHunk</h4> +<b>__initHunk</b>(<i></i>) +<p> + Private method to initialize a hunk data structure. +</p><dl> +<dt>Returns:</dt> +<dd> +hunk data structure (dictionary) +</dd> +</dl><a NAME="GitDiffParser.__parseDiff" ID="GitDiffParser.__parseDiff"></a> +<h4>GitDiffParser.__parseDiff</h4> +<b>__parseDiff</b>(<i></i>) +<p> + Private method to parse the diff output. +</p><dl> +<dt>Raises <b>AssertionError</b>:</dt> +<dd> +raised when a malformed hunk header is + encountered +</dd> +</dl><a NAME="GitDiffParser.__parseRange" ID="GitDiffParser.__parseRange"></a> +<h4>GitDiffParser.__parseRange</h4> +<b>__parseRange</b>(<i>headerRange</i>) +<p> + Private method to parse the hunk header range part. +</p><dl> +<dt><i>headerRange</i></dt> +<dd> +hunk header range (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +tuple of hunk start and hunk length (integer, integer) +</dd> +</dl><a NAME="GitDiffParser.createHunkPatch" ID="GitDiffParser.createHunkPatch"></a> +<h4>GitDiffParser.createHunkPatch</h4> +<b>createHunkPatch</b>(<i>lineIndex</i>) +<p> + Public method to create a hunk based patch. +</p><dl> +<dt><i>lineIndex</i></dt> +<dd> +line number of the hunk (integer) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +diff lines of the patch (string) +</dd> +</dl><a NAME="GitDiffParser.createLinesPatch" ID="GitDiffParser.createLinesPatch"></a> +<h4>GitDiffParser.createLinesPatch</h4> +<b>createLinesPatch</b>(<i>startIndex, endIndex, reverse=False</i>) +<p> + Public method to create a selected lines based patch. +</p><dl> +<dt><i>startIndex</i></dt> +<dd> +start line number (integer) +</dd><dt><i>endIndex</i></dt> +<dd> +end line number (integer) +</dd><dt><i>reverse</i></dt> +<dd> +flag indicating a reverse patch (boolean) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +diff lines of the patch (string) +</dd> +</dl><a NAME="GitDiffParser.headerLength" ID="GitDiffParser.headerLength"></a> +<h4>GitDiffParser.headerLength</h4> +<b>headerLength</b>(<i></i>) +<p> + Public method to get the header length. +</p><dl> +<dt>Returns:</dt> +<dd> +length of the header (integer) +</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.GitFetchDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,163 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitFetchDialog</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.GitFetchDialog</h1> +<p> +Module implementing a dialog to enter data for a Fetch operation. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitFetchDialog">GitFetchDialog</a></td> +<td>Class implementing a dialog to enter data for a Fetch operation.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitFetchDialog" ID="GitFetchDialog"></a> +<h2>GitFetchDialog</h2> +<p> + Class implementing a dialog to enter data for a Fetch operation. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitFetchDialog +<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="#GitFetchDialog.__init__">GitFetchDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitFetchDialog.__okButtonEnable">__okButtonEnable</a></td> +<td>Private slot to set the enabled state of the OK button.</td> +</tr><tr> +<td><a href="#GitFetchDialog.__updateButtonEnable">__updateButtonEnable</a></td> +<td>Private slot to set the enabled state of the update button.</td> +</tr><tr> +<td><a href="#GitFetchDialog.getData">getData</a></td> +<td>Public method to get the entered data.</td> +</tr><tr> +<td><a href="#GitFetchDialog.on_remoteBranchesList_itemSelectionChanged">on_remoteBranchesList_itemSelectionChanged</a></td> +<td>Private slot to handle a change of selected remote branches.</td> +</tr><tr> +<td><a href="#GitFetchDialog.on_remoteEdit_textChanged">on_remoteEdit_textChanged</a></td> +<td>Private slot to handle changes of the URL edit.</td> +</tr><tr> +<td><a href="#GitFetchDialog.on_remotesComboBox_currentTextChanged">on_remotesComboBox_currentTextChanged</a></td> +<td>Private slot to handle changes of the selected repository.</td> +</tr><tr> +<td><a href="#GitFetchDialog.on_updateButton_clicked">on_updateButton_clicked</a></td> +<td>Private slot to update the list of remote branches.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitFetchDialog.__init__" ID="GitFetchDialog.__init__"></a> +<h4>GitFetchDialog (Constructor)</h4> +<b>GitFetchDialog</b>(<i>vcs, repodir, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>vcs</i></dt> +<dd> +reference to the git object +</dd><dt><i>repodir</i></dt> +<dd> +directory name of the local repository (string) +</dd><dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd> +</dl><a NAME="GitFetchDialog.__okButtonEnable" ID="GitFetchDialog.__okButtonEnable"></a> +<h4>GitFetchDialog.__okButtonEnable</h4> +<b>__okButtonEnable</b>(<i></i>) +<p> + Private slot to set the enabled state of the OK button. +</p><a NAME="GitFetchDialog.__updateButtonEnable" ID="GitFetchDialog.__updateButtonEnable"></a> +<h4>GitFetchDialog.__updateButtonEnable</h4> +<b>__updateButtonEnable</b>(<i></i>) +<p> + Private slot to set the enabled state of the update button. +</p><a NAME="GitFetchDialog.getData" ID="GitFetchDialog.getData"></a> +<h4>GitFetchDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to get the entered data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple of remote name, remote url (for custom remotes), + remote branches, local branch, a flag indicating to fetch from + all repositories, a flag indicating to remove obsolete tracking + references and a flag indicating to fetch tags as well + (string, string, list of strings, string, boolean, boolean, + boolean) +</dd> +</dl><a NAME="GitFetchDialog.on_remoteBranchesList_itemSelectionChanged" ID="GitFetchDialog.on_remoteBranchesList_itemSelectionChanged"></a> +<h4>GitFetchDialog.on_remoteBranchesList_itemSelectionChanged</h4> +<b>on_remoteBranchesList_itemSelectionChanged</b>(<i></i>) +<p> + Private slot to handle a change of selected remote branches. +</p><a NAME="GitFetchDialog.on_remoteEdit_textChanged" ID="GitFetchDialog.on_remoteEdit_textChanged"></a> +<h4>GitFetchDialog.on_remoteEdit_textChanged</h4> +<b>on_remoteEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the URL edit. +</p><dl> +<dt><i>txt</i></dt> +<dd> +current text of the URL edit (string) +</dd> +</dl><a NAME="GitFetchDialog.on_remotesComboBox_currentTextChanged" ID="GitFetchDialog.on_remotesComboBox_currentTextChanged"></a> +<h4>GitFetchDialog.on_remotesComboBox_currentTextChanged</h4> +<b>on_remotesComboBox_currentTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the selected repository. +</p><dl> +<dt><i>txt</i></dt> +<dd> +current text of the combo box (string) +</dd> +</dl><a NAME="GitFetchDialog.on_updateButton_clicked" ID="GitFetchDialog.on_updateButton_clicked"></a> +<h4>GitFetchDialog.on_updateButton_clicked</h4> +<b>on_updateButton_clicked</b>(<i></i>) +<p> + Private slot to update the list of remote branches. +</p> +<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.GitListDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,97 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitListDialog</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.GitListDialog</h1> +<p> +Module implementing a dialog to select from a list. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitListDialog">GitListDialog</a></td> +<td>Class implementing a dialog to select from a list.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitListDialog" ID="GitListDialog"></a> +<h2>GitListDialog</h2> +<p> + Class implementing a dialog to select from a list. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitListDialog +<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="#GitListDialog.__init__">GitListDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitListDialog.getSelection">getSelection</a></td> +<td>Public method to return the selected entries.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitListDialog.__init__" ID="GitListDialog.__init__"></a> +<h4>GitListDialog (Constructor)</h4> +<b>GitListDialog</b>(<i>selections, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>selections</i></dt> +<dd> +list of entries to select from (list of string) +</dd><dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd> +</dl><a NAME="GitListDialog.getSelection" ID="GitListDialog.getSelection"></a> +<h4>GitListDialog.getSelection</h4> +<b>getSelection</b>(<i></i>) +<p> + Public method to return the selected entries. +</p><dl> +<dt>Returns:</dt> +<dd> +list of selected entries (list of string) +</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.GitLogBrowserDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,1147 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog</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.GitLogBrowserDialog</h1> +<p> +Module implementing a dialog to browse the log history. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>COLORNAMES</td></tr><tr><td>COLORS</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitLogBrowserDialog">GitLogBrowserDialog</a></td> +<td>Class implementing a dialog to browse the log history.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitLogBrowserDialog" ID="GitLogBrowserDialog"></a> +<h2>GitLogBrowserDialog</h2> +<p> + Class implementing a dialog to browse the log history. +</p> +<h3>Derived from</h3> +QWidget, Ui_GitLogBrowserDialog +<h3>Class Attributes</h3> +<table> +<tr><td>AuthorColumn</td></tr><tr><td>BranchColumn</td></tr><tr><td>CommitDateColumn</td></tr><tr><td>CommitIdColumn</td></tr><tr><td>CommitterColumn</td></tr><tr><td>DateColumn</td></tr><tr><td>IconColumn</td></tr><tr><td>SubjectColumn</td></tr><tr><td>TagsColumn</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#GitLogBrowserDialog.__init__">GitLogBrowserDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__actionMode">__actionMode</a></td> +<td>Private method to get the selected action mode.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__actionsMenuHovered">__actionsMenuHovered</a></td> +<td>Private slot to show the tooltip for an action menu entry.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__addFinishCallback">__addFinishCallback</a></td> +<td>Private method to add a method to be called once the process finished.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__branchActTriggered">__branchActTriggered</a></td> +<td>Private slot to create a new branch starting at the selected commit.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__branchSwitchActTriggered">__branchSwitchActTriggered</a></td> +<td>Private slot to create a new branch starting at the selected commit and switch the work tree to it.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__cherryActTriggered">__cherryActTriggered</a></td> +<td>Private slot to handle the Copy Commits action.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__commitIdClicked">__commitIdClicked</a></td> +<td>Private slot to handle the anchorClicked signal of the changeset details pane.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__describeActTriggered">__describeActTriggered</a></td> +<td>Private slot to show the most recent tag reachable from a commit.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__filterLogs">__filterLogs</a></td> +<td>Private method to filter the log entries.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__findItem">__findItem</a></td> +<td>Private slot to find an item matching the entered criteria.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__finish">__finish</a></td> +<td>Private slot called when the process finished or the user pressed the button.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__generateDetailsTableText">__generateDetailsTableText</a></td> +<td>Private method to generate an HTML table with the details of the given changeset.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__generateDiffs">__generateDiffs</a></td> +<td>Private slot to generate diff outputs for the selected item.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__generateEdges">__generateEdges</a></td> +<td>Private method to generate edge info for the give data.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__generateFileItem">__generateFileItem</a></td> +<td>Private method to generate a changed files tree entry.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__generateIcon">__generateIcon</a></td> +<td>Private method to generate an icon containing the revision tree for the given data.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__generateLogItem">__generateLogItem</a></td> +<td>Private method to generate a log tree entry.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__generatorFinished">__generatorFinished</a></td> +<td>Private slot connected to the finished signal of the diff generator.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__getBranchesForCommit">__getBranchesForCommit</a></td> +<td>Private method to get all branches reachable from a commit ID.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__getColor">__getColor</a></td> +<td>Private method to get the (rotating) name of the color given an index.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__getCommitForTag">__getCommitForTag</a></td> +<td>Private method to get the commit id for a tag.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__getLogEntries">__getLogEntries</a></td> +<td>Private method to retrieve log entries from the repository.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__getTagsForCommit">__getTagsForCommit</a></td> +<td>Private method to get all tags reachable from a commit ID.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__identifyProject">__identifyProject</a></td> +<td>Private method to determine the revision of the project directory.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__initActionsMenu">__initActionsMenu</a></td> +<td>Private method to initialize the actions menu.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__initData">__initData</a></td> +<td>Private method to (re-)initialize some data.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__initLogTreeContextMenu">__initLogTreeContextMenu</a></td> +<td>Private method to initialize the log tree context menu.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__mergeFileSeparators">__mergeFileSeparators</a></td> +<td>Private method to merge the file separator entries.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__prepareFieldSearch">__prepareFieldSearch</a></td> +<td>Private slot to prepare the filed search data.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__procFinished">__procFinished</a></td> +<td>Private slot connected to the finished signal.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__processBuffer">__processBuffer</a></td> +<td>Private method to process the buffered output of the git log command.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__processBufferItem">__processBufferItem</a></td> +<td>Private method to process a log entry.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__readStderr">__readStderr</a></td> +<td>Private slot to handle the readyReadStandardError signal.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__readStdout">__readStdout</a></td> +<td>Private slot to handle the readyReadStandardOutput signal.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__reloadGeometry">__reloadGeometry</a></td> +<td>Private method to restore the geometry.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__resetUI">__resetUI</a></td> +<td>Private method to reset the user interface.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__resizeColumnsFiles">__resizeColumnsFiles</a></td> +<td>Private method to resize the changed files tree columns.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__resizeColumnsLog">__resizeColumnsLog</a></td> +<td>Private method to resize the log tree columns.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__resortFiles">__resortFiles</a></td> +<td>Private method to resort the changed files tree.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__restoreSplitterStates">__restoreSplitterStates</a></td> +<td>Private method to restore the state of the various splitters.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__shortlogActTriggered">__shortlogActTriggered</a></td> +<td>Private slot to show a short log suitable for release announcements.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__showAuthorColumns">__showAuthorColumns</a></td> +<td>Private slot to show/hide the committer columns.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__showBranchesColumn">__showBranchesColumn</a></td> +<td>Private slot to show/hide the branches column.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__showCommitIdColumn">__showCommitIdColumn</a></td> +<td>Private slot to show/hide the commit ID column.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__showCommitterColumns">__showCommitterColumns</a></td> +<td>Private slot to show/hide the committer columns.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__showError">__showError</a></td> +<td>Private slot to show some error.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__showTagsColumn">__showTagsColumn</a></td> +<td>Private slot to show/hide the tags column.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__switchActTriggered">__switchActTriggered</a></td> +<td>Private slot to switch the working directory to the selected commit.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__tagActTriggered">__tagActTriggered</a></td> +<td>Private slot to tag the selected commit.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__updateDetailsAndFiles">__updateDetailsAndFiles</a></td> +<td>Private slot to update the details and file changes panes.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__updateFilesTree">__updateFilesTree</a></td> +<td>Private method to update the files tree with changes of the given item.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__updateSbsSelectLabel">__updateSbsSelectLabel</a></td> +<td>Private slot to update the enabled status of the diff buttons.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.__updateToolMenuActions">__updateToolMenuActions</a></td> +<td>Private slot to update the status of the tool menu actions and the tool menu button.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.closeEvent">closeEvent</a></td> +<td>Protected slot implementing a close event handler.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.col2x">col2x</a></td> +<td>Local function to calculate a x-position for a column.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.keyPressEvent">keyPressEvent</a></td> +<td>Protected slot to handle a key press event.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.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="#GitLogBrowserDialog.on_diffSelectLabel_linkActivated">on_diffSelectLabel_linkActivated</a></td> +<td>Private slot to handle the selection of a diff target.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.on_downButton_clicked">on_downButton_clicked</a></td> +<td>Private slot to move the current item down one entry.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.on_fieldCombo_activated">on_fieldCombo_activated</a></td> +<td>Private slot called, when a new filter field is selected.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.on_filesTree_currentItemChanged">on_filesTree_currentItemChanged</a></td> +<td>Private slot called, when the current item of the files tree changes.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.on_findNextButton_clicked">on_findNextButton_clicked</a></td> +<td>Private slot to find the next item matching the entered criteria.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.on_findPrevButton_clicked">on_findPrevButton_clicked</a></td> +<td>Private slot to find the previous item matching the entered criteria.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.on_fromDate_dateChanged">on_fromDate_dateChanged</a></td> +<td>Private slot called, when the from date changes.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.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> +<td><a href="#GitLogBrowserDialog.on_logTree_currentItemChanged">on_logTree_currentItemChanged</a></td> +<td>Private slot called, when the current item of the log tree changes.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.on_logTree_customContextMenuRequested">on_logTree_customContextMenuRequested</a></td> +<td>Private slot to show the context menu of the log tree.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.on_logTree_itemSelectionChanged">on_logTree_itemSelectionChanged</a></td> +<td>Private slot called, when the selection has changed.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.on_modeComboBox_currentIndexChanged">on_modeComboBox_currentIndexChanged</a></td> +<td>Private slot to react on mode changes.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.on_nextButton_clicked">on_nextButton_clicked</a></td> +<td>Private slot to handle the Next button.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> +<td>Private slot to handle the password checkbox toggled.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.on_refreshButton_clicked">on_refreshButton_clicked</a></td> +<td>Private slot to refresh the log.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.on_rxEdit_returnPressed">on_rxEdit_returnPressed</a></td> +<td>Private slot handling a press of the Return key in the rxEdit input.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.on_rxEdit_textChanged">on_rxEdit_textChanged</a></td> +<td>Private slot called, when a filter expression is entered.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.on_saveLabel_linkActivated">on_saveLabel_linkActivated</a></td> +<td>Private slot to handle the selection of the save link.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.on_sbsSelectLabel_linkActivated">on_sbsSelectLabel_linkActivated</a></td> +<td>Private slot to handle selection of a side-by-side link.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> +<td>Private slot to send the input to the git process.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.on_stopCheckBox_clicked">on_stopCheckBox_clicked</a></td> +<td>Private slot called, when the stop on copy/move checkbox is clicked.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.on_toDate_dateChanged">on_toDate_dateChanged</a></td> +<td>Private slot called, when the from date changes.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.on_upButton_clicked">on_upButton_clicked</a></td> +<td>Private slot to move the current item up one entry.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.show">show</a></td> +<td>Public slot to show the dialog.</td> +</tr><tr> +<td><a href="#GitLogBrowserDialog.start">start</a></td> +<td>Public slot to start the git log command.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitLogBrowserDialog.__init__" ID="GitLogBrowserDialog.__init__"></a> +<h4>GitLogBrowserDialog (Constructor)</h4> +<b>GitLogBrowserDialog</b>(<i>vcs, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>vcs</i></dt> +<dd> +reference to the vcs object +</dd><dt><i>parent</i></dt> +<dd> +parent widget (QWidget) +</dd> +</dl><a NAME="GitLogBrowserDialog.__actionMode" ID="GitLogBrowserDialog.__actionMode"></a> +<h4>GitLogBrowserDialog.__actionMode</h4> +<b>__actionMode</b>(<i></i>) +<p> + Private method to get the selected action mode. +</p><dl> +<dt>Returns:</dt> +<dd> +selected action mode (string, one of filter or find) +</dd> +</dl><a NAME="GitLogBrowserDialog.__actionsMenuHovered" ID="GitLogBrowserDialog.__actionsMenuHovered"></a> +<h4>GitLogBrowserDialog.__actionsMenuHovered</h4> +<b>__actionsMenuHovered</b>(<i>action</i>) +<p> + Private slot to show the tooltip for an action menu entry. +</p><dl> +<dt><i>action</i> (QAction)</dt> +<dd> +action to show tooltip for +</dd> +</dl><a NAME="GitLogBrowserDialog.__addFinishCallback" ID="GitLogBrowserDialog.__addFinishCallback"></a> +<h4>GitLogBrowserDialog.__addFinishCallback</h4> +<b>__addFinishCallback</b>(<i>callback</i>) +<p> + Private method to add a method to be called once the process finished. +</p><p> + The callback methods are invoke in a FIFO style and are consumed. If + a callback method needs to be called again, it must be added again. +</p><dl> +<dt><i>callback</i> (function)</dt> +<dd> +callback method +</dd> +</dl><a NAME="GitLogBrowserDialog.__branchActTriggered" ID="GitLogBrowserDialog.__branchActTriggered"></a> +<h4>GitLogBrowserDialog.__branchActTriggered</h4> +<b>__branchActTriggered</b>(<i></i>) +<p> + Private slot to create a new branch starting at the selected commit. +</p><a NAME="GitLogBrowserDialog.__branchSwitchActTriggered" ID="GitLogBrowserDialog.__branchSwitchActTriggered"></a> +<h4>GitLogBrowserDialog.__branchSwitchActTriggered</h4> +<b>__branchSwitchActTriggered</b>(<i></i>) +<p> + Private slot to create a new branch starting at the selected commit + and switch the work tree to it. +</p><a NAME="GitLogBrowserDialog.__cherryActTriggered" ID="GitLogBrowserDialog.__cherryActTriggered"></a> +<h4>GitLogBrowserDialog.__cherryActTriggered</h4> +<b>__cherryActTriggered</b>(<i></i>) +<p> + Private slot to handle the Copy Commits action. +</p><a NAME="GitLogBrowserDialog.__commitIdClicked" ID="GitLogBrowserDialog.__commitIdClicked"></a> +<h4>GitLogBrowserDialog.__commitIdClicked</h4> +<b>__commitIdClicked</b>(<i>url</i>) +<p> + Private slot to handle the anchorClicked signal of the changeset + details pane. +</p><dl> +<dt><i>url</i> (QUrl)</dt> +<dd> +URL that was clicked +</dd> +</dl><a NAME="GitLogBrowserDialog.__describeActTriggered" ID="GitLogBrowserDialog.__describeActTriggered"></a> +<h4>GitLogBrowserDialog.__describeActTriggered</h4> +<b>__describeActTriggered</b>(<i></i>) +<p> + Private slot to show the most recent tag reachable from a commit. +</p><a NAME="GitLogBrowserDialog.__filterLogs" ID="GitLogBrowserDialog.__filterLogs"></a> +<h4>GitLogBrowserDialog.__filterLogs</h4> +<b>__filterLogs</b>(<i></i>) +<p> + Private method to filter the log entries. +</p><a NAME="GitLogBrowserDialog.__findItem" ID="GitLogBrowserDialog.__findItem"></a> +<h4>GitLogBrowserDialog.__findItem</h4> +<b>__findItem</b>(<i>backwards=False, interactive=False</i>) +<p> + Private slot to find an item matching the entered criteria. +</p><dl> +<dt><i>backwards</i></dt> +<dd> +flag indicating to search backwards (boolean) +</dd><dt><i>interactive</i></dt> +<dd> +flag indicating an interactive search (boolean) +</dd> +</dl><a NAME="GitLogBrowserDialog.__finish" ID="GitLogBrowserDialog.__finish"></a> +<h4>GitLogBrowserDialog.__finish</h4> +<b>__finish</b>(<i></i>) +<p> + Private slot called when the process finished or the user pressed + the button. +</p><a NAME="GitLogBrowserDialog.__generateDetailsTableText" ID="GitLogBrowserDialog.__generateDetailsTableText"></a> +<h4>GitLogBrowserDialog.__generateDetailsTableText</h4> +<b>__generateDetailsTableText</b>(<i>itm</i>) +<p> + Private method to generate an HTML table with the details of the given + changeset. +</p><dl> +<dt><i>itm</i> (QTreeWidgetItem)</dt> +<dd> +reference to the item the table should be based on +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +HTML table containing details +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="GitLogBrowserDialog.__generateDiffs" ID="GitLogBrowserDialog.__generateDiffs"></a> +<h4>GitLogBrowserDialog.__generateDiffs</h4> +<b>__generateDiffs</b>(<i>parent=1</i>) +<p> + Private slot to generate diff outputs for the selected item. +</p><dl> +<dt><i>parent</i> (int)</dt> +<dd> +number of parent to diff against +</dd> +</dl><a NAME="GitLogBrowserDialog.__generateEdges" ID="GitLogBrowserDialog.__generateEdges"></a> +<h4>GitLogBrowserDialog.__generateEdges</h4> +<b>__generateEdges</b>(<i>commitId, parents</i>) +<p> + Private method to generate edge info for the give data. +</p><dl> +<dt><i>commitId</i></dt> +<dd> +commit id to calculate edge info for (string) +</dd><dt><i>parents</i></dt> +<dd> +list of parent commits (list of strings) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +tuple containing the column and color index for + the given node and a list of tuples indicating the edges + between the given node and its parents + (integer, integer, [(integer, integer, integer), ...]) +</dd> +</dl><a NAME="GitLogBrowserDialog.__generateFileItem" ID="GitLogBrowserDialog.__generateFileItem"></a> +<h4>GitLogBrowserDialog.__generateFileItem</h4> +<b>__generateFileItem</b>(<i>action, path, copyfrom, additions, deletions</i>) +<p> + Private method to generate a changed files tree entry. +</p><dl> +<dt><i>action</i></dt> +<dd> +indicator for the change action ("A", "C", "D", "M", + "R", "T", "U", "X") +</dd><dt><i>path</i></dt> +<dd> +path of the file in the repository (string) +</dd><dt><i>copyfrom</i></dt> +<dd> +path the file was copied from (string) +</dd><dt><i>additions</i></dt> +<dd> +number of added lines (int) +</dd><dt><i>deletions</i></dt> +<dd> +number of deleted lines (int) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +reference to the generated item (QTreeWidgetItem) +</dd> +</dl><a NAME="GitLogBrowserDialog.__generateIcon" ID="GitLogBrowserDialog.__generateIcon"></a> +<h4>GitLogBrowserDialog.__generateIcon</h4> +<b>__generateIcon</b>(<i>column, color, bottomedges, topedges, dotColor, currentCommit</i>) +<p> + Private method to generate an icon containing the revision tree for the + given data. +</p><dl> +<dt><i>column</i></dt> +<dd> +column index of the revision (integer) +</dd><dt><i>color</i></dt> +<dd> +color of the node (integer) +</dd><dt><i>bottomedges</i></dt> +<dd> +list of edges for the bottom of the node + (list of tuples of three integers) +</dd><dt><i>topedges</i></dt> +<dd> +list of edges for the top of the node + (list of tuples of three integers) +</dd><dt><i>dotColor</i></dt> +<dd> +color to be used for the dot (QColor) +</dd><dt><i>currentCommit</i></dt> +<dd> +flag indicating to draw the icon for the + current commit (boolean) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +icon for the node (QIcon) +</dd> +</dl><a NAME="GitLogBrowserDialog.__generateLogItem" ID="GitLogBrowserDialog.__generateLogItem"></a> +<h4>GitLogBrowserDialog.__generateLogItem</h4> +<b>__generateLogItem</b>(<i>author, date, committer, commitDate, subject, message, commitId, changedPaths, parents, refnames, authorMail, committerMail</i>) +<p> + Private method to generate a log tree entry. +</p><dl> +<dt><i>author</i></dt> +<dd> +author info (string) +</dd><dt><i>date</i></dt> +<dd> +date info (string) +</dd><dt><i>committer</i></dt> +<dd> +committer info (string) +</dd><dt><i>commitDate</i></dt> +<dd> +commit date info (string) +</dd><dt><i>subject</i></dt> +<dd> +subject of the log entry (string) +</dd><dt><i>message</i></dt> +<dd> +text of the log message (list of strings) +</dd><dt><i>commitId</i></dt> +<dd> +commit id info (string) +</dd><dt><i>changedPaths</i></dt> +<dd> +list of dictionary objects containing + info about the changed files/directories +</dd><dt><i>parents</i></dt> +<dd> +list of parent revisions (list of integers) +</dd><dt><i>refnames</i></dt> +<dd> +tags and branches of the commit (string) +</dd><dt><i>authorMail</i></dt> +<dd> +author's email address (string) +</dd><dt><i>committerMail</i></dt> +<dd> +committer's email address (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +reference to the generated item (QTreeWidgetItem) +</dd> +</dl><a NAME="GitLogBrowserDialog.__generatorFinished" ID="GitLogBrowserDialog.__generatorFinished"></a> +<h4>GitLogBrowserDialog.__generatorFinished</h4> +<b>__generatorFinished</b>(<i></i>) +<p> + Private slot connected to the finished signal of the diff generator. +</p><a NAME="GitLogBrowserDialog.__getBranchesForCommit" ID="GitLogBrowserDialog.__getBranchesForCommit"></a> +<h4>GitLogBrowserDialog.__getBranchesForCommit</h4> +<b>__getBranchesForCommit</b>(<i>commitId</i>) +<p> + Private method to get all branches reachable from a commit ID. +</p><dl> +<dt><i>commitId</i> (str)</dt> +<dd> +commit ID to get the branches for +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +list of tuples containing the branch name and the associated + commit ID of its branch head +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +tuple of (str, str) +</dd> +</dl><a NAME="GitLogBrowserDialog.__getColor" ID="GitLogBrowserDialog.__getColor"></a> +<h4>GitLogBrowserDialog.__getColor</h4> +<b>__getColor</b>(<i>n</i>) +<p> + Private method to get the (rotating) name of the color given an index. +</p><dl> +<dt><i>n</i></dt> +<dd> +color index (integer) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +color name (string) +</dd> +</dl><a NAME="GitLogBrowserDialog.__getCommitForTag" ID="GitLogBrowserDialog.__getCommitForTag"></a> +<h4>GitLogBrowserDialog.__getCommitForTag</h4> +<b>__getCommitForTag</b>(<i>tag</i>) +<p> + Private method to get the commit id for a tag. +</p><dl> +<dt><i>tag</i></dt> +<dd> +tag name (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +commit id shortened to 10 characters (string) +</dd> +</dl><a NAME="GitLogBrowserDialog.__getLogEntries" ID="GitLogBrowserDialog.__getLogEntries"></a> +<h4>GitLogBrowserDialog.__getLogEntries</h4> +<b>__getLogEntries</b>(<i>skip=0, noEntries=0</i>) +<p> + Private method to retrieve log entries from the repository. +</p><dl> +<dt><i>skip</i></dt> +<dd> +number of log entries to skip (integer) +</dd><dt><i>noEntries=</i></dt> +<dd> +number of entries to get (0 = default) (int) +</dd> +</dl><a NAME="GitLogBrowserDialog.__getTagsForCommit" ID="GitLogBrowserDialog.__getTagsForCommit"></a> +<h4>GitLogBrowserDialog.__getTagsForCommit</h4> +<b>__getTagsForCommit</b>(<i>commitId</i>) +<p> + Private method to get all tags reachable from a commit ID. +</p><dl> +<dt><i>commitId</i> (str)</dt> +<dd> +commit ID to get the tags for +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +list of tuples containing the tag name and the associated + commit ID +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +tuple of (str, str) +</dd> +</dl><a NAME="GitLogBrowserDialog.__identifyProject" ID="GitLogBrowserDialog.__identifyProject"></a> +<h4>GitLogBrowserDialog.__identifyProject</h4> +<b>__identifyProject</b>(<i></i>) +<p> + Private method to determine the revision of the project directory. +</p><a NAME="GitLogBrowserDialog.__initActionsMenu" ID="GitLogBrowserDialog.__initActionsMenu"></a> +<h4>GitLogBrowserDialog.__initActionsMenu</h4> +<b>__initActionsMenu</b>(<i></i>) +<p> + Private method to initialize the actions menu. +</p><a NAME="GitLogBrowserDialog.__initData" ID="GitLogBrowserDialog.__initData"></a> +<h4>GitLogBrowserDialog.__initData</h4> +<b>__initData</b>(<i></i>) +<p> + Private method to (re-)initialize some data. +</p><a NAME="GitLogBrowserDialog.__initLogTreeContextMenu" ID="GitLogBrowserDialog.__initLogTreeContextMenu"></a> +<h4>GitLogBrowserDialog.__initLogTreeContextMenu</h4> +<b>__initLogTreeContextMenu</b>(<i></i>) +<p> + Private method to initialize the log tree context menu. +</p><a NAME="GitLogBrowserDialog.__mergeFileSeparators" ID="GitLogBrowserDialog.__mergeFileSeparators"></a> +<h4>GitLogBrowserDialog.__mergeFileSeparators</h4> +<b>__mergeFileSeparators</b>(<i>fileSeparators</i>) +<p> + Private method to merge the file separator entries. +</p><dl> +<dt><i>fileSeparators</i></dt> +<dd> +list of file separator entries to be merged +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +merged list of file separator entries +</dd> +</dl><a NAME="GitLogBrowserDialog.__prepareFieldSearch" ID="GitLogBrowserDialog.__prepareFieldSearch"></a> +<h4>GitLogBrowserDialog.__prepareFieldSearch</h4> +<b>__prepareFieldSearch</b>(<i></i>) +<p> + Private slot to prepare the filed search data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple of field index, search expression and flag indicating + that the field index is a data role (integer, string, boolean) +</dd> +</dl><a NAME="GitLogBrowserDialog.__procFinished" ID="GitLogBrowserDialog.__procFinished"></a> +<h4>GitLogBrowserDialog.__procFinished</h4> +<b>__procFinished</b>(<i>exitCode, exitStatus</i>) +<p> + Private slot connected to the finished signal. +</p><dl> +<dt><i>exitCode</i></dt> +<dd> +exit code of the process (integer) +</dd><dt><i>exitStatus</i></dt> +<dd> +exit status of the process (QProcess.ExitStatus) +</dd> +</dl><a NAME="GitLogBrowserDialog.__processBuffer" ID="GitLogBrowserDialog.__processBuffer"></a> +<h4>GitLogBrowserDialog.__processBuffer</h4> +<b>__processBuffer</b>(<i></i>) +<p> + Private method to process the buffered output of the git log command. +</p><a NAME="GitLogBrowserDialog.__processBufferItem" ID="GitLogBrowserDialog.__processBufferItem"></a> +<h4>GitLogBrowserDialog.__processBufferItem</h4> +<b>__processBufferItem</b>(<i>logEntry</i>) +<p> + Private method to process a log entry. +</p><dl> +<dt><i>logEntry</i></dt> +<dd> +dictionary as generated by __processBuffer +</dd> +</dl><a NAME="GitLogBrowserDialog.__readStderr" ID="GitLogBrowserDialog.__readStderr"></a> +<h4>GitLogBrowserDialog.__readStderr</h4> +<b>__readStderr</b>(<i></i>) +<p> + Private slot to handle the readyReadStandardError signal. +</p><p> + It reads the error output of the process and inserts it into the + error pane. +</p><a NAME="GitLogBrowserDialog.__readStdout" ID="GitLogBrowserDialog.__readStdout"></a> +<h4>GitLogBrowserDialog.__readStdout</h4> +<b>__readStdout</b>(<i></i>) +<p> + Private slot to handle the readyReadStandardOutput signal. +</p><p> + It reads the output of the process and inserts it into a buffer. +</p><a NAME="GitLogBrowserDialog.__reloadGeometry" ID="GitLogBrowserDialog.__reloadGeometry"></a> +<h4>GitLogBrowserDialog.__reloadGeometry</h4> +<b>__reloadGeometry</b>(<i></i>) +<p> + Private method to restore the geometry. +</p><a NAME="GitLogBrowserDialog.__resetUI" ID="GitLogBrowserDialog.__resetUI"></a> +<h4>GitLogBrowserDialog.__resetUI</h4> +<b>__resetUI</b>(<i></i>) +<p> + Private method to reset the user interface. +</p><a NAME="GitLogBrowserDialog.__resizeColumnsFiles" ID="GitLogBrowserDialog.__resizeColumnsFiles"></a> +<h4>GitLogBrowserDialog.__resizeColumnsFiles</h4> +<b>__resizeColumnsFiles</b>(<i></i>) +<p> + Private method to resize the changed files tree columns. +</p><a NAME="GitLogBrowserDialog.__resizeColumnsLog" ID="GitLogBrowserDialog.__resizeColumnsLog"></a> +<h4>GitLogBrowserDialog.__resizeColumnsLog</h4> +<b>__resizeColumnsLog</b>(<i></i>) +<p> + Private method to resize the log tree columns. +</p><a NAME="GitLogBrowserDialog.__resortFiles" ID="GitLogBrowserDialog.__resortFiles"></a> +<h4>GitLogBrowserDialog.__resortFiles</h4> +<b>__resortFiles</b>(<i></i>) +<p> + Private method to resort the changed files tree. +</p><a NAME="GitLogBrowserDialog.__restoreSplitterStates" ID="GitLogBrowserDialog.__restoreSplitterStates"></a> +<h4>GitLogBrowserDialog.__restoreSplitterStates</h4> +<b>__restoreSplitterStates</b>(<i></i>) +<p> + Private method to restore the state of the various splitters. +</p><a NAME="GitLogBrowserDialog.__shortlogActTriggered" ID="GitLogBrowserDialog.__shortlogActTriggered"></a> +<h4>GitLogBrowserDialog.__shortlogActTriggered</h4> +<b>__shortlogActTriggered</b>(<i></i>) +<p> + Private slot to show a short log suitable for release announcements. +</p><a NAME="GitLogBrowserDialog.__showAuthorColumns" ID="GitLogBrowserDialog.__showAuthorColumns"></a> +<h4>GitLogBrowserDialog.__showAuthorColumns</h4> +<b>__showAuthorColumns</b>(<i>on</i>) +<p> + Private slot to show/hide the committer columns. +</p><dl> +<dt><i>on</i></dt> +<dd> +flag indicating the selection state (boolean) +</dd> +</dl><a NAME="GitLogBrowserDialog.__showBranchesColumn" ID="GitLogBrowserDialog.__showBranchesColumn"></a> +<h4>GitLogBrowserDialog.__showBranchesColumn</h4> +<b>__showBranchesColumn</b>(<i>on</i>) +<p> + Private slot to show/hide the branches column. +</p><dl> +<dt><i>on</i></dt> +<dd> +flag indicating the selection state (boolean) +</dd> +</dl><a NAME="GitLogBrowserDialog.__showCommitIdColumn" ID="GitLogBrowserDialog.__showCommitIdColumn"></a> +<h4>GitLogBrowserDialog.__showCommitIdColumn</h4> +<b>__showCommitIdColumn</b>(<i>on</i>) +<p> + Private slot to show/hide the commit ID column. +</p><dl> +<dt><i>on</i></dt> +<dd> +flag indicating the selection state (boolean) +</dd> +</dl><a NAME="GitLogBrowserDialog.__showCommitterColumns" ID="GitLogBrowserDialog.__showCommitterColumns"></a> +<h4>GitLogBrowserDialog.__showCommitterColumns</h4> +<b>__showCommitterColumns</b>(<i>on</i>) +<p> + Private slot to show/hide the committer columns. +</p><dl> +<dt><i>on</i></dt> +<dd> +flag indicating the selection state (boolean) +</dd> +</dl><a NAME="GitLogBrowserDialog.__showError" ID="GitLogBrowserDialog.__showError"></a> +<h4>GitLogBrowserDialog.__showError</h4> +<b>__showError</b>(<i>out</i>) +<p> + Private slot to show some error. +</p><dl> +<dt><i>out</i></dt> +<dd> +error to be shown (string) +</dd> +</dl><a NAME="GitLogBrowserDialog.__showTagsColumn" ID="GitLogBrowserDialog.__showTagsColumn"></a> +<h4>GitLogBrowserDialog.__showTagsColumn</h4> +<b>__showTagsColumn</b>(<i>on</i>) +<p> + Private slot to show/hide the tags column. +</p><dl> +<dt><i>on</i></dt> +<dd> +flag indicating the selection state (boolean) +</dd> +</dl><a NAME="GitLogBrowserDialog.__switchActTriggered" ID="GitLogBrowserDialog.__switchActTriggered"></a> +<h4>GitLogBrowserDialog.__switchActTriggered</h4> +<b>__switchActTriggered</b>(<i></i>) +<p> + Private slot to switch the working directory to the + selected commit. +</p><a NAME="GitLogBrowserDialog.__tagActTriggered" ID="GitLogBrowserDialog.__tagActTriggered"></a> +<h4>GitLogBrowserDialog.__tagActTriggered</h4> +<b>__tagActTriggered</b>(<i></i>) +<p> + Private slot to tag the selected commit. +</p><a NAME="GitLogBrowserDialog.__updateDetailsAndFiles" ID="GitLogBrowserDialog.__updateDetailsAndFiles"></a> +<h4>GitLogBrowserDialog.__updateDetailsAndFiles</h4> +<b>__updateDetailsAndFiles</b>(<i></i>) +<p> + Private slot to update the details and file changes panes. +</p><a NAME="GitLogBrowserDialog.__updateFilesTree" ID="GitLogBrowserDialog.__updateFilesTree"></a> +<h4>GitLogBrowserDialog.__updateFilesTree</h4> +<b>__updateFilesTree</b>(<i>parent, itm</i>) +<p> + Private method to update the files tree with changes of the given item. +</p><dl> +<dt><i>parent</i> (QTreeWidget or QTreeWidgetItem)</dt> +<dd> +parent for the items to be added +</dd><dt><i>itm</i> (QTreeWidgetItem)</dt> +<dd> +reference to the item the update should be based on +</dd> +</dl><a NAME="GitLogBrowserDialog.__updateSbsSelectLabel" ID="GitLogBrowserDialog.__updateSbsSelectLabel"></a> +<h4>GitLogBrowserDialog.__updateSbsSelectLabel</h4> +<b>__updateSbsSelectLabel</b>(<i></i>) +<p> + Private slot to update the enabled status of the diff buttons. +</p><a NAME="GitLogBrowserDialog.__updateToolMenuActions" ID="GitLogBrowserDialog.__updateToolMenuActions"></a> +<h4>GitLogBrowserDialog.__updateToolMenuActions</h4> +<b>__updateToolMenuActions</b>(<i></i>) +<p> + Private slot to update the status of the tool menu actions and + the tool menu button. +</p><a NAME="GitLogBrowserDialog.closeEvent" ID="GitLogBrowserDialog.closeEvent"></a> +<h4>GitLogBrowserDialog.closeEvent</h4> +<b>closeEvent</b>(<i>e</i>) +<p> + Protected slot implementing a close event handler. +</p><dl> +<dt><i>e</i></dt> +<dd> +close event (QCloseEvent) +</dd> +</dl><a NAME="GitLogBrowserDialog.col2x" ID="GitLogBrowserDialog.col2x"></a> +<h4>GitLogBrowserDialog.col2x</h4> +<b>col2x</b>(<i>radius</i>) +<p> + Local function to calculate a x-position for a column. +</p><dl> +<dt><i>col</i></dt> +<dd> +column number (integer) +</dd><dt><i>radius</i></dt> +<dd> +radius of the indicator circle (integer) +</dd> +</dl><a NAME="GitLogBrowserDialog.keyPressEvent" ID="GitLogBrowserDialog.keyPressEvent"></a> +<h4>GitLogBrowserDialog.keyPressEvent</h4> +<b>keyPressEvent</b>(<i>evt</i>) +<p> + Protected slot to handle a key press event. +</p><dl> +<dt><i>evt</i></dt> +<dd> +the key press event (QKeyEvent) +</dd> +</dl><a NAME="GitLogBrowserDialog.on_buttonBox_clicked" ID="GitLogBrowserDialog.on_buttonBox_clicked"></a> +<h4>GitLogBrowserDialog.on_buttonBox_clicked</h4> +<b>on_buttonBox_clicked</b>(<i>button</i>) +<p> + Private slot called by a button of the button box clicked. +</p><dl> +<dt><i>button</i></dt> +<dd> +button that was clicked (QAbstractButton) +</dd> +</dl><a NAME="GitLogBrowserDialog.on_diffSelectLabel_linkActivated" ID="GitLogBrowserDialog.on_diffSelectLabel_linkActivated"></a> +<h4>GitLogBrowserDialog.on_diffSelectLabel_linkActivated</h4> +<b>on_diffSelectLabel_linkActivated</b>(<i>link</i>) +<p> + Private slot to handle the selection of a diff target. +</p><dl> +<dt><i>link</i> (str)</dt> +<dd> +activated link +</dd> +</dl><a NAME="GitLogBrowserDialog.on_downButton_clicked" ID="GitLogBrowserDialog.on_downButton_clicked"></a> +<h4>GitLogBrowserDialog.on_downButton_clicked</h4> +<b>on_downButton_clicked</b>(<i></i>) +<p> + Private slot to move the current item down one entry. +</p><a NAME="GitLogBrowserDialog.on_fieldCombo_activated" ID="GitLogBrowserDialog.on_fieldCombo_activated"></a> +<h4>GitLogBrowserDialog.on_fieldCombo_activated</h4> +<b>on_fieldCombo_activated</b>(<i>txt</i>) +<p> + Private slot called, when a new filter field is selected. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the selected field (string) +</dd> +</dl><a NAME="GitLogBrowserDialog.on_filesTree_currentItemChanged" ID="GitLogBrowserDialog.on_filesTree_currentItemChanged"></a> +<h4>GitLogBrowserDialog.on_filesTree_currentItemChanged</h4> +<b>on_filesTree_currentItemChanged</b>(<i>current, previous</i>) +<p> + Private slot called, when the current item of the files tree changes. +</p><dl> +<dt><i>current</i></dt> +<dd> +reference to the new current item (QTreeWidgetItem) +</dd><dt><i>previous</i></dt> +<dd> +reference to the old current item (QTreeWidgetItem) +</dd> +</dl><a NAME="GitLogBrowserDialog.on_findNextButton_clicked" ID="GitLogBrowserDialog.on_findNextButton_clicked"></a> +<h4>GitLogBrowserDialog.on_findNextButton_clicked</h4> +<b>on_findNextButton_clicked</b>(<i></i>) +<p> + Private slot to find the next item matching the entered criteria. +</p><a NAME="GitLogBrowserDialog.on_findPrevButton_clicked" ID="GitLogBrowserDialog.on_findPrevButton_clicked"></a> +<h4>GitLogBrowserDialog.on_findPrevButton_clicked</h4> +<b>on_findPrevButton_clicked</b>(<i></i>) +<p> + Private slot to find the previous item matching the entered criteria. +</p><a NAME="GitLogBrowserDialog.on_fromDate_dateChanged" ID="GitLogBrowserDialog.on_fromDate_dateChanged"></a> +<h4>GitLogBrowserDialog.on_fromDate_dateChanged</h4> +<b>on_fromDate_dateChanged</b>(<i>date</i>) +<p> + Private slot called, when the from date changes. +</p><dl> +<dt><i>date</i></dt> +<dd> +new date (QDate) +</dd> +</dl><a NAME="GitLogBrowserDialog.on_input_returnPressed" ID="GitLogBrowserDialog.on_input_returnPressed"></a> +<h4>GitLogBrowserDialog.on_input_returnPressed</h4> +<b>on_input_returnPressed</b>(<i></i>) +<p> + Private slot to handle the press of the return key in the input field. +</p><a NAME="GitLogBrowserDialog.on_logTree_currentItemChanged" ID="GitLogBrowserDialog.on_logTree_currentItemChanged"></a> +<h4>GitLogBrowserDialog.on_logTree_currentItemChanged</h4> +<b>on_logTree_currentItemChanged</b>(<i>current, previous</i>) +<p> + Private slot called, when the current item of the log tree changes. +</p><dl> +<dt><i>current</i></dt> +<dd> +reference to the new current item (QTreeWidgetItem) +</dd><dt><i>previous</i></dt> +<dd> +reference to the old current item (QTreeWidgetItem) +</dd> +</dl><a NAME="GitLogBrowserDialog.on_logTree_customContextMenuRequested" ID="GitLogBrowserDialog.on_logTree_customContextMenuRequested"></a> +<h4>GitLogBrowserDialog.on_logTree_customContextMenuRequested</h4> +<b>on_logTree_customContextMenuRequested</b>(<i>pos</i>) +<p> + Private slot to show the context menu of the log tree. +</p><dl> +<dt><i>pos</i></dt> +<dd> +position of the mouse pointer (QPoint) +</dd> +</dl><a NAME="GitLogBrowserDialog.on_logTree_itemSelectionChanged" ID="GitLogBrowserDialog.on_logTree_itemSelectionChanged"></a> +<h4>GitLogBrowserDialog.on_logTree_itemSelectionChanged</h4> +<b>on_logTree_itemSelectionChanged</b>(<i></i>) +<p> + Private slot called, when the selection has changed. +</p><a NAME="GitLogBrowserDialog.on_modeComboBox_currentIndexChanged" ID="GitLogBrowserDialog.on_modeComboBox_currentIndexChanged"></a> +<h4>GitLogBrowserDialog.on_modeComboBox_currentIndexChanged</h4> +<b>on_modeComboBox_currentIndexChanged</b>(<i>index</i>) +<p> + Private slot to react on mode changes. +</p><dl> +<dt><i>index</i></dt> +<dd> +index of the selected entry (integer) +</dd> +</dl><a NAME="GitLogBrowserDialog.on_nextButton_clicked" ID="GitLogBrowserDialog.on_nextButton_clicked"></a> +<h4>GitLogBrowserDialog.on_nextButton_clicked</h4> +<b>on_nextButton_clicked</b>(<i></i>) +<p> + Private slot to handle the Next button. +</p><a NAME="GitLogBrowserDialog.on_passwordCheckBox_toggled" ID="GitLogBrowserDialog.on_passwordCheckBox_toggled"></a> +<h4>GitLogBrowserDialog.on_passwordCheckBox_toggled</h4> +<b>on_passwordCheckBox_toggled</b>(<i>isOn</i>) +<p> + Private slot to handle the password checkbox toggled. +</p><dl> +<dt><i>isOn</i></dt> +<dd> +flag indicating the status of the check box (boolean) +</dd> +</dl><a NAME="GitLogBrowserDialog.on_refreshButton_clicked" ID="GitLogBrowserDialog.on_refreshButton_clicked"></a> +<h4>GitLogBrowserDialog.on_refreshButton_clicked</h4> +<b>on_refreshButton_clicked</b>(<i></i>) +<p> + Private slot to refresh the log. +</p><a NAME="GitLogBrowserDialog.on_rxEdit_returnPressed" ID="GitLogBrowserDialog.on_rxEdit_returnPressed"></a> +<h4>GitLogBrowserDialog.on_rxEdit_returnPressed</h4> +<b>on_rxEdit_returnPressed</b>(<i></i>) +<p> + Private slot handling a press of the Return key in the rxEdit input. +</p><a NAME="GitLogBrowserDialog.on_rxEdit_textChanged" ID="GitLogBrowserDialog.on_rxEdit_textChanged"></a> +<h4>GitLogBrowserDialog.on_rxEdit_textChanged</h4> +<b>on_rxEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot called, when a filter expression is entered. +</p><dl> +<dt><i>txt</i></dt> +<dd> +filter expression (string) +</dd> +</dl><a NAME="GitLogBrowserDialog.on_saveLabel_linkActivated" ID="GitLogBrowserDialog.on_saveLabel_linkActivated"></a> +<h4>GitLogBrowserDialog.on_saveLabel_linkActivated</h4> +<b>on_saveLabel_linkActivated</b>(<i>link</i>) +<p> + Private slot to handle the selection of the save link. +</p><dl> +<dt><i>link</i> (str)</dt> +<dd> +activated link +</dd> +</dl><a NAME="GitLogBrowserDialog.on_sbsSelectLabel_linkActivated" ID="GitLogBrowserDialog.on_sbsSelectLabel_linkActivated"></a> +<h4>GitLogBrowserDialog.on_sbsSelectLabel_linkActivated</h4> +<b>on_sbsSelectLabel_linkActivated</b>(<i>link</i>) +<p> + Private slot to handle selection of a side-by-side link. +</p><dl> +<dt><i>link</i> (str)</dt> +<dd> +text of the selected link +</dd> +</dl><a NAME="GitLogBrowserDialog.on_sendButton_clicked" ID="GitLogBrowserDialog.on_sendButton_clicked"></a> +<h4>GitLogBrowserDialog.on_sendButton_clicked</h4> +<b>on_sendButton_clicked</b>(<i></i>) +<p> + Private slot to send the input to the git process. +</p><a NAME="GitLogBrowserDialog.on_stopCheckBox_clicked" ID="GitLogBrowserDialog.on_stopCheckBox_clicked"></a> +<h4>GitLogBrowserDialog.on_stopCheckBox_clicked</h4> +<b>on_stopCheckBox_clicked</b>(<i>checked</i>) +<p> + Private slot called, when the stop on copy/move checkbox is clicked. +</p><dl> +<dt><i>checked</i></dt> +<dd> +flag indicating the state of the check box (boolean) +</dd> +</dl><a NAME="GitLogBrowserDialog.on_toDate_dateChanged" ID="GitLogBrowserDialog.on_toDate_dateChanged"></a> +<h4>GitLogBrowserDialog.on_toDate_dateChanged</h4> +<b>on_toDate_dateChanged</b>(<i>date</i>) +<p> + Private slot called, when the from date changes. +</p><dl> +<dt><i>date</i></dt> +<dd> +new date (QDate) +</dd> +</dl><a NAME="GitLogBrowserDialog.on_upButton_clicked" ID="GitLogBrowserDialog.on_upButton_clicked"></a> +<h4>GitLogBrowserDialog.on_upButton_clicked</h4> +<b>on_upButton_clicked</b>(<i></i>) +<p> + Private slot to move the current item up one entry. +</p><a NAME="GitLogBrowserDialog.show" ID="GitLogBrowserDialog.show"></a> +<h4>GitLogBrowserDialog.show</h4> +<b>show</b>(<i></i>) +<p> + Public slot to show the dialog. +</p><a NAME="GitLogBrowserDialog.start" ID="GitLogBrowserDialog.start"></a> +<h4>GitLogBrowserDialog.start</h4> +<b>start</b>(<i>fn, isFile=False, noEntries=0</i>) +<p> + Public slot to start the git log command. +</p><dl> +<dt><i>fn</i></dt> +<dd> +filename to show the log for (string) +</dd><dt><i>isFile=</i></dt> +<dd> +flag indicating log for a file is to be shown + (boolean) +</dd><dt><i>noEntries=</i></dt> +<dd> +number of entries to get (0 = default) (int) +</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.GitMergeDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,265 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog</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.GitMergeDialog</h1> +<p> +Module implementing a dialog to enter the merge data. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitMergeDialog">GitMergeDialog</a></td> +<td>Class implementing a dialog to enter the merge data.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitMergeDialog" ID="GitMergeDialog"></a> +<h2>GitMergeDialog</h2> +<p> + Class implementing a dialog to enter the merge data. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitMergeDialog +<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="#GitMergeDialog.__init__">GitMergeDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitMergeDialog.__generateDefaultCommitMessage">__generateDefaultCommitMessage</a></td> +<td>Private slot to generate a default commit message based on the data entered.</td> +</tr><tr> +<td><a href="#GitMergeDialog.__updateOK">__updateOK</a></td> +<td>Private slot to update the OK button.</td> +</tr><tr> +<td><a href="#GitMergeDialog.getParameters">getParameters</a></td> +<td>Public method to retrieve the merge data.</td> +</tr><tr> +<td><a href="#GitMergeDialog.on_branchButton_toggled">on_branchButton_toggled</a></td> +<td>Private slot to handle changes of the Branch select button.</td> +</tr><tr> +<td><a href="#GitMergeDialog.on_branchCombo_editTextChanged">on_branchCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Branch combo.</td> +</tr><tr> +<td><a href="#GitMergeDialog.on_commitGroupBox_toggled">on_commitGroupBox_toggled</a></td> +<td>Private slot to handle changes of the Commit select group.</td> +</tr><tr> +<td><a href="#GitMergeDialog.on_commitMessageEdit_textChanged">on_commitMessageEdit_textChanged</a></td> +<td>Private slot to handle changes of the commit message edit.</td> +</tr><tr> +<td><a href="#GitMergeDialog.on_idButton_toggled">on_idButton_toggled</a></td> +<td>Private slot to handle changes of the ID select button.</td> +</tr><tr> +<td><a href="#GitMergeDialog.on_idEdit_textChanged">on_idEdit_textChanged</a></td> +<td>Private slot to handle changes of the Commit edit.</td> +</tr><tr> +<td><a href="#GitMergeDialog.on_noneButton_toggled">on_noneButton_toggled</a></td> +<td>Private slot to handle changes of the None select button.</td> +</tr><tr> +<td><a href="#GitMergeDialog.on_remoteBranchButton_toggled">on_remoteBranchButton_toggled</a></td> +<td>Private slot to handle changes of the Remote Branch select button.</td> +</tr><tr> +<td><a href="#GitMergeDialog.on_remoteBranchCombo_editTextChanged">on_remoteBranchCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Remote Branch combo.</td> +</tr><tr> +<td><a href="#GitMergeDialog.on_tagButton_toggled">on_tagButton_toggled</a></td> +<td>Private slot to handle changes of the Tag select button.</td> +</tr><tr> +<td><a href="#GitMergeDialog.on_tagCombo_editTextChanged">on_tagCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Tag combo.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitMergeDialog.__init__" ID="GitMergeDialog.__init__"></a> +<h4>GitMergeDialog (Constructor)</h4> +<b>GitMergeDialog</b>(<i>tagsList, branchesList, currentBranch, remoteBranchesList, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>tagsList</i></dt> +<dd> +list of tags (list of strings) +</dd><dt><i>branchesList</i></dt> +<dd> +list of branches (list of strings) +</dd><dt><i>currentBranch</i></dt> +<dd> +name of the current branch (string) +</dd><dt><i>remoteBranchesList</i></dt> +<dd> +list of remote branches (list of strings) +</dd><dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd> +</dl><a NAME="GitMergeDialog.__generateDefaultCommitMessage" ID="GitMergeDialog.__generateDefaultCommitMessage"></a> +<h4>GitMergeDialog.__generateDefaultCommitMessage</h4> +<b>__generateDefaultCommitMessage</b>(<i></i>) +<p> + Private slot to generate a default commit message based on the + data entered. +</p><a NAME="GitMergeDialog.__updateOK" ID="GitMergeDialog.__updateOK"></a> +<h4>GitMergeDialog.__updateOK</h4> +<b>__updateOK</b>(<i></i>) +<p> + Private slot to update the OK button. +</p><a NAME="GitMergeDialog.getParameters" ID="GitMergeDialog.getParameters"></a> +<h4>GitMergeDialog.getParameters</h4> +<b>getParameters</b>(<i></i>) +<p> + Public method to retrieve the merge data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple naming the revision, a flag indicating that the merge + shall be committed, the commit message, a flag indicating that a + log summary shall be appended and a flag indicating to show diff + statistics at the end of the merge (string, boolean, string, + boolean, boolean) +</dd> +</dl><a NAME="GitMergeDialog.on_branchButton_toggled" ID="GitMergeDialog.on_branchButton_toggled"></a> +<h4>GitMergeDialog.on_branchButton_toggled</h4> +<b>on_branchButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Branch select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="GitMergeDialog.on_branchCombo_editTextChanged" ID="GitMergeDialog.on_branchCombo_editTextChanged"></a> +<h4>GitMergeDialog.on_branchCombo_editTextChanged</h4> +<b>on_branchCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Branch combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl><a NAME="GitMergeDialog.on_commitGroupBox_toggled" ID="GitMergeDialog.on_commitGroupBox_toggled"></a> +<h4>GitMergeDialog.on_commitGroupBox_toggled</h4> +<b>on_commitGroupBox_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Commit select group. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the group (boolean) +</dd> +</dl><a NAME="GitMergeDialog.on_commitMessageEdit_textChanged" ID="GitMergeDialog.on_commitMessageEdit_textChanged"></a> +<h4>GitMergeDialog.on_commitMessageEdit_textChanged</h4> +<b>on_commitMessageEdit_textChanged</b>(<i></i>) +<p> + Private slot to handle changes of the commit message edit. +</p><a NAME="GitMergeDialog.on_idButton_toggled" ID="GitMergeDialog.on_idButton_toggled"></a> +<h4>GitMergeDialog.on_idButton_toggled</h4> +<b>on_idButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the ID select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="GitMergeDialog.on_idEdit_textChanged" ID="GitMergeDialog.on_idEdit_textChanged"></a> +<h4>GitMergeDialog.on_idEdit_textChanged</h4> +<b>on_idEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Commit edit. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the edit (string) +</dd> +</dl><a NAME="GitMergeDialog.on_noneButton_toggled" ID="GitMergeDialog.on_noneButton_toggled"></a> +<h4>GitMergeDialog.on_noneButton_toggled</h4> +<b>on_noneButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the None select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="GitMergeDialog.on_remoteBranchButton_toggled" ID="GitMergeDialog.on_remoteBranchButton_toggled"></a> +<h4>GitMergeDialog.on_remoteBranchButton_toggled</h4> +<b>on_remoteBranchButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Remote Branch select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="GitMergeDialog.on_remoteBranchCombo_editTextChanged" ID="GitMergeDialog.on_remoteBranchCombo_editTextChanged"></a> +<h4>GitMergeDialog.on_remoteBranchCombo_editTextChanged</h4> +<b>on_remoteBranchCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Remote Branch combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl><a NAME="GitMergeDialog.on_tagButton_toggled" ID="GitMergeDialog.on_tagButton_toggled"></a> +<h4>GitMergeDialog.on_tagButton_toggled</h4> +<b>on_tagButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Tag select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="GitMergeDialog.on_tagCombo_editTextChanged" ID="GitMergeDialog.on_tagCombo_editTextChanged"></a> +<h4>GitMergeDialog.on_tagCombo_editTextChanged</h4> +<b>on_tagCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Tag combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</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.GitNewProjectOptionsDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,158 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitNewProjectOptionsDialog</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.GitNewProjectOptionsDialog</h1> +<p> +Module implementing the Git Options Dialog for a new project from the +repository. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitNewProjectOptionsDialog">GitNewProjectOptionsDialog</a></td> +<td>Class implementing the Options Dialog for a new project from the repository.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitNewProjectOptionsDialog" ID="GitNewProjectOptionsDialog"></a> +<h2>GitNewProjectOptionsDialog</h2> +<p> + Class implementing the Options Dialog for a new project from the + repository. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitNewProjectOptionsDialog +<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="#GitNewProjectOptionsDialog.__init__">GitNewProjectOptionsDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitNewProjectOptionsDialog.__saveHistory">__saveHistory</a></td> +<td>Private method to save the repository URL history.</td> +</tr><tr> +<td><a href="#GitNewProjectOptionsDialog.getData">getData</a></td> +<td>Public slot to retrieve the data entered into the dialog.</td> +</tr><tr> +<td><a href="#GitNewProjectOptionsDialog.on_projectDirButton_clicked">on_projectDirButton_clicked</a></td> +<td>Private slot to display a directory selection dialog.</td> +</tr><tr> +<td><a href="#GitNewProjectOptionsDialog.on_vcsProjectDirEdit_textChanged">on_vcsProjectDirEdit_textChanged</a></td> +<td>Private slot to handle a change of the project directory.</td> +</tr><tr> +<td><a href="#GitNewProjectOptionsDialog.on_vcsUrlButton_clicked">on_vcsUrlButton_clicked</a></td> +<td>Private slot to display a selection dialog.</td> +</tr><tr> +<td><a href="#GitNewProjectOptionsDialog.on_vcsUrlClearHistoryButton_clicked">on_vcsUrlClearHistoryButton_clicked</a></td> +<td>Private slot to clear the history of entered repository URLs.</td> +</tr><tr> +<td><a href="#GitNewProjectOptionsDialog.on_vcsUrlCombo_editTextChanged">on_vcsUrlCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the URL.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitNewProjectOptionsDialog.__init__" ID="GitNewProjectOptionsDialog.__init__"></a> +<h4>GitNewProjectOptionsDialog (Constructor)</h4> +<b>GitNewProjectOptionsDialog</b>(<i>vcs, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>vcs</i></dt> +<dd> +reference to the version control object +</dd><dt><i>parent</i></dt> +<dd> +parent widget (QWidget) +</dd> +</dl><a NAME="GitNewProjectOptionsDialog.__saveHistory" ID="GitNewProjectOptionsDialog.__saveHistory"></a> +<h4>GitNewProjectOptionsDialog.__saveHistory</h4> +<b>__saveHistory</b>(<i></i>) +<p> + Private method to save the repository URL history. +</p><a NAME="GitNewProjectOptionsDialog.getData" ID="GitNewProjectOptionsDialog.getData"></a> +<h4>GitNewProjectOptionsDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public slot to retrieve the data entered into the dialog. +</p><dl> +<dt>Returns:</dt> +<dd> +a tuple of a string (project directory) and a dictionary + containing the data entered. +</dd> +</dl><a NAME="GitNewProjectOptionsDialog.on_projectDirButton_clicked" ID="GitNewProjectOptionsDialog.on_projectDirButton_clicked"></a> +<h4>GitNewProjectOptionsDialog.on_projectDirButton_clicked</h4> +<b>on_projectDirButton_clicked</b>(<i></i>) +<p> + Private slot to display a directory selection dialog. +</p><a NAME="GitNewProjectOptionsDialog.on_vcsProjectDirEdit_textChanged" ID="GitNewProjectOptionsDialog.on_vcsProjectDirEdit_textChanged"></a> +<h4>GitNewProjectOptionsDialog.on_vcsProjectDirEdit_textChanged</h4> +<b>on_vcsProjectDirEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle a change of the project directory. +</p><dl> +<dt><i>txt</i></dt> +<dd> +name of the project directory (string) +</dd> +</dl><a NAME="GitNewProjectOptionsDialog.on_vcsUrlButton_clicked" ID="GitNewProjectOptionsDialog.on_vcsUrlButton_clicked"></a> +<h4>GitNewProjectOptionsDialog.on_vcsUrlButton_clicked</h4> +<b>on_vcsUrlButton_clicked</b>(<i></i>) +<p> + Private slot to display a selection dialog. +</p><a NAME="GitNewProjectOptionsDialog.on_vcsUrlClearHistoryButton_clicked" ID="GitNewProjectOptionsDialog.on_vcsUrlClearHistoryButton_clicked"></a> +<h4>GitNewProjectOptionsDialog.on_vcsUrlClearHistoryButton_clicked</h4> +<b>on_vcsUrlClearHistoryButton_clicked</b>(<i></i>) +<p> + Private slot to clear the history of entered repository URLs. +</p><a NAME="GitNewProjectOptionsDialog.on_vcsUrlCombo_editTextChanged" ID="GitNewProjectOptionsDialog.on_vcsUrlCombo_editTextChanged"></a> +<h4>GitNewProjectOptionsDialog.on_vcsUrlCombo_editTextChanged</h4> +<b>on_vcsUrlCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the URL. +</p><dl> +<dt><i>txt</i> (str)</dt> +<dd> +current text of the combo box +</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.GitOptionsDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,102 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitOptionsDialog</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.GitOptionsDialog</h1> +<p> +Module implementing a dialog to enter options used to start a project in +the VCS. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitOptionsDialog">GitOptionsDialog</a></td> +<td>Class implementing a dialog to enter options used to start a project in the repository.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitOptionsDialog" ID="GitOptionsDialog"></a> +<h2>GitOptionsDialog</h2> +<p> + Class implementing a dialog to enter options used to start a project in the + repository. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitOptionsDialog +<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="#GitOptionsDialog.__init__">GitOptionsDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitOptionsDialog.getData">getData</a></td> +<td>Public slot to retrieve the data entered into the dialog.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitOptionsDialog.__init__" ID="GitOptionsDialog.__init__"></a> +<h4>GitOptionsDialog (Constructor)</h4> +<b>GitOptionsDialog</b>(<i>vcs, project, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>vcs</i></dt> +<dd> +reference to the version control object +</dd><dt><i>project</i></dt> +<dd> +reference to the project object +</dd><dt><i>parent</i></dt> +<dd> +parent widget (QWidget) +</dd> +</dl><a NAME="GitOptionsDialog.getData" ID="GitOptionsDialog.getData"></a> +<h4>GitOptionsDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public slot to retrieve the data entered into the dialog. +</p><dl> +<dt>Returns:</dt> +<dd> +a dictionary containing the data entered +</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.GitPatchFilesDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,157 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitPatchFilesDialog</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.GitPatchFilesDialog</h1> +<p> +Module implementing a dialog to select a list of patch files. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitPatchFilesDialog">GitPatchFilesDialog</a></td> +<td>Class implementing a dialog to select a list of patch files.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitPatchFilesDialog" ID="GitPatchFilesDialog"></a> +<h2>GitPatchFilesDialog</h2> +<p> + Class implementing a dialog to select a list of patch files. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitPatchFilesDialog +<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="#GitPatchFilesDialog.__init__">GitPatchFilesDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitPatchFilesDialog.__getPatchFilesList">__getPatchFilesList</a></td> +<td>Private method to get the list of patch files.</td> +</tr><tr> +<td><a href="#GitPatchFilesDialog.getData">getData</a></td> +<td>Public slot to get the entered data.</td> +</tr><tr> +<td><a href="#GitPatchFilesDialog.on_addButton_clicked">on_addButton_clicked</a></td> +<td>Private slot to add patch files to the list.</td> +</tr><tr> +<td><a href="#GitPatchFilesDialog.on_deleteButton_clicked">on_deleteButton_clicked</a></td> +<td>Private slot to delete the selected patch files.</td> +</tr><tr> +<td><a href="#GitPatchFilesDialog.on_downButton_clicked">on_downButton_clicked</a></td> +<td>Private slot to move an entry down in the list.</td> +</tr><tr> +<td><a href="#GitPatchFilesDialog.on_patchFilesList_itemSelectionChanged">on_patchFilesList_itemSelectionChanged</a></td> +<td>Private slot to enable button states depending on selection.</td> +</tr><tr> +<td><a href="#GitPatchFilesDialog.on_upButton_clicked">on_upButton_clicked</a></td> +<td>Private slot to move an entry up in the list.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitPatchFilesDialog.__init__" ID="GitPatchFilesDialog.__init__"></a> +<h4>GitPatchFilesDialog (Constructor)</h4> +<b>GitPatchFilesDialog</b>(<i>rootDir, patchCheckData, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>rootDir</i></dt> +<dd> +root of the directory tree (string) +</dd><dt><i>patchCheckData</i></dt> +<dd> +tuple of data as returned by the + getData() method +</dd><dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd> +</dl><a NAME="GitPatchFilesDialog.__getPatchFilesList" ID="GitPatchFilesDialog.__getPatchFilesList"></a> +<h4>GitPatchFilesDialog.__getPatchFilesList</h4> +<b>__getPatchFilesList</b>(<i></i>) +<p> + Private method to get the list of patch files. +</p><dl> +<dt>Returns:</dt> +<dd> +list of patch files (list of string) +</dd> +</dl><a NAME="GitPatchFilesDialog.getData" ID="GitPatchFilesDialog.getData"></a> +<h4>GitPatchFilesDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public slot to get the entered data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple of list of patch files, strip count, flag indicating + that the patch has inaccurate end-of-file marker and a flag + indicating to not trust the line count information + (list of string, integer, boolean, boolean) +</dd> +</dl><a NAME="GitPatchFilesDialog.on_addButton_clicked" ID="GitPatchFilesDialog.on_addButton_clicked"></a> +<h4>GitPatchFilesDialog.on_addButton_clicked</h4> +<b>on_addButton_clicked</b>(<i></i>) +<p> + Private slot to add patch files to the list. +</p><a NAME="GitPatchFilesDialog.on_deleteButton_clicked" ID="GitPatchFilesDialog.on_deleteButton_clicked"></a> +<h4>GitPatchFilesDialog.on_deleteButton_clicked</h4> +<b>on_deleteButton_clicked</b>(<i></i>) +<p> + Private slot to delete the selected patch files. +</p><a NAME="GitPatchFilesDialog.on_downButton_clicked" ID="GitPatchFilesDialog.on_downButton_clicked"></a> +<h4>GitPatchFilesDialog.on_downButton_clicked</h4> +<b>on_downButton_clicked</b>(<i></i>) +<p> + Private slot to move an entry down in the list. +</p><a NAME="GitPatchFilesDialog.on_patchFilesList_itemSelectionChanged" ID="GitPatchFilesDialog.on_patchFilesList_itemSelectionChanged"></a> +<h4>GitPatchFilesDialog.on_patchFilesList_itemSelectionChanged</h4> +<b>on_patchFilesList_itemSelectionChanged</b>(<i></i>) +<p> + Private slot to enable button states depending on selection. +</p><a NAME="GitPatchFilesDialog.on_upButton_clicked" ID="GitPatchFilesDialog.on_upButton_clicked"></a> +<h4>GitPatchFilesDialog.on_upButton_clicked</h4> +<b>on_upButton_clicked</b>(<i></i>) +<p> + Private slot to move an entry up in the list. +</p> +<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.GitPatchStatisticsDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,138 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitPatchStatisticsDialog</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.GitPatchStatisticsDialog</h1> +<p> +Module implementing a dialog to show some patch file statistics. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitPatchStatisticsDialog">GitPatchStatisticsDialog</a></td> +<td>Class implementing a dialog to show some patch file statistics.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitPatchStatisticsDialog" ID="GitPatchStatisticsDialog"></a> +<h2>GitPatchStatisticsDialog</h2> +<p> + Class implementing a dialog to show some patch file statistics. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitPatchStatisticsDialog +<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="#GitPatchStatisticsDialog.__init__">GitPatchStatisticsDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitPatchStatisticsDialog.__createStatisticsItem">__createStatisticsItem</a></td> +<td>Private method to create a file statistics entry.</td> +</tr><tr> +<td><a href="#GitPatchStatisticsDialog.__resizeColumns">__resizeColumns</a></td> +<td>Private method to resize the list columns.</td> +</tr><tr> +<td><a href="#GitPatchStatisticsDialog.getData">getData</a></td> +<td>Public method to get the data used to generate the statistics.</td> +</tr><tr> +<td><a href="#GitPatchStatisticsDialog.start">start</a></td> +<td>Public method to start the statistics process.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitPatchStatisticsDialog.__init__" ID="GitPatchStatisticsDialog.__init__"></a> +<h4>GitPatchStatisticsDialog (Constructor)</h4> +<b>GitPatchStatisticsDialog</b>(<i>vcs, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>vcs</i></dt> +<dd> +reference to the VCS object (Git) +</dd><dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd> +</dl><a NAME="GitPatchStatisticsDialog.__createStatisticsItem" ID="GitPatchStatisticsDialog.__createStatisticsItem"></a> +<h4>GitPatchStatisticsDialog.__createStatisticsItem</h4> +<b>__createStatisticsItem</b>(<i>line</i>) +<p> + Private method to create a file statistics entry. +</p><dl> +<dt><i>line</i></dt> +<dd> +string with file statistics data (string) +</dd> +</dl><a NAME="GitPatchStatisticsDialog.__resizeColumns" ID="GitPatchStatisticsDialog.__resizeColumns"></a> +<h4>GitPatchStatisticsDialog.__resizeColumns</h4> +<b>__resizeColumns</b>(<i></i>) +<p> + Private method to resize the list columns. +</p><a NAME="GitPatchStatisticsDialog.getData" ID="GitPatchStatisticsDialog.getData"></a> +<h4>GitPatchStatisticsDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to get the data used to generate the statistics. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple of list of patch files, strip count, flag indicating + that the patch has inaccurate end-of-file marker and a flag + indicating to not trust the line count information + (list of string, integer, boolean, boolean) +</dd> +</dl><a NAME="GitPatchStatisticsDialog.start" ID="GitPatchStatisticsDialog.start"></a> +<h4>GitPatchStatisticsDialog.start</h4> +<b>start</b>(<i>projectDir, patchCheckData</i>) +<p> + Public method to start the statistics process. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +directory name of the project (string) +</dd><dt><i>patchCheckData</i></dt> +<dd> +tuple of data as returned by the + GitPatchFilesDialog.getData() method +</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.GitPullDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,153 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitPullDialog</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.GitPullDialog</h1> +<p> +Module implementing a dialog to enter data for a Pull operation. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitPullDialog">GitPullDialog</a></td> +<td>Class implementing a dialog to enter data for a Pull operation.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitPullDialog" ID="GitPullDialog"></a> +<h2>GitPullDialog</h2> +<p> + Class implementing a dialog to enter data for a Pull operation. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitPullDialog +<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="#GitPullDialog.__init__">GitPullDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitPullDialog.__okButtonEnable">__okButtonEnable</a></td> +<td>Private slot to set the enabled state of the OK button.</td> +</tr><tr> +<td><a href="#GitPullDialog.__updateButtonEnable">__updateButtonEnable</a></td> +<td>Private slot to set the enabled state of the update button.</td> +</tr><tr> +<td><a href="#GitPullDialog.getData">getData</a></td> +<td>Public method to get the entered data.</td> +</tr><tr> +<td><a href="#GitPullDialog.on_remoteEdit_textChanged">on_remoteEdit_textChanged</a></td> +<td>Private slot to handle changes of the URL edit.</td> +</tr><tr> +<td><a href="#GitPullDialog.on_remotesComboBox_currentTextChanged">on_remotesComboBox_currentTextChanged</a></td> +<td>Private slot to handle changes of the selected repository.</td> +</tr><tr> +<td><a href="#GitPullDialog.on_updateButton_clicked">on_updateButton_clicked</a></td> +<td>Private slot to update the list of remote branches.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitPullDialog.__init__" ID="GitPullDialog.__init__"></a> +<h4>GitPullDialog (Constructor)</h4> +<b>GitPullDialog</b>(<i>vcs, repodir, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>vcs</i></dt> +<dd> +reference to the git object +</dd><dt><i>repodir</i></dt> +<dd> +directory name of the local repository (string) +</dd><dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd> +</dl><a NAME="GitPullDialog.__okButtonEnable" ID="GitPullDialog.__okButtonEnable"></a> +<h4>GitPullDialog.__okButtonEnable</h4> +<b>__okButtonEnable</b>(<i></i>) +<p> + Private slot to set the enabled state of the OK button. +</p><a NAME="GitPullDialog.__updateButtonEnable" ID="GitPullDialog.__updateButtonEnable"></a> +<h4>GitPullDialog.__updateButtonEnable</h4> +<b>__updateButtonEnable</b>(<i></i>) +<p> + Private slot to set the enabled state of the update button. +</p><a NAME="GitPullDialog.getData" ID="GitPullDialog.getData"></a> +<h4>GitPullDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to get the entered data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple of remote name, remote url (for custom remotes), + remote branches, a flag indicating to pull from all repositories + and a flag indicating to remove obsolete tracking references + (string, string, list of strings, boolean, boolean) +</dd> +</dl><a NAME="GitPullDialog.on_remoteEdit_textChanged" ID="GitPullDialog.on_remoteEdit_textChanged"></a> +<h4>GitPullDialog.on_remoteEdit_textChanged</h4> +<b>on_remoteEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the URL edit. +</p><dl> +<dt><i>txt</i></dt> +<dd> +current text of the URL edit (string) +</dd> +</dl><a NAME="GitPullDialog.on_remotesComboBox_currentTextChanged" ID="GitPullDialog.on_remotesComboBox_currentTextChanged"></a> +<h4>GitPullDialog.on_remotesComboBox_currentTextChanged</h4> +<b>on_remotesComboBox_currentTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the selected repository. +</p><dl> +<dt><i>txt</i></dt> +<dd> +current text of the combo box (string) +</dd> +</dl><a NAME="GitPullDialog.on_updateButton_clicked" ID="GitPullDialog.on_updateButton_clicked"></a> +<h4>GitPullDialog.on_updateButton_clicked</h4> +<b>on_updateButton_clicked</b>(<i></i>) +<p> + Private slot to update the list of remote branches. +</p> +<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.GitPushDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,157 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitPushDialog</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.GitPushDialog</h1> +<p> +Module implementing a dialog to enter data for a Push operation. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitPushDialog">GitPushDialog</a></td> +<td>Class implementing a dialog to enter data for a Push operation.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitPushDialog" ID="GitPushDialog"></a> +<h2>GitPushDialog</h2> +<p> + Class implementing a dialog to enter data for a Push operation. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitPushDialog +<h3>Class Attributes</h3> +<table> +<tr><td>ForceColumn</td></tr><tr><td>LocalBranchColumn</td></tr><tr><td>PushColumn</td></tr><tr><td>RemoteBranchColumn</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#GitPushDialog.__init__">GitPushDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitPushDialog.__resizeColumns">__resizeColumns</a></td> +<td>Private slot to adjust the column sizes.</td> +</tr><tr> +<td><a href="#GitPushDialog.getData">getData</a></td> +<td>Public method to get the entered data.</td> +</tr><tr> +<td><a href="#GitPushDialog.on_branchesTree_itemChanged">on_branchesTree_itemChanged</a></td> +<td>Private slot handling changes of a branch item.</td> +</tr><tr> +<td><a href="#GitPushDialog.on_remotesComboBox_currentTextChanged">on_remotesComboBox_currentTextChanged</a></td> +<td>Private slot to handle changes of the selected repository.</td> +</tr><tr> +<td><a href="#GitPushDialog.on_selectAllCheckBox_stateChanged">on_selectAllCheckBox_stateChanged</a></td> +<td>Private slot to select/deselect all branch items.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitPushDialog.__init__" ID="GitPushDialog.__init__"></a> +<h4>GitPushDialog (Constructor)</h4> +<b>GitPushDialog</b>(<i>vcs, repodir, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>vcs</i></dt> +<dd> +reference to the git object +</dd><dt><i>repodir</i></dt> +<dd> +directory name of the local repository (string) +</dd><dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd> +</dl><a NAME="GitPushDialog.__resizeColumns" ID="GitPushDialog.__resizeColumns"></a> +<h4>GitPushDialog.__resizeColumns</h4> +<b>__resizeColumns</b>(<i></i>) +<p> + Private slot to adjust the column sizes. +</p><a NAME="GitPushDialog.getData" ID="GitPushDialog.getData"></a> +<h4>GitPushDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to get the entered data. +</p><dl> +<dt>Returns:</dt> +<dd> +remote name, list of branches to be pushed, + a flag indicating to push tags as well, a flag indicating + to set tracking information and the push method for submodules +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +tuple of (str, list of str, bool, bool, str) +</dd> +</dl><a NAME="GitPushDialog.on_branchesTree_itemChanged" ID="GitPushDialog.on_branchesTree_itemChanged"></a> +<h4>GitPushDialog.on_branchesTree_itemChanged</h4> +<b>on_branchesTree_itemChanged</b>(<i>item, column</i>) +<p> + Private slot handling changes of a branch item. +</p><dl> +<dt><i>item</i></dt> +<dd> +reference to the changed item (QTreeWidgetItem) +</dd><dt><i>column</i></dt> +<dd> +changed column (integer) +</dd> +</dl><a NAME="GitPushDialog.on_remotesComboBox_currentTextChanged" ID="GitPushDialog.on_remotesComboBox_currentTextChanged"></a> +<h4>GitPushDialog.on_remotesComboBox_currentTextChanged</h4> +<b>on_remotesComboBox_currentTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the selected repository. +</p><dl> +<dt><i>txt</i></dt> +<dd> +current text of the combo box (string) +</dd> +</dl><a NAME="GitPushDialog.on_selectAllCheckBox_stateChanged" ID="GitPushDialog.on_selectAllCheckBox_stateChanged"></a> +<h4>GitPushDialog.on_selectAllCheckBox_stateChanged</h4> +<b>on_selectAllCheckBox_stateChanged</b>(<i>state</i>) +<p> + Private slot to select/deselect all branch items. +</p><dl> +<dt><i>state</i></dt> +<dd> +check state of the check box (Qt.CheckState) +</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.GitReflogBrowserDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,320 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog</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.GitReflogBrowserDialog</h1> +<p> +Module implementing a dialog to browse the reflog history. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitReflogBrowserDialog">GitReflogBrowserDialog</a></td> +<td>Class implementing a dialog to browse the reflog history.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitReflogBrowserDialog" ID="GitReflogBrowserDialog"></a> +<h2>GitReflogBrowserDialog</h2> +<p> + Class implementing a dialog to browse the reflog history. +</p> +<h3>Derived from</h3> +QWidget, Ui_GitReflogBrowserDialog +<h3>Class Attributes</h3> +<table> +<tr><td>CommitIdColumn</td></tr><tr><td>NameColumn</td></tr><tr><td>OperationColumn</td></tr><tr><td>SelectorColumn</td></tr><tr><td>SubjectColumn</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#GitReflogBrowserDialog.__init__">GitReflogBrowserDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitReflogBrowserDialog.__finish">__finish</a></td> +<td>Private slot called when the process finished or the user pressed the button.</td> +</tr><tr> +<td><a href="#GitReflogBrowserDialog.__generateReflogItem">__generateReflogItem</a></td> +<td>Private method to generate a reflog tree entry.</td> +</tr><tr> +<td><a href="#GitReflogBrowserDialog.__getReflogEntries">__getReflogEntries</a></td> +<td>Private method to retrieve reflog entries from the repository.</td> +</tr><tr> +<td><a href="#GitReflogBrowserDialog.__initData">__initData</a></td> +<td>Private method to (re-)initialize some data.</td> +</tr><tr> +<td><a href="#GitReflogBrowserDialog.__procFinished">__procFinished</a></td> +<td>Private slot connected to the finished signal.</td> +</tr><tr> +<td><a href="#GitReflogBrowserDialog.__processBuffer">__processBuffer</a></td> +<td>Private method to process the buffered output of the git log command.</td> +</tr><tr> +<td><a href="#GitReflogBrowserDialog.__readStderr">__readStderr</a></td> +<td>Private slot to handle the readyReadStandardError signal.</td> +</tr><tr> +<td><a href="#GitReflogBrowserDialog.__readStdout">__readStdout</a></td> +<td>Private slot to handle the readyReadStandardOutput signal.</td> +</tr><tr> +<td><a href="#GitReflogBrowserDialog.__resetUI">__resetUI</a></td> +<td>Private method to reset the user interface.</td> +</tr><tr> +<td><a href="#GitReflogBrowserDialog.__resizeColumnsLog">__resizeColumnsLog</a></td> +<td>Private method to resize the log tree columns.</td> +</tr><tr> +<td><a href="#GitReflogBrowserDialog.__showError">__showError</a></td> +<td>Private slot to show some error.</td> +</tr><tr> +<td><a href="#GitReflogBrowserDialog.closeEvent">closeEvent</a></td> +<td>Protected slot implementing a close event handler.</td> +</tr><tr> +<td><a href="#GitReflogBrowserDialog.keyPressEvent">keyPressEvent</a></td> +<td>Protected slot to handle a key press event.</td> +</tr><tr> +<td><a href="#GitReflogBrowserDialog.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="#GitReflogBrowserDialog.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> +<td><a href="#GitReflogBrowserDialog.on_nextButton_clicked">on_nextButton_clicked</a></td> +<td>Private slot to handle the Next button.</td> +</tr><tr> +<td><a href="#GitReflogBrowserDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> +<td>Private slot to handle the password checkbox toggled.</td> +</tr><tr> +<td><a href="#GitReflogBrowserDialog.on_refreshButton_clicked">on_refreshButton_clicked</a></td> +<td>Private slot to refresh the log.</td> +</tr><tr> +<td><a href="#GitReflogBrowserDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> +<td>Private slot to send the input to the git process.</td> +</tr><tr> +<td><a href="#GitReflogBrowserDialog.show">show</a></td> +<td>Public slot to show the dialog.</td> +</tr><tr> +<td><a href="#GitReflogBrowserDialog.start">start</a></td> +<td>Public slot to start the git log command.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitReflogBrowserDialog.__init__" ID="GitReflogBrowserDialog.__init__"></a> +<h4>GitReflogBrowserDialog (Constructor)</h4> +<b>GitReflogBrowserDialog</b>(<i>vcs, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>vcs</i></dt> +<dd> +reference to the vcs object +</dd><dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd> +</dl><a NAME="GitReflogBrowserDialog.__finish" ID="GitReflogBrowserDialog.__finish"></a> +<h4>GitReflogBrowserDialog.__finish</h4> +<b>__finish</b>(<i></i>) +<p> + Private slot called when the process finished or the user pressed + the button. +</p><a NAME="GitReflogBrowserDialog.__generateReflogItem" ID="GitReflogBrowserDialog.__generateReflogItem"></a> +<h4>GitReflogBrowserDialog.__generateReflogItem</h4> +<b>__generateReflogItem</b>(<i>commitId, selector, name, subject</i>) +<p> + Private method to generate a reflog tree entry. +</p><dl> +<dt><i>commitId</i></dt> +<dd> +commit id info (string) +</dd><dt><i>selector</i></dt> +<dd> +selector info (string) +</dd><dt><i>name</i></dt> +<dd> +name info (string) +</dd><dt><i>subject</i></dt> +<dd> +subject of the reflog entry (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +reference to the generated item (QTreeWidgetItem) +</dd> +</dl><a NAME="GitReflogBrowserDialog.__getReflogEntries" ID="GitReflogBrowserDialog.__getReflogEntries"></a> +<h4>GitReflogBrowserDialog.__getReflogEntries</h4> +<b>__getReflogEntries</b>(<i>skip=0</i>) +<p> + Private method to retrieve reflog entries from the repository. +</p><dl> +<dt><i>skip</i></dt> +<dd> +number of reflog entries to skip (integer) +</dd> +</dl><a NAME="GitReflogBrowserDialog.__initData" ID="GitReflogBrowserDialog.__initData"></a> +<h4>GitReflogBrowserDialog.__initData</h4> +<b>__initData</b>(<i></i>) +<p> + Private method to (re-)initialize some data. +</p><a NAME="GitReflogBrowserDialog.__procFinished" ID="GitReflogBrowserDialog.__procFinished"></a> +<h4>GitReflogBrowserDialog.__procFinished</h4> +<b>__procFinished</b>(<i>exitCode, exitStatus</i>) +<p> + Private slot connected to the finished signal. +</p><dl> +<dt><i>exitCode</i></dt> +<dd> +exit code of the process (integer) +</dd><dt><i>exitStatus</i></dt> +<dd> +exit status of the process (QProcess.ExitStatus) +</dd> +</dl><a NAME="GitReflogBrowserDialog.__processBuffer" ID="GitReflogBrowserDialog.__processBuffer"></a> +<h4>GitReflogBrowserDialog.__processBuffer</h4> +<b>__processBuffer</b>(<i></i>) +<p> + Private method to process the buffered output of the git log command. +</p><a NAME="GitReflogBrowserDialog.__readStderr" ID="GitReflogBrowserDialog.__readStderr"></a> +<h4>GitReflogBrowserDialog.__readStderr</h4> +<b>__readStderr</b>(<i></i>) +<p> + Private slot to handle the readyReadStandardError signal. +</p><p> + It reads the error output of the process and inserts it into the + error pane. +</p><a NAME="GitReflogBrowserDialog.__readStdout" ID="GitReflogBrowserDialog.__readStdout"></a> +<h4>GitReflogBrowserDialog.__readStdout</h4> +<b>__readStdout</b>(<i></i>) +<p> + Private slot to handle the readyReadStandardOutput signal. +</p><p> + It reads the output of the process and inserts it into a buffer. +</p><a NAME="GitReflogBrowserDialog.__resetUI" ID="GitReflogBrowserDialog.__resetUI"></a> +<h4>GitReflogBrowserDialog.__resetUI</h4> +<b>__resetUI</b>(<i></i>) +<p> + Private method to reset the user interface. +</p><a NAME="GitReflogBrowserDialog.__resizeColumnsLog" ID="GitReflogBrowserDialog.__resizeColumnsLog"></a> +<h4>GitReflogBrowserDialog.__resizeColumnsLog</h4> +<b>__resizeColumnsLog</b>(<i></i>) +<p> + Private method to resize the log tree columns. +</p><a NAME="GitReflogBrowserDialog.__showError" ID="GitReflogBrowserDialog.__showError"></a> +<h4>GitReflogBrowserDialog.__showError</h4> +<b>__showError</b>(<i>out</i>) +<p> + Private slot to show some error. +</p><dl> +<dt><i>out</i></dt> +<dd> +error to be shown (string) +</dd> +</dl><a NAME="GitReflogBrowserDialog.closeEvent" ID="GitReflogBrowserDialog.closeEvent"></a> +<h4>GitReflogBrowserDialog.closeEvent</h4> +<b>closeEvent</b>(<i>e</i>) +<p> + Protected slot implementing a close event handler. +</p><dl> +<dt><i>e</i></dt> +<dd> +close event (QCloseEvent) +</dd> +</dl><a NAME="GitReflogBrowserDialog.keyPressEvent" ID="GitReflogBrowserDialog.keyPressEvent"></a> +<h4>GitReflogBrowserDialog.keyPressEvent</h4> +<b>keyPressEvent</b>(<i>evt</i>) +<p> + Protected slot to handle a key press event. +</p><dl> +<dt><i>evt</i></dt> +<dd> +the key press event (QKeyEvent) +</dd> +</dl><a NAME="GitReflogBrowserDialog.on_buttonBox_clicked" ID="GitReflogBrowserDialog.on_buttonBox_clicked"></a> +<h4>GitReflogBrowserDialog.on_buttonBox_clicked</h4> +<b>on_buttonBox_clicked</b>(<i>button</i>) +<p> + Private slot called by a button of the button box clicked. +</p><dl> +<dt><i>button</i></dt> +<dd> +button that was clicked (QAbstractButton) +</dd> +</dl><a NAME="GitReflogBrowserDialog.on_input_returnPressed" ID="GitReflogBrowserDialog.on_input_returnPressed"></a> +<h4>GitReflogBrowserDialog.on_input_returnPressed</h4> +<b>on_input_returnPressed</b>(<i></i>) +<p> + Private slot to handle the press of the return key in the input field. +</p><a NAME="GitReflogBrowserDialog.on_nextButton_clicked" ID="GitReflogBrowserDialog.on_nextButton_clicked"></a> +<h4>GitReflogBrowserDialog.on_nextButton_clicked</h4> +<b>on_nextButton_clicked</b>(<i></i>) +<p> + Private slot to handle the Next button. +</p><a NAME="GitReflogBrowserDialog.on_passwordCheckBox_toggled" ID="GitReflogBrowserDialog.on_passwordCheckBox_toggled"></a> +<h4>GitReflogBrowserDialog.on_passwordCheckBox_toggled</h4> +<b>on_passwordCheckBox_toggled</b>(<i>isOn</i>) +<p> + Private slot to handle the password checkbox toggled. +</p><dl> +<dt><i>isOn</i></dt> +<dd> +flag indicating the status of the check box (boolean) +</dd> +</dl><a NAME="GitReflogBrowserDialog.on_refreshButton_clicked" ID="GitReflogBrowserDialog.on_refreshButton_clicked"></a> +<h4>GitReflogBrowserDialog.on_refreshButton_clicked</h4> +<b>on_refreshButton_clicked</b>(<i></i>) +<p> + Private slot to refresh the log. +</p><a NAME="GitReflogBrowserDialog.on_sendButton_clicked" ID="GitReflogBrowserDialog.on_sendButton_clicked"></a> +<h4>GitReflogBrowserDialog.on_sendButton_clicked</h4> +<b>on_sendButton_clicked</b>(<i></i>) +<p> + Private slot to send the input to the git process. +</p><a NAME="GitReflogBrowserDialog.show" ID="GitReflogBrowserDialog.show"></a> +<h4>GitReflogBrowserDialog.show</h4> +<b>show</b>(<i></i>) +<p> + Public slot to show the dialog. +</p><a NAME="GitReflogBrowserDialog.start" ID="GitReflogBrowserDialog.start"></a> +<h4>GitReflogBrowserDialog.start</h4> +<b>start</b>(<i>projectdir</i>) +<p> + Public slot to start the git log command. +</p><dl> +<dt><i>projectdir</i></dt> +<dd> +directory name of the project (string) +</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.GitRemoteRepositoriesDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,311 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog</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.GitRemoteRepositoriesDialog</h1> +<p> +Module implementing a dialog to show available remote repositories. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitRemoteRepositoriesDialog">GitRemoteRepositoriesDialog</a></td> +<td>Class implementing a dialog to show available remote repositories.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitRemoteRepositoriesDialog" ID="GitRemoteRepositoriesDialog"></a> +<h2>GitRemoteRepositoriesDialog</h2> +<p> + Class implementing a dialog to show available remote repositories. +</p> +<h3>Derived from</h3> +QWidget, Ui_GitRemoteRepositoriesDialog +<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="#GitRemoteRepositoriesDialog.__init__">GitRemoteRepositoriesDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitRemoteRepositoriesDialog.__finish">__finish</a></td> +<td>Private slot called when the process finished or the user pressed the button.</td> +</tr><tr> +<td><a href="#GitRemoteRepositoriesDialog.__generateItem">__generateItem</a></td> +<td>Private method to generate a status item in the status list.</td> +</tr><tr> +<td><a href="#GitRemoteRepositoriesDialog.__procFinished">__procFinished</a></td> +<td>Private slot connected to the finished signal.</td> +</tr><tr> +<td><a href="#GitRemoteRepositoriesDialog.__readStderr">__readStderr</a></td> +<td>Private slot to handle the readyReadStandardError signal.</td> +</tr><tr> +<td><a href="#GitRemoteRepositoriesDialog.__readStdout">__readStdout</a></td> +<td>Private slot to handle the readyReadStandardOutput signal.</td> +</tr><tr> +<td><a href="#GitRemoteRepositoriesDialog.__resizeColumns">__resizeColumns</a></td> +<td>Private method to resize the list columns.</td> +</tr><tr> +<td><a href="#GitRemoteRepositoriesDialog.__resort">__resort</a></td> +<td>Private method to resort the list.</td> +</tr><tr> +<td><a href="#GitRemoteRepositoriesDialog.__updateButtons">__updateButtons</a></td> +<td>Private method to update the buttons status.</td> +</tr><tr> +<td><a href="#GitRemoteRepositoriesDialog.closeEvent">closeEvent</a></td> +<td>Protected slot implementing a close event handler.</td> +</tr><tr> +<td><a href="#GitRemoteRepositoriesDialog.keyPressEvent">keyPressEvent</a></td> +<td>Protected slot to handle a key press event.</td> +</tr><tr> +<td><a href="#GitRemoteRepositoriesDialog.on_addButton_clicked">on_addButton_clicked</a></td> +<td>Private slot to add a remote repository.</td> +</tr><tr> +<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_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> +<td><a href="#GitRemoteRepositoriesDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> +<td>Private slot to handle the password checkbox toggled.</td> +</tr><tr> +<td><a href="#GitRemoteRepositoriesDialog.on_pruneButton_clicked">on_pruneButton_clicked</a></td> +<td>Private slot to prune all stale remote-tracking branches.</td> +</tr><tr> +<td><a href="#GitRemoteRepositoriesDialog.on_refreshButton_clicked">on_refreshButton_clicked</a></td> +<td>Private slot to refresh the status display.</td> +</tr><tr> +<td><a href="#GitRemoteRepositoriesDialog.on_removeButton_clicked">on_removeButton_clicked</a></td> +<td>Private slot to remove a remote repository.</td> +</tr><tr> +<td><a href="#GitRemoteRepositoriesDialog.on_renameButton_clicked">on_renameButton_clicked</a></td> +<td>Private slot to rename a remote repository.</td> +</tr><tr> +<td><a href="#GitRemoteRepositoriesDialog.on_repolist_itemSelectionChanged">on_repolist_itemSelectionChanged</a></td> +<td>Private slot to act upon changes of selected items.</td> +</tr><tr> +<td><a href="#GitRemoteRepositoriesDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> +<td>Private slot to send the input to the git process.</td> +</tr><tr> +<td><a href="#GitRemoteRepositoriesDialog.on_showInfoButton_clicked">on_showInfoButton_clicked</a></td> +<td>Private slot to show information about a remote repository.</td> +</tr><tr> +<td><a href="#GitRemoteRepositoriesDialog.start">start</a></td> +<td>Public slot to start the git remote command.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitRemoteRepositoriesDialog.__init__" ID="GitRemoteRepositoriesDialog.__init__"></a> +<h4>GitRemoteRepositoriesDialog (Constructor)</h4> +<b>GitRemoteRepositoriesDialog</b>(<i>vcs, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>vcs</i></dt> +<dd> +reference to the vcs object +</dd><dt><i>parent</i></dt> +<dd> +parent widget (QWidget) +</dd> +</dl><a NAME="GitRemoteRepositoriesDialog.__finish" ID="GitRemoteRepositoriesDialog.__finish"></a> +<h4>GitRemoteRepositoriesDialog.__finish</h4> +<b>__finish</b>(<i></i>) +<p> + Private slot called when the process finished or the user pressed + the button. +</p><a NAME="GitRemoteRepositoriesDialog.__generateItem" ID="GitRemoteRepositoriesDialog.__generateItem"></a> +<h4>GitRemoteRepositoriesDialog.__generateItem</h4> +<b>__generateItem</b>(<i>name, url, oper</i>) +<p> + Private method to generate a status item in the status list. +</p><dl> +<dt><i>name</i></dt> +<dd> +name of the remote repository (string) +</dd><dt><i>url</i></dt> +<dd> +URL of the remote repository (string) +</dd><dt><i>oper</i></dt> +<dd> +operation the remote repository may be used for (string) +</dd> +</dl><a NAME="GitRemoteRepositoriesDialog.__procFinished" ID="GitRemoteRepositoriesDialog.__procFinished"></a> +<h4>GitRemoteRepositoriesDialog.__procFinished</h4> +<b>__procFinished</b>(<i>exitCode, exitStatus</i>) +<p> + Private slot connected to the finished signal. +</p><dl> +<dt><i>exitCode</i></dt> +<dd> +exit code of the process (integer) +</dd><dt><i>exitStatus</i></dt> +<dd> +exit status of the process (QProcess.ExitStatus) +</dd> +</dl><a NAME="GitRemoteRepositoriesDialog.__readStderr" ID="GitRemoteRepositoriesDialog.__readStderr"></a> +<h4>GitRemoteRepositoriesDialog.__readStderr</h4> +<b>__readStderr</b>(<i></i>) +<p> + Private slot to handle the readyReadStandardError signal. +</p><p> + It reads the error output of the process and inserts it into the + error pane. +</p><a NAME="GitRemoteRepositoriesDialog.__readStdout" ID="GitRemoteRepositoriesDialog.__readStdout"></a> +<h4>GitRemoteRepositoriesDialog.__readStdout</h4> +<b>__readStdout</b>(<i></i>) +<p> + Private slot to handle the readyReadStandardOutput signal. +</p><p> + It reads the output of the process, formats it and inserts it into + the contents pane. +</p><a NAME="GitRemoteRepositoriesDialog.__resizeColumns" ID="GitRemoteRepositoriesDialog.__resizeColumns"></a> +<h4>GitRemoteRepositoriesDialog.__resizeColumns</h4> +<b>__resizeColumns</b>(<i></i>) +<p> + Private method to resize the list columns. +</p><a NAME="GitRemoteRepositoriesDialog.__resort" ID="GitRemoteRepositoriesDialog.__resort"></a> +<h4>GitRemoteRepositoriesDialog.__resort</h4> +<b>__resort</b>(<i></i>) +<p> + Private method to resort the list. +</p><a NAME="GitRemoteRepositoriesDialog.__updateButtons" ID="GitRemoteRepositoriesDialog.__updateButtons"></a> +<h4>GitRemoteRepositoriesDialog.__updateButtons</h4> +<b>__updateButtons</b>(<i></i>) +<p> + Private method to update the buttons status. +</p><a NAME="GitRemoteRepositoriesDialog.closeEvent" ID="GitRemoteRepositoriesDialog.closeEvent"></a> +<h4>GitRemoteRepositoriesDialog.closeEvent</h4> +<b>closeEvent</b>(<i>e</i>) +<p> + Protected slot implementing a close event handler. +</p><dl> +<dt><i>e</i></dt> +<dd> +close event (QCloseEvent) +</dd> +</dl><a NAME="GitRemoteRepositoriesDialog.keyPressEvent" ID="GitRemoteRepositoriesDialog.keyPressEvent"></a> +<h4>GitRemoteRepositoriesDialog.keyPressEvent</h4> +<b>keyPressEvent</b>(<i>evt</i>) +<p> + Protected slot to handle a key press event. +</p><dl> +<dt><i>evt</i></dt> +<dd> +the key press event (QKeyEvent) +</dd> +</dl><a NAME="GitRemoteRepositoriesDialog.on_addButton_clicked" ID="GitRemoteRepositoriesDialog.on_addButton_clicked"></a> +<h4>GitRemoteRepositoriesDialog.on_addButton_clicked</h4> +<b>on_addButton_clicked</b>(<i></i>) +<p> + Private slot to add a remote repository. +</p><a NAME="GitRemoteRepositoriesDialog.on_buttonBox_clicked" ID="GitRemoteRepositoriesDialog.on_buttonBox_clicked"></a> +<h4>GitRemoteRepositoriesDialog.on_buttonBox_clicked</h4> +<b>on_buttonBox_clicked</b>(<i>button</i>) +<p> + Private slot called by a button of the button box clicked. +</p><dl> +<dt><i>button</i></dt> +<dd> +button that was clicked (QAbstractButton) +</dd> +</dl><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> + Private slot to handle the press of the return key in the input field. +</p><a NAME="GitRemoteRepositoriesDialog.on_passwordCheckBox_toggled" ID="GitRemoteRepositoriesDialog.on_passwordCheckBox_toggled"></a> +<h4>GitRemoteRepositoriesDialog.on_passwordCheckBox_toggled</h4> +<b>on_passwordCheckBox_toggled</b>(<i>isOn</i>) +<p> + Private slot to handle the password checkbox toggled. +</p><dl> +<dt><i>isOn</i></dt> +<dd> +flag indicating the status of the check box (boolean) +</dd> +</dl><a NAME="GitRemoteRepositoriesDialog.on_pruneButton_clicked" ID="GitRemoteRepositoriesDialog.on_pruneButton_clicked"></a> +<h4>GitRemoteRepositoriesDialog.on_pruneButton_clicked</h4> +<b>on_pruneButton_clicked</b>(<i></i>) +<p> + Private slot to prune all stale remote-tracking branches. +</p><a NAME="GitRemoteRepositoriesDialog.on_refreshButton_clicked" ID="GitRemoteRepositoriesDialog.on_refreshButton_clicked"></a> +<h4>GitRemoteRepositoriesDialog.on_refreshButton_clicked</h4> +<b>on_refreshButton_clicked</b>(<i></i>) +<p> + Private slot to refresh the status display. +</p><a NAME="GitRemoteRepositoriesDialog.on_removeButton_clicked" ID="GitRemoteRepositoriesDialog.on_removeButton_clicked"></a> +<h4>GitRemoteRepositoriesDialog.on_removeButton_clicked</h4> +<b>on_removeButton_clicked</b>(<i></i>) +<p> + Private slot to remove a remote repository. +</p><a NAME="GitRemoteRepositoriesDialog.on_renameButton_clicked" ID="GitRemoteRepositoriesDialog.on_renameButton_clicked"></a> +<h4>GitRemoteRepositoriesDialog.on_renameButton_clicked</h4> +<b>on_renameButton_clicked</b>(<i></i>) +<p> + Private slot to rename a remote repository. +</p><a NAME="GitRemoteRepositoriesDialog.on_repolist_itemSelectionChanged" ID="GitRemoteRepositoriesDialog.on_repolist_itemSelectionChanged"></a> +<h4>GitRemoteRepositoriesDialog.on_repolist_itemSelectionChanged</h4> +<b>on_repolist_itemSelectionChanged</b>(<i></i>) +<p> + Private slot to act upon changes of selected items. +</p><a NAME="GitRemoteRepositoriesDialog.on_sendButton_clicked" ID="GitRemoteRepositoriesDialog.on_sendButton_clicked"></a> +<h4>GitRemoteRepositoriesDialog.on_sendButton_clicked</h4> +<b>on_sendButton_clicked</b>(<i></i>) +<p> + Private slot to send the input to the git process. +</p><a NAME="GitRemoteRepositoriesDialog.on_showInfoButton_clicked" ID="GitRemoteRepositoriesDialog.on_showInfoButton_clicked"></a> +<h4>GitRemoteRepositoriesDialog.on_showInfoButton_clicked</h4> +<b>on_showInfoButton_clicked</b>(<i></i>) +<p> + Private slot to show information about a remote repository. +</p><a NAME="GitRemoteRepositoriesDialog.start" ID="GitRemoteRepositoriesDialog.start"></a> +<h4>GitRemoteRepositoriesDialog.start</h4> +<b>start</b>(<i>projectDir</i>) +<p> + Public slot to start the git remote command. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</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.GitRevisionSelectionDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,225 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitRevisionSelectionDialog</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.GitRevisionSelectionDialog</h1> +<p> +Module implementing a dialog to select a revision. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitRevisionSelectionDialog">GitRevisionSelectionDialog</a></td> +<td>Class implementing a dialog to select a revision.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitRevisionSelectionDialog" ID="GitRevisionSelectionDialog"></a> +<h2>GitRevisionSelectionDialog</h2> +<p> + Class implementing a dialog to select a revision. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitRevisionSelectionDialog +<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="#GitRevisionSelectionDialog.__init__">GitRevisionSelectionDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitRevisionSelectionDialog.__updateOK">__updateOK</a></td> +<td>Private slot to update the OK button.</td> +</tr><tr> +<td><a href="#GitRevisionSelectionDialog.getRevision">getRevision</a></td> +<td>Public method to retrieve the selected revision.</td> +</tr><tr> +<td><a href="#GitRevisionSelectionDialog.on_branchButton_toggled">on_branchButton_toggled</a></td> +<td>Private slot to handle changes of the Branch select button.</td> +</tr><tr> +<td><a href="#GitRevisionSelectionDialog.on_branchCombo_editTextChanged">on_branchCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Branch combo.</td> +</tr><tr> +<td><a href="#GitRevisionSelectionDialog.on_remoteBranchButton_toggled">on_remoteBranchButton_toggled</a></td> +<td>Private slot to handle changes of the Remote Branch select button.</td> +</tr><tr> +<td><a href="#GitRevisionSelectionDialog.on_remoteBranchCombo_editTextChanged">on_remoteBranchCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Remote Branch combo.</td> +</tr><tr> +<td><a href="#GitRevisionSelectionDialog.on_revButton_toggled">on_revButton_toggled</a></td> +<td>Private slot to handle changes of the rev select button.</td> +</tr><tr> +<td><a href="#GitRevisionSelectionDialog.on_revEdit_textChanged">on_revEdit_textChanged</a></td> +<td>Private slot to handle changes of the rev edit.</td> +</tr><tr> +<td><a href="#GitRevisionSelectionDialog.on_tagButton_toggled">on_tagButton_toggled</a></td> +<td>Private slot to handle changes of the Tag select button.</td> +</tr><tr> +<td><a href="#GitRevisionSelectionDialog.on_tagCombo_editTextChanged">on_tagCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Tag combo.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitRevisionSelectionDialog.__init__" ID="GitRevisionSelectionDialog.__init__"></a> +<h4>GitRevisionSelectionDialog (Constructor)</h4> +<b>GitRevisionSelectionDialog</b>(<i>tagsList, branchesList, trackingBranchesList=None, noneLabel="", showBranches=True, showHead=True, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>tagsList</i></dt> +<dd> +list of tags (list of strings) +</dd><dt><i>branchesList</i></dt> +<dd> +list of branches (list of strings) +</dd><dt><i>trackingBranchesList</i></dt> +<dd> +list of remote branches (list of strings) +</dd><dt><i>noneLabel</i></dt> +<dd> +label text for "no revision selected" (string) +</dd><dt><i>showBranches</i></dt> +<dd> +flag indicating to show the branch selection + (boolean) +</dd><dt><i>showHead</i></dt> +<dd> +flag indicating to show the head selection (boolean) +</dd><dt><i>parent</i></dt> +<dd> +parent widget (QWidget) +</dd> +</dl><a NAME="GitRevisionSelectionDialog.__updateOK" ID="GitRevisionSelectionDialog.__updateOK"></a> +<h4>GitRevisionSelectionDialog.__updateOK</h4> +<b>__updateOK</b>(<i></i>) +<p> + Private slot to update the OK button. +</p><a NAME="GitRevisionSelectionDialog.getRevision" ID="GitRevisionSelectionDialog.getRevision"></a> +<h4>GitRevisionSelectionDialog.getRevision</h4> +<b>getRevision</b>(<i></i>) +<p> + Public method to retrieve the selected revision. +</p><dl> +<dt>Returns:</dt> +<dd> +selected revision (string) +</dd> +</dl><a NAME="GitRevisionSelectionDialog.on_branchButton_toggled" ID="GitRevisionSelectionDialog.on_branchButton_toggled"></a> +<h4>GitRevisionSelectionDialog.on_branchButton_toggled</h4> +<b>on_branchButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Branch select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="GitRevisionSelectionDialog.on_branchCombo_editTextChanged" ID="GitRevisionSelectionDialog.on_branchCombo_editTextChanged"></a> +<h4>GitRevisionSelectionDialog.on_branchCombo_editTextChanged</h4> +<b>on_branchCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Branch combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl><a NAME="GitRevisionSelectionDialog.on_remoteBranchButton_toggled" ID="GitRevisionSelectionDialog.on_remoteBranchButton_toggled"></a> +<h4>GitRevisionSelectionDialog.on_remoteBranchButton_toggled</h4> +<b>on_remoteBranchButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Remote Branch select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="GitRevisionSelectionDialog.on_remoteBranchCombo_editTextChanged" ID="GitRevisionSelectionDialog.on_remoteBranchCombo_editTextChanged"></a> +<h4>GitRevisionSelectionDialog.on_remoteBranchCombo_editTextChanged</h4> +<b>on_remoteBranchCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Remote Branch combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl><a NAME="GitRevisionSelectionDialog.on_revButton_toggled" ID="GitRevisionSelectionDialog.on_revButton_toggled"></a> +<h4>GitRevisionSelectionDialog.on_revButton_toggled</h4> +<b>on_revButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the rev select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="GitRevisionSelectionDialog.on_revEdit_textChanged" ID="GitRevisionSelectionDialog.on_revEdit_textChanged"></a> +<h4>GitRevisionSelectionDialog.on_revEdit_textChanged</h4> +<b>on_revEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the rev edit. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the edit (string) +</dd> +</dl><a NAME="GitRevisionSelectionDialog.on_tagButton_toggled" ID="GitRevisionSelectionDialog.on_tagButton_toggled"></a> +<h4>GitRevisionSelectionDialog.on_tagButton_toggled</h4> +<b>on_tagButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Tag select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="GitRevisionSelectionDialog.on_tagCombo_editTextChanged" ID="GitRevisionSelectionDialog.on_tagCombo_editTextChanged"></a> +<h4>GitRevisionSelectionDialog.on_tagCombo_editTextChanged</h4> +<b>on_tagCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Tag combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</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.GitRevisionsSelectionDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,283 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog</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.GitRevisionsSelectionDialog</h1> +<p> +Module implementing a dialog to enter the revisions for the git diff command. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitRevisionsSelectionDialog">GitRevisionsSelectionDialog</a></td> +<td>Class implementing a dialog to enter the revisions for the git diff command.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitRevisionsSelectionDialog" ID="GitRevisionsSelectionDialog"></a> +<h2>GitRevisionsSelectionDialog</h2> +<p> + Class implementing a dialog to enter the revisions for the git diff + command. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitRevisionsSelectionDialog +<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="#GitRevisionsSelectionDialog.__init__">GitRevisionsSelectionDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitRevisionsSelectionDialog.__getRevision">__getRevision</a></td> +<td>Private method to generate the revision.</td> +</tr><tr> +<td><a href="#GitRevisionsSelectionDialog.__updateOK">__updateOK</a></td> +<td>Private slot to update the OK button.</td> +</tr><tr> +<td><a href="#GitRevisionsSelectionDialog.getRevisions">getRevisions</a></td> +<td>Public method to get the revisions.</td> +</tr><tr> +<td><a href="#GitRevisionsSelectionDialog.on_branch1Button_toggled">on_branch1Button_toggled</a></td> +<td>Private slot to handle changes of the Branch1 select button.</td> +</tr><tr> +<td><a href="#GitRevisionsSelectionDialog.on_branch1Combo_editTextChanged">on_branch1Combo_editTextChanged</a></td> +<td>Private slot to handle changes of the Branch1 combo.</td> +</tr><tr> +<td><a href="#GitRevisionsSelectionDialog.on_branch2Button_toggled">on_branch2Button_toggled</a></td> +<td>Private slot to handle changes of the Branch2 select button.</td> +</tr><tr> +<td><a href="#GitRevisionsSelectionDialog.on_branch2Combo_editTextChanged">on_branch2Combo_editTextChanged</a></td> +<td>Private slot to handle changes of the Branch2 combo.</td> +</tr><tr> +<td><a href="#GitRevisionsSelectionDialog.on_rev1Button_toggled">on_rev1Button_toggled</a></td> +<td>Private slot to handle changes of the rev1 select button.</td> +</tr><tr> +<td><a href="#GitRevisionsSelectionDialog.on_rev1Edit_textChanged">on_rev1Edit_textChanged</a></td> +<td>Private slot to handle changes of the rev1 edit.</td> +</tr><tr> +<td><a href="#GitRevisionsSelectionDialog.on_rev2Button_toggled">on_rev2Button_toggled</a></td> +<td>Private slot to handle changes of the rev2 select button.</td> +</tr><tr> +<td><a href="#GitRevisionsSelectionDialog.on_rev2Edit_textChanged">on_rev2Edit_textChanged</a></td> +<td>Private slot to handle changes of the rev2 edit.</td> +</tr><tr> +<td><a href="#GitRevisionsSelectionDialog.on_tag1Button_toggled">on_tag1Button_toggled</a></td> +<td>Private slot to handle changes of the Tag1 select button.</td> +</tr><tr> +<td><a href="#GitRevisionsSelectionDialog.on_tag1Combo_editTextChanged">on_tag1Combo_editTextChanged</a></td> +<td>Private slot to handle changes of the Tag1 combo.</td> +</tr><tr> +<td><a href="#GitRevisionsSelectionDialog.on_tag2Button_toggled">on_tag2Button_toggled</a></td> +<td>Private slot to handle changes of the Tag2 select button.</td> +</tr><tr> +<td><a href="#GitRevisionsSelectionDialog.on_tag2Combo_editTextChanged">on_tag2Combo_editTextChanged</a></td> +<td>Private slot to handle changes of the Tag2 combo.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitRevisionsSelectionDialog.__init__" ID="GitRevisionsSelectionDialog.__init__"></a> +<h4>GitRevisionsSelectionDialog (Constructor)</h4> +<b>GitRevisionsSelectionDialog</b>(<i>tagsList, branchesList, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>tagsList</i></dt> +<dd> +list of tags (list of strings) +</dd><dt><i>branchesList</i></dt> +<dd> +list of branches (list of strings) +</dd><dt><i>parent</i></dt> +<dd> +parent widget of the dialog (QWidget) +</dd> +</dl><a NAME="GitRevisionsSelectionDialog.__getRevision" ID="GitRevisionsSelectionDialog.__getRevision"></a> +<h4>GitRevisionsSelectionDialog.__getRevision</h4> +<b>__getRevision</b>(<i>no</i>) +<p> + Private method to generate the revision. +</p><dl> +<dt><i>no</i></dt> +<dd> +revision number to generate (1 or 2) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +revision (string) +</dd> +</dl><a NAME="GitRevisionsSelectionDialog.__updateOK" ID="GitRevisionsSelectionDialog.__updateOK"></a> +<h4>GitRevisionsSelectionDialog.__updateOK</h4> +<b>__updateOK</b>(<i></i>) +<p> + Private slot to update the OK button. +</p><a NAME="GitRevisionsSelectionDialog.getRevisions" ID="GitRevisionsSelectionDialog.getRevisions"></a> +<h4>GitRevisionsSelectionDialog.getRevisions</h4> +<b>getRevisions</b>(<i></i>) +<p> + Public method to get the revisions. +</p><dl> +<dt>Returns:</dt> +<dd> +list of two revisions (list of strings) +</dd> +</dl><a NAME="GitRevisionsSelectionDialog.on_branch1Button_toggled" ID="GitRevisionsSelectionDialog.on_branch1Button_toggled"></a> +<h4>GitRevisionsSelectionDialog.on_branch1Button_toggled</h4> +<b>on_branch1Button_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Branch1 select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="GitRevisionsSelectionDialog.on_branch1Combo_editTextChanged" ID="GitRevisionsSelectionDialog.on_branch1Combo_editTextChanged"></a> +<h4>GitRevisionsSelectionDialog.on_branch1Combo_editTextChanged</h4> +<b>on_branch1Combo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Branch1 combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl><a NAME="GitRevisionsSelectionDialog.on_branch2Button_toggled" ID="GitRevisionsSelectionDialog.on_branch2Button_toggled"></a> +<h4>GitRevisionsSelectionDialog.on_branch2Button_toggled</h4> +<b>on_branch2Button_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Branch2 select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="GitRevisionsSelectionDialog.on_branch2Combo_editTextChanged" ID="GitRevisionsSelectionDialog.on_branch2Combo_editTextChanged"></a> +<h4>GitRevisionsSelectionDialog.on_branch2Combo_editTextChanged</h4> +<b>on_branch2Combo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Branch2 combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl><a NAME="GitRevisionsSelectionDialog.on_rev1Button_toggled" ID="GitRevisionsSelectionDialog.on_rev1Button_toggled"></a> +<h4>GitRevisionsSelectionDialog.on_rev1Button_toggled</h4> +<b>on_rev1Button_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the rev1 select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="GitRevisionsSelectionDialog.on_rev1Edit_textChanged" ID="GitRevisionsSelectionDialog.on_rev1Edit_textChanged"></a> +<h4>GitRevisionsSelectionDialog.on_rev1Edit_textChanged</h4> +<b>on_rev1Edit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the rev1 edit. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the edit (string) +</dd> +</dl><a NAME="GitRevisionsSelectionDialog.on_rev2Button_toggled" ID="GitRevisionsSelectionDialog.on_rev2Button_toggled"></a> +<h4>GitRevisionsSelectionDialog.on_rev2Button_toggled</h4> +<b>on_rev2Button_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the rev2 select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="GitRevisionsSelectionDialog.on_rev2Edit_textChanged" ID="GitRevisionsSelectionDialog.on_rev2Edit_textChanged"></a> +<h4>GitRevisionsSelectionDialog.on_rev2Edit_textChanged</h4> +<b>on_rev2Edit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the rev2 edit. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the edit (string) +</dd> +</dl><a NAME="GitRevisionsSelectionDialog.on_tag1Button_toggled" ID="GitRevisionsSelectionDialog.on_tag1Button_toggled"></a> +<h4>GitRevisionsSelectionDialog.on_tag1Button_toggled</h4> +<b>on_tag1Button_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Tag1 select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="GitRevisionsSelectionDialog.on_tag1Combo_editTextChanged" ID="GitRevisionsSelectionDialog.on_tag1Combo_editTextChanged"></a> +<h4>GitRevisionsSelectionDialog.on_tag1Combo_editTextChanged</h4> +<b>on_tag1Combo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Tag1 combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl><a NAME="GitRevisionsSelectionDialog.on_tag2Button_toggled" ID="GitRevisionsSelectionDialog.on_tag2Button_toggled"></a> +<h4>GitRevisionsSelectionDialog.on_tag2Button_toggled</h4> +<b>on_tag2Button_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Tag2 select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="GitRevisionsSelectionDialog.on_tag2Combo_editTextChanged" ID="GitRevisionsSelectionDialog.on_tag2Combo_editTextChanged"></a> +<h4>GitRevisionsSelectionDialog.on_tag2Combo_editTextChanged</h4> +<b>on_tag2Combo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Tag2 combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</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.GitStashBrowserDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,355 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog</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.GitStashBrowserDialog</h1> +<p> +Module implementing a dialog to show the stashes. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitStashBrowserDialog">GitStashBrowserDialog</a></td> +<td>Class implementing a dialog to show the stashes.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitStashBrowserDialog" ID="GitStashBrowserDialog"></a> +<h2>GitStashBrowserDialog</h2> +<p> + Class implementing a dialog to show the stashes. +</p> +<h3>Derived from</h3> +QWidget, Ui_GitStashBrowserDialog +<h3>Class Attributes</h3> +<table> +<tr><td>DateColumn</td></tr><tr><td>FileStatisticsRole</td></tr><tr><td>MessageColumn</td></tr><tr><td>NameColumn</td></tr><tr><td>Separator</td></tr><tr><td>TotalStatisticsRole</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#GitStashBrowserDialog.__init__">GitStashBrowserDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitStashBrowserDialog.__apply">__apply</a></td> +<td>Private slot to apply the selected stash but keep it.</td> +</tr><tr> +<td><a href="#GitStashBrowserDialog.__branch">__branch</a></td> +<td>Private slot to create a branch from the selected stash.</td> +</tr><tr> +<td><a href="#GitStashBrowserDialog.__clear">__clear</a></td> +<td>Private slot to delete all stashes.</td> +</tr><tr> +<td><a href="#GitStashBrowserDialog.__drop">__drop</a></td> +<td>Private slot to delete the selected stash.</td> +</tr><tr> +<td><a href="#GitStashBrowserDialog.__finish">__finish</a></td> +<td>Private slot called when the process finished or the user pressed the button.</td> +</tr><tr> +<td><a href="#GitStashBrowserDialog.__generateStashEntry">__generateStashEntry</a></td> +<td>Private method to generate the stash items.</td> +</tr><tr> +<td><a href="#GitStashBrowserDialog.__getStashEntries">__getStashEntries</a></td> +<td>Private method to retrieve the list of stashes.</td> +</tr><tr> +<td><a href="#GitStashBrowserDialog.__pop">__pop</a></td> +<td>Private slot to apply the selected stash and delete it.</td> +</tr><tr> +<td><a href="#GitStashBrowserDialog.__procFinished">__procFinished</a></td> +<td>Private slot connected to the finished signal.</td> +</tr><tr> +<td><a href="#GitStashBrowserDialog.__processBuffer">__processBuffer</a></td> +<td>Private method to process the buffered output of the git stash command.</td> +</tr><tr> +<td><a href="#GitStashBrowserDialog.__readStderr">__readStderr</a></td> +<td>Private slot to handle the readyReadStandardError signal.</td> +</tr><tr> +<td><a href="#GitStashBrowserDialog.__readStdout">__readStdout</a></td> +<td>Private slot to handle the readyReadStandardOutput signal.</td> +</tr><tr> +<td><a href="#GitStashBrowserDialog.__resetUI">__resetUI</a></td> +<td>Private method to reset the user interface.</td> +</tr><tr> +<td><a href="#GitStashBrowserDialog.__resizeColumnsStashes">__resizeColumnsStashes</a></td> +<td>Private method to resize the shelve list columns.</td> +</tr><tr> +<td><a href="#GitStashBrowserDialog.__showPatch">__showPatch</a></td> +<td>Private slot to show the contents of the selected stash.</td> +</tr><tr> +<td><a href="#GitStashBrowserDialog.closeEvent">closeEvent</a></td> +<td>Protected slot implementing a close event handler.</td> +</tr><tr> +<td><a href="#GitStashBrowserDialog.keyPressEvent">keyPressEvent</a></td> +<td>Protected slot to handle a key press event.</td> +</tr><tr> +<td><a href="#GitStashBrowserDialog.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="#GitStashBrowserDialog.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> +<td><a href="#GitStashBrowserDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> +<td>Private slot to handle the password checkbox toggled.</td> +</tr><tr> +<td><a href="#GitStashBrowserDialog.on_refreshButton_clicked">on_refreshButton_clicked</a></td> +<td>Private slot to refresh the list of shelves.</td> +</tr><tr> +<td><a href="#GitStashBrowserDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> +<td>Private slot to send the input to the git process.</td> +</tr><tr> +<td><a href="#GitStashBrowserDialog.on_stashList_currentItemChanged">on_stashList_currentItemChanged</a></td> +<td>Private slot called, when the current item of the stash list changes.</td> +</tr><tr> +<td><a href="#GitStashBrowserDialog.on_stashList_customContextMenuRequested">on_stashList_customContextMenuRequested</a></td> +<td>Private slot to show the context menu of the stash list.</td> +</tr><tr> +<td><a href="#GitStashBrowserDialog.show">show</a></td> +<td>Public slot to show the dialog.</td> +</tr><tr> +<td><a href="#GitStashBrowserDialog.start">start</a></td> +<td>Public slot to start the git stash command.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitStashBrowserDialog.__init__" ID="GitStashBrowserDialog.__init__"></a> +<h4>GitStashBrowserDialog (Constructor)</h4> +<b>GitStashBrowserDialog</b>(<i>vcs, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>vcs</i></dt> +<dd> +reference to the vcs object +</dd><dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd> +</dl><a NAME="GitStashBrowserDialog.__apply" ID="GitStashBrowserDialog.__apply"></a> +<h4>GitStashBrowserDialog.__apply</h4> +<b>__apply</b>(<i></i>) +<p> + Private slot to apply the selected stash but keep it. +</p><a NAME="GitStashBrowserDialog.__branch" ID="GitStashBrowserDialog.__branch"></a> +<h4>GitStashBrowserDialog.__branch</h4> +<b>__branch</b>(<i></i>) +<p> + Private slot to create a branch from the selected stash. +</p><a NAME="GitStashBrowserDialog.__clear" ID="GitStashBrowserDialog.__clear"></a> +<h4>GitStashBrowserDialog.__clear</h4> +<b>__clear</b>(<i></i>) +<p> + Private slot to delete all stashes. +</p><a NAME="GitStashBrowserDialog.__drop" ID="GitStashBrowserDialog.__drop"></a> +<h4>GitStashBrowserDialog.__drop</h4> +<b>__drop</b>(<i></i>) +<p> + Private slot to delete the selected stash. +</p><a NAME="GitStashBrowserDialog.__finish" ID="GitStashBrowserDialog.__finish"></a> +<h4>GitStashBrowserDialog.__finish</h4> +<b>__finish</b>(<i></i>) +<p> + Private slot called when the process finished or the user pressed + the button. +</p><a NAME="GitStashBrowserDialog.__generateStashEntry" ID="GitStashBrowserDialog.__generateStashEntry"></a> +<h4>GitStashBrowserDialog.__generateStashEntry</h4> +<b>__generateStashEntry</b>(<i>name, date, message</i>) +<p> + Private method to generate the stash items. +</p><dl> +<dt><i>name</i></dt> +<dd> +name of the stash (string) +</dd><dt><i>date</i></dt> +<dd> +date the stash was created (string) +</dd><dt><i>message</i></dt> +<dd> +stash message (string) +</dd> +</dl><a NAME="GitStashBrowserDialog.__getStashEntries" ID="GitStashBrowserDialog.__getStashEntries"></a> +<h4>GitStashBrowserDialog.__getStashEntries</h4> +<b>__getStashEntries</b>(<i></i>) +<p> + Private method to retrieve the list of stashes. +</p><a NAME="GitStashBrowserDialog.__pop" ID="GitStashBrowserDialog.__pop"></a> +<h4>GitStashBrowserDialog.__pop</h4> +<b>__pop</b>(<i></i>) +<p> + Private slot to apply the selected stash and delete it. +</p><a NAME="GitStashBrowserDialog.__procFinished" ID="GitStashBrowserDialog.__procFinished"></a> +<h4>GitStashBrowserDialog.__procFinished</h4> +<b>__procFinished</b>(<i>exitCode, exitStatus</i>) +<p> + Private slot connected to the finished signal. +</p><dl> +<dt><i>exitCode</i></dt> +<dd> +exit code of the process (integer) +</dd><dt><i>exitStatus</i></dt> +<dd> +exit status of the process (QProcess.ExitStatus) +</dd> +</dl><a NAME="GitStashBrowserDialog.__processBuffer" ID="GitStashBrowserDialog.__processBuffer"></a> +<h4>GitStashBrowserDialog.__processBuffer</h4> +<b>__processBuffer</b>(<i></i>) +<p> + Private method to process the buffered output of the git stash command. +</p><a NAME="GitStashBrowserDialog.__readStderr" ID="GitStashBrowserDialog.__readStderr"></a> +<h4>GitStashBrowserDialog.__readStderr</h4> +<b>__readStderr</b>(<i></i>) +<p> + Private slot to handle the readyReadStandardError signal. +</p><p> + It reads the error output of the process and inserts it into the + error pane. +</p><a NAME="GitStashBrowserDialog.__readStdout" ID="GitStashBrowserDialog.__readStdout"></a> +<h4>GitStashBrowserDialog.__readStdout</h4> +<b>__readStdout</b>(<i></i>) +<p> + Private slot to handle the readyReadStandardOutput signal. +</p><p> + It reads the output of the process and inserts it into a buffer. +</p><a NAME="GitStashBrowserDialog.__resetUI" ID="GitStashBrowserDialog.__resetUI"></a> +<h4>GitStashBrowserDialog.__resetUI</h4> +<b>__resetUI</b>(<i></i>) +<p> + Private method to reset the user interface. +</p><a NAME="GitStashBrowserDialog.__resizeColumnsStashes" ID="GitStashBrowserDialog.__resizeColumnsStashes"></a> +<h4>GitStashBrowserDialog.__resizeColumnsStashes</h4> +<b>__resizeColumnsStashes</b>(<i></i>) +<p> + Private method to resize the shelve list columns. +</p><a NAME="GitStashBrowserDialog.__showPatch" ID="GitStashBrowserDialog.__showPatch"></a> +<h4>GitStashBrowserDialog.__showPatch</h4> +<b>__showPatch</b>(<i></i>) +<p> + Private slot to show the contents of the selected stash. +</p><a NAME="GitStashBrowserDialog.closeEvent" ID="GitStashBrowserDialog.closeEvent"></a> +<h4>GitStashBrowserDialog.closeEvent</h4> +<b>closeEvent</b>(<i>e</i>) +<p> + Protected slot implementing a close event handler. +</p><dl> +<dt><i>e</i></dt> +<dd> +close event (QCloseEvent) +</dd> +</dl><a NAME="GitStashBrowserDialog.keyPressEvent" ID="GitStashBrowserDialog.keyPressEvent"></a> +<h4>GitStashBrowserDialog.keyPressEvent</h4> +<b>keyPressEvent</b>(<i>evt</i>) +<p> + Protected slot to handle a key press event. +</p><dl> +<dt><i>evt</i></dt> +<dd> +the key press event (QKeyEvent) +</dd> +</dl><a NAME="GitStashBrowserDialog.on_buttonBox_clicked" ID="GitStashBrowserDialog.on_buttonBox_clicked"></a> +<h4>GitStashBrowserDialog.on_buttonBox_clicked</h4> +<b>on_buttonBox_clicked</b>(<i>button</i>) +<p> + Private slot called by a button of the button box clicked. +</p><dl> +<dt><i>button</i></dt> +<dd> +button that was clicked (QAbstractButton) +</dd> +</dl><a NAME="GitStashBrowserDialog.on_input_returnPressed" ID="GitStashBrowserDialog.on_input_returnPressed"></a> +<h4>GitStashBrowserDialog.on_input_returnPressed</h4> +<b>on_input_returnPressed</b>(<i></i>) +<p> + Private slot to handle the press of the return key in the input field. +</p><a NAME="GitStashBrowserDialog.on_passwordCheckBox_toggled" ID="GitStashBrowserDialog.on_passwordCheckBox_toggled"></a> +<h4>GitStashBrowserDialog.on_passwordCheckBox_toggled</h4> +<b>on_passwordCheckBox_toggled</b>(<i>checked</i>) +<p> + Private slot to handle the password checkbox toggled. +</p><dl> +<dt><i>checked</i></dt> +<dd> +flag indicating the status of the check box (boolean) +</dd> +</dl><a NAME="GitStashBrowserDialog.on_refreshButton_clicked" ID="GitStashBrowserDialog.on_refreshButton_clicked"></a> +<h4>GitStashBrowserDialog.on_refreshButton_clicked</h4> +<b>on_refreshButton_clicked</b>(<i></i>) +<p> + Private slot to refresh the list of shelves. +</p><a NAME="GitStashBrowserDialog.on_sendButton_clicked" ID="GitStashBrowserDialog.on_sendButton_clicked"></a> +<h4>GitStashBrowserDialog.on_sendButton_clicked</h4> +<b>on_sendButton_clicked</b>(<i></i>) +<p> + Private slot to send the input to the git process. +</p><a NAME="GitStashBrowserDialog.on_stashList_currentItemChanged" ID="GitStashBrowserDialog.on_stashList_currentItemChanged"></a> +<h4>GitStashBrowserDialog.on_stashList_currentItemChanged</h4> +<b>on_stashList_currentItemChanged</b>(<i>current, previous</i>) +<p> + Private slot called, when the current item of the stash list changes. +</p><dl> +<dt><i>current</i></dt> +<dd> +reference to the new current item (QTreeWidgetItem) +</dd><dt><i>previous</i></dt> +<dd> +reference to the old current item (QTreeWidgetItem) +</dd> +</dl><a NAME="GitStashBrowserDialog.on_stashList_customContextMenuRequested" ID="GitStashBrowserDialog.on_stashList_customContextMenuRequested"></a> +<h4>GitStashBrowserDialog.on_stashList_customContextMenuRequested</h4> +<b>on_stashList_customContextMenuRequested</b>(<i>pos</i>) +<p> + Private slot to show the context menu of the stash list. +</p><dl> +<dt><i>pos</i></dt> +<dd> +position of the mouse pointer (QPoint) +</dd> +</dl><a NAME="GitStashBrowserDialog.show" ID="GitStashBrowserDialog.show"></a> +<h4>GitStashBrowserDialog.show</h4> +<b>show</b>(<i></i>) +<p> + Public slot to show the dialog. +</p><a NAME="GitStashBrowserDialog.start" ID="GitStashBrowserDialog.start"></a> +<h4>GitStashBrowserDialog.start</h4> +<b>start</b>(<i>projectDir</i>) +<p> + Public slot to start the git stash command. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</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.GitStashDataDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,96 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitStashDataDialog</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.GitStashDataDialog</h1> +<p> +Module implementing a dialog to enter the data for a stash operation. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitStashDataDialog">GitStashDataDialog</a></td> +<td>Class implementing a dialog to enter the data for a stash operation.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitStashDataDialog" ID="GitStashDataDialog"></a> +<h2>GitStashDataDialog</h2> +<p> + Class implementing a dialog to enter the data for a stash operation. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitStashDataDialog +<h3>Class Attributes</h3> +<table> +<tr><td>NoUntracked</td></tr><tr><td>UntrackedAndIgnored</td></tr><tr><td>UntrackedOnly</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#GitStashDataDialog.__init__">GitStashDataDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitStashDataDialog.getData">getData</a></td> +<td>Public method to get the user data.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitStashDataDialog.__init__" ID="GitStashDataDialog.__init__"></a> +<h4>GitStashDataDialog (Constructor)</h4> +<b>GitStashDataDialog</b>(<i>parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd> +</dl><a NAME="GitStashDataDialog.getData" ID="GitStashDataDialog.getData"></a> +<h4>GitStashDataDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to get the user data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple containing the message (string), a flag indicating to + keep changes in the staging area (boolean) and an indication to + stash untracked and/or ignored files (integer) +</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.GitStatusDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,669 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog</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.GitStatusDialog</h1> +<p> +Module implementing a dialog to show the output of the git status command +process. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitStatusDialog">GitStatusDialog</a></td> +<td>Class implementing a dialog to show the output of the git status command process.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitStatusDialog" ID="GitStatusDialog"></a> +<h2>GitStatusDialog</h2> +<p> + Class implementing a dialog to show the output of the git status command + process. +</p> +<h3>Derived from</h3> +QWidget, Ui_GitStatusDialog +<h3>Class Attributes</h3> +<table> +<tr><td>ConflictRole</td></tr><tr><td>ConflictStates</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#GitStatusDialog.__init__">GitStatusDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitStatusDialog.__actionsMenuHovered">__actionsMenuHovered</a></td> +<td>Private slot to show the tooltip for an action menu entry.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__add">__add</a></td> +<td>Private slot to handle the Add context menu entry.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__amend">__amend</a></td> +<td>Private slot to handle the Amend context menu entry.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__commit">__commit</a></td> +<td>Private slot to handle the Commit context menu entry.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__commitDeselectAll">__commitDeselectAll</a></td> +<td>Private slot to deselect all entries from commit.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__commitSelect">__commitSelect</a></td> +<td>Private slot to select or deselect all entries.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__commitSelectAll">__commitSelectAll</a></td> +<td>Private slot to select all entries for commit.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__committed">__committed</a></td> +<td>Private slot called after the commit has finished.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__diff">__diff</a></td> +<td>Private slot to handle the Diff context menu entry.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__editConflict">__editConflict</a></td> +<td>Private slot to handle the Edit file context menu entry.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__finish">__finish</a></td> +<td>Private slot called when the process finished or the user pressed the button.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__forget">__forget</a></td> +<td>Private slot to handle the Forget Missing context menu entry.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__generateDiffs">__generateDiffs</a></td> +<td>Private slot to generate diff outputs for the selected item.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__generateItem">__generateItem</a></td> +<td>Private method to generate a status item in the status list.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__generatorFinished">__generatorFinished</a></td> +<td>Private slot connected to the finished signal of the diff generator.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__getCommitableItems">__getCommitableItems</a></td> +<td>Private method to retrieve all entries the user wants to commit.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__getCommitableUnselectedItems">__getCommitableUnselectedItems</a></td> +<td>Private method to retrieve all entries the user may commit but hasn't selected.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__getConflictingItems">__getConflictingItems</a></td> +<td>Private method to retrieve all entries, that have a conflict status.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__getMissingItems">__getMissingItems</a></td> +<td>Private method to retrieve all entries, that have a missing status.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__getModifiedItems">__getModifiedItems</a></td> +<td>Private method to retrieve all entries, that have a modified status.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__getModifiedOnlyItems">__getModifiedOnlyItems</a></td> +<td>Private method to retrieve all entries, that have a modified status.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__getStageableItems">__getStageableItems</a></td> +<td>Private method to retrieve all entries, that have a stageable status.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__getUnstageableItems">__getUnstageableItems</a></td> +<td>Private method to retrieve all entries, that have an unstageable status.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__getUnversionedItems">__getUnversionedItems</a></td> +<td>Private method to retrieve all entries, that have an unversioned status.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__initActionsMenu">__initActionsMenu</a></td> +<td>Private method to initialize the actions menu.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__procFinished">__procFinished</a></td> +<td>Private slot connected to the finished signal.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__readStderr">__readStderr</a></td> +<td>Private slot to handle the readyReadStandardError signal.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__readStdout">__readStdout</a></td> +<td>Private slot to handle the readyReadStandardOutput signal.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__refreshDiff">__refreshDiff</a></td> +<td>Private method to refresh the diff output after a refresh.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__resizeColumns">__resizeColumns</a></td> +<td>Private method to resize the list columns.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__resort">__resort</a></td> +<td>Private method to resort the tree.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__restoreMissing">__restoreMissing</a></td> +<td>Private slot to handle the Restore Missing context menu entry.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__revert">__revert</a></td> +<td>Private slot to handle the Revert context menu entry.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__revertHunkOrLines">__revertHunkOrLines</a></td> +<td>Private method to revert the selected lines or hunk.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__sbsDiff">__sbsDiff</a></td> +<td>Private slot to handle the Diff context menu entry.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__selectedLinesIndexes">__selectedLinesIndexes</a></td> +<td>Private method to extract the indexes of the selected lines.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__showActionsMenu">__showActionsMenu</a></td> +<td>Private slot to prepare the actions button menu before it is shown.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__showLDiffContextMenu">__showLDiffContextMenu</a></td> +<td>Private slot to show the context menu of the status list.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__showRDiffContextMenu">__showRDiffContextMenu</a></td> +<td>Private slot to show the context menu of the status list.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__stage">__stage</a></td> +<td>Private slot to handle the Stage context menu entry.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__stageHunkOrLines">__stageHunkOrLines</a></td> +<td>Private method to stage the selected lines or hunk.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__tmpPatchFileName">__tmpPatchFileName</a></td> +<td>Private method to generate a temporary patch file.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__unstage">__unstage</a></td> +<td>Private slot to handle the Unstage context menu entry.</td> +</tr><tr> +<td><a href="#GitStatusDialog.__unstageHunkOrLines">__unstageHunkOrLines</a></td> +<td>Private method to unstage the selected lines or hunk.</td> +</tr><tr> +<td><a href="#GitStatusDialog.closeEvent">closeEvent</a></td> +<td>Protected slot implementing a close event handler.</td> +</tr><tr> +<td><a href="#GitStatusDialog.keyPressEvent">keyPressEvent</a></td> +<td>Protected slot to handle a key press event.</td> +</tr><tr> +<td><a href="#GitStatusDialog.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="#GitStatusDialog.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> +<td><a href="#GitStatusDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> +<td>Private slot to handle the password checkbox toggled.</td> +</tr><tr> +<td><a href="#GitStatusDialog.on_refreshButton_clicked">on_refreshButton_clicked</a></td> +<td>Private slot to refresh the status display.</td> +</tr><tr> +<td><a href="#GitStatusDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> +<td>Private slot to send the input to the git process.</td> +</tr><tr> +<td><a href="#GitStatusDialog.on_statusFilterCombo_activated">on_statusFilterCombo_activated</a></td> +<td>Private slot to react to the selection of a status filter.</td> +</tr><tr> +<td><a href="#GitStatusDialog.on_statusList_itemSelectionChanged">on_statusList_itemSelectionChanged</a></td> +<td>Private slot to act upon changes of selected items.</td> +</tr><tr> +<td><a href="#GitStatusDialog.show">show</a></td> +<td>Public slot to show the dialog.</td> +</tr><tr> +<td><a href="#GitStatusDialog.start">start</a></td> +<td>Public slot to start the git status command.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitStatusDialog.__init__" ID="GitStatusDialog.__init__"></a> +<h4>GitStatusDialog (Constructor)</h4> +<b>GitStatusDialog</b>(<i>vcs, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>vcs</i></dt> +<dd> +reference to the vcs object +</dd><dt><i>parent</i></dt> +<dd> +parent widget (QWidget) +</dd> +</dl><a NAME="GitStatusDialog.__actionsMenuHovered" ID="GitStatusDialog.__actionsMenuHovered"></a> +<h4>GitStatusDialog.__actionsMenuHovered</h4> +<b>__actionsMenuHovered</b>(<i>action</i>) +<p> + Private slot to show the tooltip for an action menu entry. +</p><dl> +<dt><i>action</i> (QAction)</dt> +<dd> +action to show tooltip for +</dd> +</dl><a NAME="GitStatusDialog.__add" ID="GitStatusDialog.__add"></a> +<h4>GitStatusDialog.__add</h4> +<b>__add</b>(<i></i>) +<p> + Private slot to handle the Add context menu entry. +</p><a NAME="GitStatusDialog.__amend" ID="GitStatusDialog.__amend"></a> +<h4>GitStatusDialog.__amend</h4> +<b>__amend</b>(<i></i>) +<p> + Private slot to handle the Amend context menu entry. +</p><a NAME="GitStatusDialog.__commit" ID="GitStatusDialog.__commit"></a> +<h4>GitStatusDialog.__commit</h4> +<b>__commit</b>(<i>amend=False</i>) +<p> + Private slot to handle the Commit context menu entry. +</p><dl> +<dt><i>amend</i></dt> +<dd> +flag indicating to perform an amend operation (boolean) +</dd> +</dl><a NAME="GitStatusDialog.__commitDeselectAll" ID="GitStatusDialog.__commitDeselectAll"></a> +<h4>GitStatusDialog.__commitDeselectAll</h4> +<b>__commitDeselectAll</b>(<i></i>) +<p> + Private slot to deselect all entries from commit. +</p><a NAME="GitStatusDialog.__commitSelect" ID="GitStatusDialog.__commitSelect"></a> +<h4>GitStatusDialog.__commitSelect</h4> +<b>__commitSelect</b>(<i>selected</i>) +<p> + Private slot to select or deselect all entries. +</p><dl> +<dt><i>selected</i></dt> +<dd> +commit selection state to be set (boolean) +</dd> +</dl><a NAME="GitStatusDialog.__commitSelectAll" ID="GitStatusDialog.__commitSelectAll"></a> +<h4>GitStatusDialog.__commitSelectAll</h4> +<b>__commitSelectAll</b>(<i></i>) +<p> + Private slot to select all entries for commit. +</p><a NAME="GitStatusDialog.__committed" ID="GitStatusDialog.__committed"></a> +<h4>GitStatusDialog.__committed</h4> +<b>__committed</b>(<i></i>) +<p> + Private slot called after the commit has finished. +</p><a NAME="GitStatusDialog.__diff" ID="GitStatusDialog.__diff"></a> +<h4>GitStatusDialog.__diff</h4> +<b>__diff</b>(<i></i>) +<p> + Private slot to handle the Diff context menu entry. +</p><a NAME="GitStatusDialog.__editConflict" ID="GitStatusDialog.__editConflict"></a> +<h4>GitStatusDialog.__editConflict</h4> +<b>__editConflict</b>(<i></i>) +<p> + Private slot to handle the Edit file context menu entry. +</p><a NAME="GitStatusDialog.__finish" ID="GitStatusDialog.__finish"></a> +<h4>GitStatusDialog.__finish</h4> +<b>__finish</b>(<i></i>) +<p> + Private slot called when the process finished or the user pressed + the button. +</p><a NAME="GitStatusDialog.__forget" ID="GitStatusDialog.__forget"></a> +<h4>GitStatusDialog.__forget</h4> +<b>__forget</b>(<i></i>) +<p> + Private slot to handle the Forget Missing context menu entry. +</p><a NAME="GitStatusDialog.__generateDiffs" ID="GitStatusDialog.__generateDiffs"></a> +<h4>GitStatusDialog.__generateDiffs</h4> +<b>__generateDiffs</b>(<i></i>) +<p> + Private slot to generate diff outputs for the selected item. +</p><a NAME="GitStatusDialog.__generateItem" ID="GitStatusDialog.__generateItem"></a> +<h4>GitStatusDialog.__generateItem</h4> +<b>__generateItem</b>(<i>status, path</i>) +<p> + Private method to generate a status item in the status list. +</p><dl> +<dt><i>status</i></dt> +<dd> +status indicator (string) +</dd><dt><i>path</i></dt> +<dd> +path of the file or directory (string) +</dd> +</dl><a NAME="GitStatusDialog.__generatorFinished" ID="GitStatusDialog.__generatorFinished"></a> +<h4>GitStatusDialog.__generatorFinished</h4> +<b>__generatorFinished</b>(<i></i>) +<p> + Private slot connected to the finished signal of the diff generator. +</p><a NAME="GitStatusDialog.__getCommitableItems" ID="GitStatusDialog.__getCommitableItems"></a> +<h4>GitStatusDialog.__getCommitableItems</h4> +<b>__getCommitableItems</b>(<i></i>) +<p> + Private method to retrieve all entries the user wants to commit. +</p><dl> +<dt>Returns:</dt> +<dd> +list of all items, the user has checked +</dd> +</dl><a NAME="GitStatusDialog.__getCommitableUnselectedItems" ID="GitStatusDialog.__getCommitableUnselectedItems"></a> +<h4>GitStatusDialog.__getCommitableUnselectedItems</h4> +<b>__getCommitableUnselectedItems</b>(<i></i>) +<p> + Private method to retrieve all entries the user may commit but hasn't + selected. +</p><dl> +<dt>Returns:</dt> +<dd> +list of all items, the user has not checked +</dd> +</dl><a NAME="GitStatusDialog.__getConflictingItems" ID="GitStatusDialog.__getConflictingItems"></a> +<h4>GitStatusDialog.__getConflictingItems</h4> +<b>__getConflictingItems</b>(<i></i>) +<p> + Private method to retrieve all entries, that have a conflict status. +</p><dl> +<dt>Returns:</dt> +<dd> +list of all items with a conflict status +</dd> +</dl><a NAME="GitStatusDialog.__getMissingItems" ID="GitStatusDialog.__getMissingItems"></a> +<h4>GitStatusDialog.__getMissingItems</h4> +<b>__getMissingItems</b>(<i></i>) +<p> + Private method to retrieve all entries, that have a missing status. +</p><dl> +<dt>Returns:</dt> +<dd> +list of all items with a missing status +</dd> +</dl><a NAME="GitStatusDialog.__getModifiedItems" ID="GitStatusDialog.__getModifiedItems"></a> +<h4>GitStatusDialog.__getModifiedItems</h4> +<b>__getModifiedItems</b>(<i></i>) +<p> + Private method to retrieve all entries, that have a modified status. +</p><dl> +<dt>Returns:</dt> +<dd> +list of all items with a modified status +</dd> +</dl><a NAME="GitStatusDialog.__getModifiedOnlyItems" ID="GitStatusDialog.__getModifiedOnlyItems"></a> +<h4>GitStatusDialog.__getModifiedOnlyItems</h4> +<b>__getModifiedOnlyItems</b>(<i></i>) +<p> + Private method to retrieve all entries, that have a modified status. +</p><dl> +<dt>Returns:</dt> +<dd> +list of all items with a modified status +</dd> +</dl><a NAME="GitStatusDialog.__getStageableItems" ID="GitStatusDialog.__getStageableItems"></a> +<h4>GitStatusDialog.__getStageableItems</h4> +<b>__getStageableItems</b>(<i></i>) +<p> + Private method to retrieve all entries, that have a stageable + status. +</p><dl> +<dt>Returns:</dt> +<dd> +list of all items with a stageable status +</dd> +</dl><a NAME="GitStatusDialog.__getUnstageableItems" ID="GitStatusDialog.__getUnstageableItems"></a> +<h4>GitStatusDialog.__getUnstageableItems</h4> +<b>__getUnstageableItems</b>(<i></i>) +<p> + Private method to retrieve all entries, that have an unstageable + status. +</p><dl> +<dt>Returns:</dt> +<dd> +list of all items with an unstageable status +</dd> +</dl><a NAME="GitStatusDialog.__getUnversionedItems" ID="GitStatusDialog.__getUnversionedItems"></a> +<h4>GitStatusDialog.__getUnversionedItems</h4> +<b>__getUnversionedItems</b>(<i></i>) +<p> + Private method to retrieve all entries, that have an unversioned + status. +</p><dl> +<dt>Returns:</dt> +<dd> +list of all items with an unversioned status +</dd> +</dl><a NAME="GitStatusDialog.__initActionsMenu" ID="GitStatusDialog.__initActionsMenu"></a> +<h4>GitStatusDialog.__initActionsMenu</h4> +<b>__initActionsMenu</b>(<i></i>) +<p> + Private method to initialize the actions menu. +</p><a NAME="GitStatusDialog.__procFinished" ID="GitStatusDialog.__procFinished"></a> +<h4>GitStatusDialog.__procFinished</h4> +<b>__procFinished</b>(<i>exitCode, exitStatus</i>) +<p> + Private slot connected to the finished signal. +</p><dl> +<dt><i>exitCode</i></dt> +<dd> +exit code of the process (integer) +</dd><dt><i>exitStatus</i></dt> +<dd> +exit status of the process (QProcess.ExitStatus) +</dd> +</dl><a NAME="GitStatusDialog.__readStderr" ID="GitStatusDialog.__readStderr"></a> +<h4>GitStatusDialog.__readStderr</h4> +<b>__readStderr</b>(<i></i>) +<p> + Private slot to handle the readyReadStandardError signal. +</p><p> + It reads the error output of the process and inserts it into the + error pane. +</p><a NAME="GitStatusDialog.__readStdout" ID="GitStatusDialog.__readStdout"></a> +<h4>GitStatusDialog.__readStdout</h4> +<b>__readStdout</b>(<i></i>) +<p> + Private slot to handle the readyReadStandardOutput signal. +</p><p> + It reads the output of the process, formats it and inserts it into + the contents pane. +</p><a NAME="GitStatusDialog.__refreshDiff" ID="GitStatusDialog.__refreshDiff"></a> +<h4>GitStatusDialog.__refreshDiff</h4> +<b>__refreshDiff</b>(<i></i>) +<p> + Private method to refresh the diff output after a refresh. +</p><a NAME="GitStatusDialog.__resizeColumns" ID="GitStatusDialog.__resizeColumns"></a> +<h4>GitStatusDialog.__resizeColumns</h4> +<b>__resizeColumns</b>(<i></i>) +<p> + Private method to resize the list columns. +</p><a NAME="GitStatusDialog.__resort" ID="GitStatusDialog.__resort"></a> +<h4>GitStatusDialog.__resort</h4> +<b>__resort</b>(<i></i>) +<p> + Private method to resort the tree. +</p><a NAME="GitStatusDialog.__restoreMissing" ID="GitStatusDialog.__restoreMissing"></a> +<h4>GitStatusDialog.__restoreMissing</h4> +<b>__restoreMissing</b>(<i></i>) +<p> + Private slot to handle the Restore Missing context menu entry. +</p><a NAME="GitStatusDialog.__revert" ID="GitStatusDialog.__revert"></a> +<h4>GitStatusDialog.__revert</h4> +<b>__revert</b>(<i></i>) +<p> + Private slot to handle the Revert context menu entry. +</p><a NAME="GitStatusDialog.__revertHunkOrLines" ID="GitStatusDialog.__revertHunkOrLines"></a> +<h4>GitStatusDialog.__revertHunkOrLines</h4> +<b>__revertHunkOrLines</b>(<i></i>) +<p> + Private method to revert the selected lines or hunk. +</p><a NAME="GitStatusDialog.__sbsDiff" ID="GitStatusDialog.__sbsDiff"></a> +<h4>GitStatusDialog.__sbsDiff</h4> +<b>__sbsDiff</b>(<i></i>) +<p> + Private slot to handle the Diff context menu entry. +</p><a NAME="GitStatusDialog.__selectedLinesIndexes" ID="GitStatusDialog.__selectedLinesIndexes"></a> +<h4>GitStatusDialog.__selectedLinesIndexes</h4> +<b>__selectedLinesIndexes</b>(<i>diffEdit</i>) +<p> + Private method to extract the indexes of the selected lines. +</p><dl> +<dt><i>diffEdit</i></dt> +<dd> +reference to the edit widget (QTextEdit) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +tuple of start and end indexes (integer, integer) +</dd> +</dl><a NAME="GitStatusDialog.__showActionsMenu" ID="GitStatusDialog.__showActionsMenu"></a> +<h4>GitStatusDialog.__showActionsMenu</h4> +<b>__showActionsMenu</b>(<i></i>) +<p> + Private slot to prepare the actions button menu before it is shown. +</p><a NAME="GitStatusDialog.__showLDiffContextMenu" ID="GitStatusDialog.__showLDiffContextMenu"></a> +<h4>GitStatusDialog.__showLDiffContextMenu</h4> +<b>__showLDiffContextMenu</b>(<i>coord</i>) +<p> + Private slot to show the context menu of the status list. +</p><dl> +<dt><i>coord</i></dt> +<dd> +position of the mouse pointer (QPoint) +</dd> +</dl><a NAME="GitStatusDialog.__showRDiffContextMenu" ID="GitStatusDialog.__showRDiffContextMenu"></a> +<h4>GitStatusDialog.__showRDiffContextMenu</h4> +<b>__showRDiffContextMenu</b>(<i>coord</i>) +<p> + Private slot to show the context menu of the status list. +</p><dl> +<dt><i>coord</i></dt> +<dd> +position of the mouse pointer (QPoint) +</dd> +</dl><a NAME="GitStatusDialog.__stage" ID="GitStatusDialog.__stage"></a> +<h4>GitStatusDialog.__stage</h4> +<b>__stage</b>(<i></i>) +<p> + Private slot to handle the Stage context menu entry. +</p><a NAME="GitStatusDialog.__stageHunkOrLines" ID="GitStatusDialog.__stageHunkOrLines"></a> +<h4>GitStatusDialog.__stageHunkOrLines</h4> +<b>__stageHunkOrLines</b>(<i></i>) +<p> + Private method to stage the selected lines or hunk. +</p><a NAME="GitStatusDialog.__tmpPatchFileName" ID="GitStatusDialog.__tmpPatchFileName"></a> +<h4>GitStatusDialog.__tmpPatchFileName</h4> +<b>__tmpPatchFileName</b>(<i></i>) +<p> + Private method to generate a temporary patch file. +</p><dl> +<dt>Returns:</dt> +<dd> +name of the temporary file (string) +</dd> +</dl><a NAME="GitStatusDialog.__unstage" ID="GitStatusDialog.__unstage"></a> +<h4>GitStatusDialog.__unstage</h4> +<b>__unstage</b>(<i></i>) +<p> + Private slot to handle the Unstage context menu entry. +</p><a NAME="GitStatusDialog.__unstageHunkOrLines" ID="GitStatusDialog.__unstageHunkOrLines"></a> +<h4>GitStatusDialog.__unstageHunkOrLines</h4> +<b>__unstageHunkOrLines</b>(<i></i>) +<p> + Private method to unstage the selected lines or hunk. +</p><a NAME="GitStatusDialog.closeEvent" ID="GitStatusDialog.closeEvent"></a> +<h4>GitStatusDialog.closeEvent</h4> +<b>closeEvent</b>(<i>e</i>) +<p> + Protected slot implementing a close event handler. +</p><dl> +<dt><i>e</i></dt> +<dd> +close event (QCloseEvent) +</dd> +</dl><a NAME="GitStatusDialog.keyPressEvent" ID="GitStatusDialog.keyPressEvent"></a> +<h4>GitStatusDialog.keyPressEvent</h4> +<b>keyPressEvent</b>(<i>evt</i>) +<p> + Protected slot to handle a key press event. +</p><dl> +<dt><i>evt</i></dt> +<dd> +the key press event (QKeyEvent) +</dd> +</dl><a NAME="GitStatusDialog.on_buttonBox_clicked" ID="GitStatusDialog.on_buttonBox_clicked"></a> +<h4>GitStatusDialog.on_buttonBox_clicked</h4> +<b>on_buttonBox_clicked</b>(<i>button</i>) +<p> + Private slot called by a button of the button box clicked. +</p><dl> +<dt><i>button</i></dt> +<dd> +button that was clicked (QAbstractButton) +</dd> +</dl><a NAME="GitStatusDialog.on_input_returnPressed" ID="GitStatusDialog.on_input_returnPressed"></a> +<h4>GitStatusDialog.on_input_returnPressed</h4> +<b>on_input_returnPressed</b>(<i></i>) +<p> + Private slot to handle the press of the return key in the input field. +</p><a NAME="GitStatusDialog.on_passwordCheckBox_toggled" ID="GitStatusDialog.on_passwordCheckBox_toggled"></a> +<h4>GitStatusDialog.on_passwordCheckBox_toggled</h4> +<b>on_passwordCheckBox_toggled</b>(<i>isOn</i>) +<p> + Private slot to handle the password checkbox toggled. +</p><dl> +<dt><i>isOn</i></dt> +<dd> +flag indicating the status of the check box (boolean) +</dd> +</dl><a NAME="GitStatusDialog.on_refreshButton_clicked" ID="GitStatusDialog.on_refreshButton_clicked"></a> +<h4>GitStatusDialog.on_refreshButton_clicked</h4> +<b>on_refreshButton_clicked</b>(<i></i>) +<p> + Private slot to refresh the status display. +</p><a NAME="GitStatusDialog.on_sendButton_clicked" ID="GitStatusDialog.on_sendButton_clicked"></a> +<h4>GitStatusDialog.on_sendButton_clicked</h4> +<b>on_sendButton_clicked</b>(<i></i>) +<p> + Private slot to send the input to the git process. +</p><a NAME="GitStatusDialog.on_statusFilterCombo_activated" ID="GitStatusDialog.on_statusFilterCombo_activated"></a> +<h4>GitStatusDialog.on_statusFilterCombo_activated</h4> +<b>on_statusFilterCombo_activated</b>(<i>txt</i>) +<p> + Private slot to react to the selection of a status filter. +</p><dl> +<dt><i>txt</i></dt> +<dd> +selected status filter (string) +</dd> +</dl><a NAME="GitStatusDialog.on_statusList_itemSelectionChanged" ID="GitStatusDialog.on_statusList_itemSelectionChanged"></a> +<h4>GitStatusDialog.on_statusList_itemSelectionChanged</h4> +<b>on_statusList_itemSelectionChanged</b>(<i></i>) +<p> + Private slot to act upon changes of selected items. +</p><a NAME="GitStatusDialog.show" ID="GitStatusDialog.show"></a> +<h4>GitStatusDialog.show</h4> +<b>show</b>(<i></i>) +<p> + Public slot to show the dialog. +</p><a NAME="GitStatusDialog.start" ID="GitStatusDialog.start"></a> +<h4>GitStatusDialog.start</h4> +<b>start</b>(<i>fn</i>) +<p> + Public slot to start the git status command. +</p><dl> +<dt><i>fn</i></dt> +<dd> +filename(s)/directoryname(s) to show the status of + (string or list of strings) +</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.GitStatusMonitorThread.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,126 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitStatusMonitorThread</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.GitStatusMonitorThread</h1> +<p> +Module implementing the VCS status monitor thread class for Git. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitStatusMonitorThread">GitStatusMonitorThread</a></td> +<td>Class implementing the VCS status monitor thread class for Git.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitStatusMonitorThread" ID="GitStatusMonitorThread"></a> +<h2>GitStatusMonitorThread</h2> +<p> + Class implementing the VCS status monitor thread class for Git. +</p> +<h3>Derived from</h3> +VcsStatusMonitorThread +<h3>Class Attributes</h3> +<table> +<tr><td>ConflictStates</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#GitStatusMonitorThread.__init__">GitStatusMonitorThread</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitStatusMonitorThread._performMonitor">_performMonitor</a></td> +<td>Protected method implementing the monitoring action.</td> +</tr><tr> +<td><a href="#GitStatusMonitorThread._shutdown">_shutdown</a></td> +<td>Protected method performing shutdown actions.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitStatusMonitorThread.__init__" ID="GitStatusMonitorThread.__init__"></a> +<h4>GitStatusMonitorThread (Constructor)</h4> +<b>GitStatusMonitorThread</b>(<i>interval, project, vcs, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>interval</i></dt> +<dd> +new interval in seconds (integer) +</dd><dt><i>project</i></dt> +<dd> +reference to the project object (Project) +</dd><dt><i>vcs</i></dt> +<dd> +reference to the version control object +</dd><dt><i>parent</i></dt> +<dd> +reference to the parent object (QObject) +</dd> +</dl><a NAME="GitStatusMonitorThread._performMonitor" ID="GitStatusMonitorThread._performMonitor"></a> +<h4>GitStatusMonitorThread._performMonitor</h4> +<b>_performMonitor</b>(<i></i>) +<p> + Protected method implementing the monitoring action. +</p><p> + This method populates the statusList member variable + with a list of strings giving the status in the first column and the + path relative to the project directory starting with the third column. + The allowed status flags are: + <ul> + <li>"A" path was added but not yet comitted</li> + <li>"M" path has local changes</li> + <li>"O" path was removed</li> + <li>"R" path was deleted and then re-added</li> + <li>"U" path needs an update</li> + <li>"Z" path contains a conflict</li> + <li>" " path is back at normal</li> + </ul> +</p><dl> +<dt>Returns:</dt> +<dd> +tuple of flag indicating successful operation (boolean) and + a status message in case of non successful operation (string) +</dd> +</dl><a NAME="GitStatusMonitorThread._shutdown" ID="GitStatusMonitorThread._shutdown"></a> +<h4>GitStatusMonitorThread._shutdown</h4> +<b>_shutdown</b>(<i></i>) +<p> + Protected method performing shutdown actions. +</p> +<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.GitSubmoduleAddDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,176 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitSubmoduleAddDialog</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.GitSubmoduleAddDialog</h1> +<p> +Module implementing a dialog to enter the data to add a submodule. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitSubmoduleAddDialog">GitSubmoduleAddDialog</a></td> +<td>Class implementing a dialog to enter the data to add a submodule.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitSubmoduleAddDialog" ID="GitSubmoduleAddDialog"></a> +<h2>GitSubmoduleAddDialog</h2> +<p> + Class implementing a dialog to enter the data to add a submodule. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitSubmoduleAddDialog +<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="#GitSubmoduleAddDialog.__init__">GitSubmoduleAddDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitSubmoduleAddDialog.__getRelativePath">__getRelativePath</a></td> +<td>Private method to convert a file path to a relative path.</td> +</tr><tr> +<td><a href="#GitSubmoduleAddDialog.__saveHistory">__saveHistory</a></td> +<td>Private method to save the repository URL history.</td> +</tr><tr> +<td><a href="#GitSubmoduleAddDialog.getData">getData</a></td> +<td>Public method to get the entered data.</td> +</tr><tr> +<td><a href="#GitSubmoduleAddDialog.on_submoduleDirButton_clicked">on_submoduleDirButton_clicked</a></td> +<td>Private slot to display a directory selection dialog.</td> +</tr><tr> +<td><a href="#GitSubmoduleAddDialog.on_submoduleUrlButton_clicked">on_submoduleUrlButton_clicked</a></td> +<td>Private slot to display a directory selection dialog.</td> +</tr><tr> +<td><a href="#GitSubmoduleAddDialog.on_submoduleUrlClearHistoryButton_clicked">on_submoduleUrlClearHistoryButton_clicked</a></td> +<td>Private slot to clear the history of entered repository URLs.</td> +</tr><tr> +<td><a href="#GitSubmoduleAddDialog.on_submoduleUrlCombo_editTextChanged">on_submoduleUrlCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the submodule repository URL.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitSubmoduleAddDialog.__init__" ID="GitSubmoduleAddDialog.__init__"></a> +<h4>GitSubmoduleAddDialog (Constructor)</h4> +<b>GitSubmoduleAddDialog</b>(<i>vcs, repodir, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>vcs</i> (Git)</dt> +<dd> +reference to the version control object +</dd><dt><i>repodir</i> (str)</dt> +<dd> +directory containing the superproject +</dd><dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent widget +</dd> +</dl><a NAME="GitSubmoduleAddDialog.__getRelativePath" ID="GitSubmoduleAddDialog.__getRelativePath"></a> +<h4>GitSubmoduleAddDialog.__getRelativePath</h4> +<b>__getRelativePath</b>(<i>path</i>) +<p> + Private method to convert a file path to a relative path. +</p><dl> +<dt><i>path</i> (str)</dt> +<dd> +file or directory name to convert +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +relative path or unchanged path, if path doesn't + belong to the project +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="GitSubmoduleAddDialog.__saveHistory" ID="GitSubmoduleAddDialog.__saveHistory"></a> +<h4>GitSubmoduleAddDialog.__saveHistory</h4> +<b>__saveHistory</b>(<i></i>) +<p> + Private method to save the repository URL history. +</p><a NAME="GitSubmoduleAddDialog.getData" ID="GitSubmoduleAddDialog.getData"></a> +<h4>GitSubmoduleAddDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to get the entered data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple containing the repository URL, optional branch name, + optional logical name, optional submodule path and a flag + indicating to enforce the operation +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +tuple of (str, str, str, str, bool) +</dd> +</dl><a NAME="GitSubmoduleAddDialog.on_submoduleDirButton_clicked" ID="GitSubmoduleAddDialog.on_submoduleDirButton_clicked"></a> +<h4>GitSubmoduleAddDialog.on_submoduleDirButton_clicked</h4> +<b>on_submoduleDirButton_clicked</b>(<i></i>) +<p> + Private slot to display a directory selection dialog. +</p><a NAME="GitSubmoduleAddDialog.on_submoduleUrlButton_clicked" ID="GitSubmoduleAddDialog.on_submoduleUrlButton_clicked"></a> +<h4>GitSubmoduleAddDialog.on_submoduleUrlButton_clicked</h4> +<b>on_submoduleUrlButton_clicked</b>(<i></i>) +<p> + Private slot to display a directory selection dialog. +</p><a NAME="GitSubmoduleAddDialog.on_submoduleUrlClearHistoryButton_clicked" ID="GitSubmoduleAddDialog.on_submoduleUrlClearHistoryButton_clicked"></a> +<h4>GitSubmoduleAddDialog.on_submoduleUrlClearHistoryButton_clicked</h4> +<b>on_submoduleUrlClearHistoryButton_clicked</b>(<i></i>) +<p> + Private slot to clear the history of entered repository URLs. +</p><a NAME="GitSubmoduleAddDialog.on_submoduleUrlCombo_editTextChanged" ID="GitSubmoduleAddDialog.on_submoduleUrlCombo_editTextChanged"></a> +<h4>GitSubmoduleAddDialog.on_submoduleUrlCombo_editTextChanged</h4> +<b>on_submoduleUrlCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the submodule repository URL. +</p><dl> +<dt><i>txt</i> (str)</dt> +<dd> +current text of the combo box +</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.GitSubmodulesDeinitDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,133 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesDeinitDialog</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.GitSubmodulesDeinitDialog</h1> +<p> +Module implementing a dialog to get the data for a submodule deinit operation. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitSubmodulesDeinitDialog">GitSubmodulesDeinitDialog</a></td> +<td>Class implementing a dialog to get the data for a submodule deinit operation.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitSubmodulesDeinitDialog" ID="GitSubmodulesDeinitDialog"></a> +<h2>GitSubmodulesDeinitDialog</h2> +<p> + Class implementing a dialog to get the data for a submodule deinit + operation. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitSubmodulesDeinitDialog +<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="#GitSubmodulesDeinitDialog.__init__">GitSubmodulesDeinitDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitSubmodulesDeinitDialog.__updateOK">__updateOK</a></td> +<td>Private slot to update the state of the OK button.</td> +</tr><tr> +<td><a href="#GitSubmodulesDeinitDialog.getData">getData</a></td> +<td>Public method to get the entered data.</td> +</tr><tr> +<td><a href="#GitSubmodulesDeinitDialog.on_allCheckBox_toggled">on_allCheckBox_toggled</a></td> +<td>Private slot to react on changes of the all checkbox.</td> +</tr><tr> +<td><a href="#GitSubmodulesDeinitDialog.on_submodulesList_itemSelectionChanged">on_submodulesList_itemSelectionChanged</a></td> +<td>Private slot to react on changes of the submodule selection.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitSubmodulesDeinitDialog.__init__" ID="GitSubmodulesDeinitDialog.__init__"></a> +<h4>GitSubmodulesDeinitDialog (Constructor)</h4> +<b>GitSubmodulesDeinitDialog</b>(<i>submodulePaths, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>submodulePaths</i> (list of str)</dt> +<dd> +list of submodule paths +</dd><dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent widget +</dd> +</dl><a NAME="GitSubmodulesDeinitDialog.__updateOK" ID="GitSubmodulesDeinitDialog.__updateOK"></a> +<h4>GitSubmodulesDeinitDialog.__updateOK</h4> +<b>__updateOK</b>(<i></i>) +<p> + Private slot to update the state of the OK button. +</p><a NAME="GitSubmodulesDeinitDialog.getData" ID="GitSubmodulesDeinitDialog.getData"></a> +<h4>GitSubmodulesDeinitDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to get the entered data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple containing a flag to indicate all submodules, a list of + selected submodules and a flag indicating an enforced operation +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +tuple of (bool, list of str, bool) +</dd> +</dl><a NAME="GitSubmodulesDeinitDialog.on_allCheckBox_toggled" ID="GitSubmodulesDeinitDialog.on_allCheckBox_toggled"></a> +<h4>GitSubmodulesDeinitDialog.on_allCheckBox_toggled</h4> +<b>on_allCheckBox_toggled</b>(<i>checked</i>) +<p> + Private slot to react on changes of the all checkbox. +</p><dl> +<dt><i>checked</i> (bool)</dt> +<dd> +state of the checkbox +</dd> +</dl><a NAME="GitSubmodulesDeinitDialog.on_submodulesList_itemSelectionChanged" ID="GitSubmodulesDeinitDialog.on_submodulesList_itemSelectionChanged"></a> +<h4>GitSubmodulesDeinitDialog.on_submodulesList_itemSelectionChanged</h4> +<b>on_submodulesList_itemSelectionChanged</b>(<i></i>) +<p> + Private slot to react on changes of the submodule selection. +</p> +<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.GitSubmodulesListDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,84 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesListDialog</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.GitSubmodulesListDialog</h1> +<p> +Module implementing a dialog to list the defined submodules. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitSubmodulesListDialog">GitSubmodulesListDialog</a></td> +<td>Class implementing a dialog to list the defined submodules.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitSubmodulesListDialog" ID="GitSubmodulesListDialog"></a> +<h2>GitSubmodulesListDialog</h2> +<p> + Class implementing a dialog to list the defined submodules. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitSubmodulesListDialog +<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="#GitSubmodulesListDialog.__init__">GitSubmodulesListDialog</a></td> +<td>Constructor</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitSubmodulesListDialog.__init__" ID="GitSubmodulesListDialog.__init__"></a> +<h4>GitSubmodulesListDialog (Constructor)</h4> +<b>GitSubmodulesListDialog</b>(<i>submodules, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>submodules</i> (list of dictionaries with submodule name, path, URL and branch)</dt> +<dd> +list of submodule data to be shown +</dd><dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent widget +</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.GitSubmodulesStatusDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,159 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesStatusDialog</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.GitSubmodulesStatusDialog</h1> +<p> +Module implementing a dialog to show the status of the submodules of the +project. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitSubmodulesStatusDialog">GitSubmodulesStatusDialog</a></td> +<td>Class implementing a dialog to show the status of the submodules of the project.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitSubmodulesStatusDialog" ID="GitSubmodulesStatusDialog"></a> +<h2>GitSubmodulesStatusDialog</h2> +<p> + Class implementing a dialog to show the status of the submodules of the + project. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitSubmodulesStatusDialog +<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="#GitSubmodulesStatusDialog.__init__">GitSubmodulesStatusDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitSubmodulesStatusDialog.__processOutput">__processOutput</a></td> +<td>Private method to process the output and populate the list.</td> +</tr><tr> +<td><a href="#GitSubmodulesStatusDialog.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="#GitSubmodulesStatusDialog.on_indexCheckBox_toggled">on_indexCheckBox_toggled</a></td> +<td>Private slot handling a change of the index check box.</td> +</tr><tr> +<td><a href="#GitSubmodulesStatusDialog.on_recursiveCheckBox_toggled">on_recursiveCheckBox_toggled</a></td> +<td>Private slot handling a change of the recursive check box.</td> +</tr><tr> +<td><a href="#GitSubmodulesStatusDialog.on_refreshButton_clicked">on_refreshButton_clicked</a></td> +<td>Private slot to refresh the status display.</td> +</tr><tr> +<td><a href="#GitSubmodulesStatusDialog.start">start</a></td> +<td>Public method to populate the status list.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitSubmodulesStatusDialog.__init__" ID="GitSubmodulesStatusDialog.__init__"></a> +<h4>GitSubmodulesStatusDialog (Constructor)</h4> +<b>GitSubmodulesStatusDialog</b>(<i>vcs, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>vcs</i> (Git)</dt> +<dd> +reference to the vcs object +</dd><dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent widget +</dd> +</dl><a NAME="GitSubmodulesStatusDialog.__processOutput" ID="GitSubmodulesStatusDialog.__processOutput"></a> +<h4>GitSubmodulesStatusDialog.__processOutput</h4> +<b>__processOutput</b>(<i>output</i>) +<p> + Private method to process the output and populate the list. +</p><dl> +<dt><i>output</i> (str)</dt> +<dd> +output of the submodule status command +</dd> +</dl><a NAME="GitSubmodulesStatusDialog.on_buttonBox_clicked" ID="GitSubmodulesStatusDialog.on_buttonBox_clicked"></a> +<h4>GitSubmodulesStatusDialog.on_buttonBox_clicked</h4> +<b>on_buttonBox_clicked</b>(<i>button</i>) +<p> + Private slot called by a button of the button box clicked. +</p><dl> +<dt><i>button</i></dt> +<dd> +button that was clicked (QAbstractButton) +</dd> +</dl><a NAME="GitSubmodulesStatusDialog.on_indexCheckBox_toggled" ID="GitSubmodulesStatusDialog.on_indexCheckBox_toggled"></a> +<h4>GitSubmodulesStatusDialog.on_indexCheckBox_toggled</h4> +<b>on_indexCheckBox_toggled</b>(<i>checked</i>) +<p> + Private slot handling a change of the index check box. +</p><dl> +<dt><i>checked</i> (bool)</dt> +<dd> +check state of the check box +</dd> +</dl><a NAME="GitSubmodulesStatusDialog.on_recursiveCheckBox_toggled" ID="GitSubmodulesStatusDialog.on_recursiveCheckBox_toggled"></a> +<h4>GitSubmodulesStatusDialog.on_recursiveCheckBox_toggled</h4> +<b>on_recursiveCheckBox_toggled</b>(<i>checked</i>) +<p> + Private slot handling a change of the recursive check box. +</p><dl> +<dt><i>checked</i> (bool)</dt> +<dd> +check state of the check box +</dd> +</dl><a NAME="GitSubmodulesStatusDialog.on_refreshButton_clicked" ID="GitSubmodulesStatusDialog.on_refreshButton_clicked"></a> +<h4>GitSubmodulesStatusDialog.on_refreshButton_clicked</h4> +<b>on_refreshButton_clicked</b>(<i></i>) +<p> + Private slot to refresh the status display. +</p><a NAME="GitSubmodulesStatusDialog.start" ID="GitSubmodulesStatusDialog.start"></a> +<h4>GitSubmodulesStatusDialog.start</h4> +<b>start</b>(<i>projectDir</i>) +<p> + Public method to populate the status list. +</p><dl> +<dt><i>projectDir</i> (str)</dt> +<dd> +name of the project directory +</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.GitSubmodulesSummaryOptionsDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,105 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesSummaryOptionsDialog</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.GitSubmodulesSummaryOptionsDialog</h1> +<p> +Module implementing a dialog to enter submodule summary options. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitSubmodulesSummaryOptionsDialog">GitSubmodulesSummaryOptionsDialog</a></td> +<td>Class implementing a dialog to enter submodule summary options.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitSubmodulesSummaryOptionsDialog" ID="GitSubmodulesSummaryOptionsDialog"></a> +<h2>GitSubmodulesSummaryOptionsDialog</h2> +<p> + Class implementing a dialog to enter submodule summary options. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitSubmodulesSummaryOptionsDialog +<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="#GitSubmodulesSummaryOptionsDialog.__init__">GitSubmodulesSummaryOptionsDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitSubmodulesSummaryOptionsDialog.getData">getData</a></td> +<td>Public method to get the entered data.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitSubmodulesSummaryOptionsDialog.__init__" ID="GitSubmodulesSummaryOptionsDialog.__init__"></a> +<h4>GitSubmodulesSummaryOptionsDialog (Constructor)</h4> +<b>GitSubmodulesSummaryOptionsDialog</b>(<i>submodulePaths, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>submodulePaths</i> (list of str)</dt> +<dd> +list of submodule paths +</dd><dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent widget +</dd> +</dl><a NAME="GitSubmodulesSummaryOptionsDialog.getData" ID="GitSubmodulesSummaryOptionsDialog.getData"></a> +<h4>GitSubmodulesSummaryOptionsDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to get the entered data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple containing a list of selected submodules, a flag + indicating to show summary for the superproject index, a flag + indicating to show summary for the submodules index, an optional + commit ID and a value for the number of entries to be shown +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +tuple of (list of str, bool, bool, str, int) +</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.GitSubmodulesSyncDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,103 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesSyncDialog</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.GitSubmodulesSyncDialog</h1> +<p> +Module implementing a dialog to enter submodule synchronization options. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitSubmodulesSyncDialog">GitSubmodulesSyncDialog</a></td> +<td>Class implementing a dialog to enter submodule synchronization options.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitSubmodulesSyncDialog" ID="GitSubmodulesSyncDialog"></a> +<h2>GitSubmodulesSyncDialog</h2> +<p> + Class implementing a dialog to enter submodule synchronization options. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitSubmodulesSyncDialog +<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="#GitSubmodulesSyncDialog.__init__">GitSubmodulesSyncDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitSubmodulesSyncDialog.getData">getData</a></td> +<td>Public method to get the entered data.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitSubmodulesSyncDialog.__init__" ID="GitSubmodulesSyncDialog.__init__"></a> +<h4>GitSubmodulesSyncDialog (Constructor)</h4> +<b>GitSubmodulesSyncDialog</b>(<i>submodulePaths, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>submodulePaths</i> (list of str)</dt> +<dd> +list of submodule paths +</dd><dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent widget +</dd> +</dl><a NAME="GitSubmodulesSyncDialog.getData" ID="GitSubmodulesSyncDialog.getData"></a> +<h4>GitSubmodulesSyncDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to get the entered data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple containing a list of selected submodules and a flag + indicating a recursive operation +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +tuple of (list of str, bool) +</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.GitSubmodulesUpdateOptionsDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,106 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesUpdateOptionsDialog</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.GitSubmodulesUpdateOptionsDialog</h1> +<p> +Module implementing a dialog to enter options for a submodule update command. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitSubmodulesUpdateOptionsDialog">GitSubmodulesUpdateOptionsDialog</a></td> +<td>Class implementing a dialog to enter options for a submodule update command.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitSubmodulesUpdateOptionsDialog" ID="GitSubmodulesUpdateOptionsDialog"></a> +<h2>GitSubmodulesUpdateOptionsDialog</h2> +<p> + Class implementing a dialog to enter options for a submodule update + command. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitSubmodulesUpdateOptionsDialog +<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="#GitSubmodulesUpdateOptionsDialog.__init__">GitSubmodulesUpdateOptionsDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitSubmodulesUpdateOptionsDialog.getData">getData</a></td> +<td>Public method to get the entered data.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitSubmodulesUpdateOptionsDialog.__init__" ID="GitSubmodulesUpdateOptionsDialog.__init__"></a> +<h4>GitSubmodulesUpdateOptionsDialog (Constructor)</h4> +<b>GitSubmodulesUpdateOptionsDialog</b>(<i>submodulePaths, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>submodulePaths</i> (list of str)</dt> +<dd> +list of submodule paths +</dd><dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent widget +</dd> +</dl><a NAME="GitSubmodulesUpdateOptionsDialog.getData" ID="GitSubmodulesUpdateOptionsDialog.getData"></a> +<h4>GitSubmodulesUpdateOptionsDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to get the entered data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple containing the update procedure, a flag indicating an + init, a flag indicating an update with remote, a flag indicating + not to fetch the remote, a flag indicating an enforced operation + and a list of selected submodules. +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +tuple of (int, bool, bool, bool, bool, list of str) +</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.GitTagBranchListDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,308 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitTagBranchListDialog</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.GitTagBranchListDialog</h1> +<p> +Module implementing a dialog to show a list of tags or branches. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitTagBranchListDialog">GitTagBranchListDialog</a></td> +<td>Class implementing a dialog to show a list of tags or branches.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitTagBranchListDialog" ID="GitTagBranchListDialog"></a> +<h2>GitTagBranchListDialog</h2> +<p> + Class implementing a dialog to show a list of tags or branches. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitTagBranchListDialog +<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="#GitTagBranchListDialog.__init__">GitTagBranchListDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitTagBranchListDialog.__finish">__finish</a></td> +<td>Private slot called when the process finished or the user pressed the button.</td> +</tr><tr> +<td><a href="#GitTagBranchListDialog.__generateItem">__generateItem</a></td> +<td>Private method to generate a tag item in the tag list.</td> +</tr><tr> +<td><a href="#GitTagBranchListDialog.__getCommit">__getCommit</a></td> +<td>Private method to get the commit id for a tag.</td> +</tr><tr> +<td><a href="#GitTagBranchListDialog.__procFinished">__procFinished</a></td> +<td>Private slot connected to the finished signal.</td> +</tr><tr> +<td><a href="#GitTagBranchListDialog.__processOutputLine">__processOutputLine</a></td> +<td>Private method to process the lines of output.</td> +</tr><tr> +<td><a href="#GitTagBranchListDialog.__readStderr">__readStderr</a></td> +<td>Private slot to handle the readyReadStderr signal.</td> +</tr><tr> +<td><a href="#GitTagBranchListDialog.__readStdout">__readStdout</a></td> +<td>Private slot to handle the readyReadStdout signal.</td> +</tr><tr> +<td><a href="#GitTagBranchListDialog.__resizeColumns">__resizeColumns</a></td> +<td>Private method to resize the list columns.</td> +</tr><tr> +<td><a href="#GitTagBranchListDialog.__resort">__resort</a></td> +<td>Private method to resort the tree.</td> +</tr><tr> +<td><a href="#GitTagBranchListDialog.__showError">__showError</a></td> +<td>Private slot to show some error.</td> +</tr><tr> +<td><a href="#GitTagBranchListDialog.closeEvent">closeEvent</a></td> +<td>Protected slot implementing a close event handler.</td> +</tr><tr> +<td><a href="#GitTagBranchListDialog.keyPressEvent">keyPressEvent</a></td> +<td>Protected slot to handle a key press event.</td> +</tr><tr> +<td><a href="#GitTagBranchListDialog.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="#GitTagBranchListDialog.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> +<td><a href="#GitTagBranchListDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> +<td>Private slot to handle the password checkbox toggled.</td> +</tr><tr> +<td><a href="#GitTagBranchListDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> +<td>Private slot to send the input to the git process.</td> +</tr><tr> +<td><a href="#GitTagBranchListDialog.start">start</a></td> +<td>Public slot to start the tag/branch list command.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitTagBranchListDialog.__init__" ID="GitTagBranchListDialog.__init__"></a> +<h4>GitTagBranchListDialog (Constructor)</h4> +<b>GitTagBranchListDialog</b>(<i>vcs, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>vcs</i></dt> +<dd> +reference to the vcs object +</dd><dt><i>parent</i></dt> +<dd> +parent widget (QWidget) +</dd> +</dl><a NAME="GitTagBranchListDialog.__finish" ID="GitTagBranchListDialog.__finish"></a> +<h4>GitTagBranchListDialog.__finish</h4> +<b>__finish</b>(<i></i>) +<p> + Private slot called when the process finished or the user pressed + the button. +</p><a NAME="GitTagBranchListDialog.__generateItem" ID="GitTagBranchListDialog.__generateItem"></a> +<h4>GitTagBranchListDialog.__generateItem</h4> +<b>__generateItem</b>(<i>commit, name, msg="", bold=False, italic=False</i>) +<p> + Private method to generate a tag item in the tag list. +</p><dl> +<dt><i>commit</i></dt> +<dd> +commit id of the tag/branch (string) +</dd><dt><i>name</i></dt> +<dd> +name of the tag/branch (string) +</dd><dt><i>msg</i></dt> +<dd> +tag annotation message +</dd><dt><i>bold</i></dt> +<dd> +flag indicating to show the entry in bold (boolean) +</dd><dt><i>italic</i></dt> +<dd> +flag indicating to show the entry in italic (boolean) +</dd> +</dl><a NAME="GitTagBranchListDialog.__getCommit" ID="GitTagBranchListDialog.__getCommit"></a> +<h4>GitTagBranchListDialog.__getCommit</h4> +<b>__getCommit</b>(<i>tag</i>) +<p> + Private method to get the commit id for a tag. +</p><dl> +<dt><i>tag</i></dt> +<dd> +tag name (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +commit id shortened to 10 characters (string) +</dd> +</dl><a NAME="GitTagBranchListDialog.__procFinished" ID="GitTagBranchListDialog.__procFinished"></a> +<h4>GitTagBranchListDialog.__procFinished</h4> +<b>__procFinished</b>(<i>exitCode, exitStatus</i>) +<p> + Private slot connected to the finished signal. +</p><dl> +<dt><i>exitCode</i></dt> +<dd> +exit code of the process (integer) +</dd><dt><i>exitStatus</i></dt> +<dd> +exit status of the process (QProcess.ExitStatus) +</dd> +</dl><a NAME="GitTagBranchListDialog.__processOutputLine" ID="GitTagBranchListDialog.__processOutputLine"></a> +<h4>GitTagBranchListDialog.__processOutputLine</h4> +<b>__processOutputLine</b>(<i>line</i>) +<p> + Private method to process the lines of output. +</p><dl> +<dt><i>line</i></dt> +<dd> +output line to be processed (string) +</dd> +</dl><a NAME="GitTagBranchListDialog.__readStderr" ID="GitTagBranchListDialog.__readStderr"></a> +<h4>GitTagBranchListDialog.__readStderr</h4> +<b>__readStderr</b>(<i></i>) +<p> + Private slot to handle the readyReadStderr signal. +</p><p> + It reads the error output of the process and inserts it into the + error pane. +</p><a NAME="GitTagBranchListDialog.__readStdout" ID="GitTagBranchListDialog.__readStdout"></a> +<h4>GitTagBranchListDialog.__readStdout</h4> +<b>__readStdout</b>(<i></i>) +<p> + Private slot to handle the readyReadStdout signal. +</p><p> + It reads the output of the process, formats it and inserts it into + the contents pane. +</p><a NAME="GitTagBranchListDialog.__resizeColumns" ID="GitTagBranchListDialog.__resizeColumns"></a> +<h4>GitTagBranchListDialog.__resizeColumns</h4> +<b>__resizeColumns</b>(<i></i>) +<p> + Private method to resize the list columns. +</p><a NAME="GitTagBranchListDialog.__resort" ID="GitTagBranchListDialog.__resort"></a> +<h4>GitTagBranchListDialog.__resort</h4> +<b>__resort</b>(<i></i>) +<p> + Private method to resort the tree. +</p><a NAME="GitTagBranchListDialog.__showError" ID="GitTagBranchListDialog.__showError"></a> +<h4>GitTagBranchListDialog.__showError</h4> +<b>__showError</b>(<i>out</i>) +<p> + Private slot to show some error. +</p><dl> +<dt><i>out</i></dt> +<dd> +error to be shown (string) +</dd> +</dl><a NAME="GitTagBranchListDialog.closeEvent" ID="GitTagBranchListDialog.closeEvent"></a> +<h4>GitTagBranchListDialog.closeEvent</h4> +<b>closeEvent</b>(<i>e</i>) +<p> + Protected slot implementing a close event handler. +</p><dl> +<dt><i>e</i></dt> +<dd> +close event (QCloseEvent) +</dd> +</dl><a NAME="GitTagBranchListDialog.keyPressEvent" ID="GitTagBranchListDialog.keyPressEvent"></a> +<h4>GitTagBranchListDialog.keyPressEvent</h4> +<b>keyPressEvent</b>(<i>evt</i>) +<p> + Protected slot to handle a key press event. +</p><dl> +<dt><i>evt</i></dt> +<dd> +the key press event (QKeyEvent) +</dd> +</dl><a NAME="GitTagBranchListDialog.on_buttonBox_clicked" ID="GitTagBranchListDialog.on_buttonBox_clicked"></a> +<h4>GitTagBranchListDialog.on_buttonBox_clicked</h4> +<b>on_buttonBox_clicked</b>(<i>button</i>) +<p> + Private slot called by a button of the button box clicked. +</p><dl> +<dt><i>button</i></dt> +<dd> +button that was clicked (QAbstractButton) +</dd> +</dl><a NAME="GitTagBranchListDialog.on_input_returnPressed" ID="GitTagBranchListDialog.on_input_returnPressed"></a> +<h4>GitTagBranchListDialog.on_input_returnPressed</h4> +<b>on_input_returnPressed</b>(<i></i>) +<p> + Private slot to handle the press of the return key in the input field. +</p><a NAME="GitTagBranchListDialog.on_passwordCheckBox_toggled" ID="GitTagBranchListDialog.on_passwordCheckBox_toggled"></a> +<h4>GitTagBranchListDialog.on_passwordCheckBox_toggled</h4> +<b>on_passwordCheckBox_toggled</b>(<i>isOn</i>) +<p> + Private slot to handle the password checkbox toggled. +</p><dl> +<dt><i>isOn</i></dt> +<dd> +flag indicating the status of the check box (boolean) +</dd> +</dl><a NAME="GitTagBranchListDialog.on_sendButton_clicked" ID="GitTagBranchListDialog.on_sendButton_clicked"></a> +<h4>GitTagBranchListDialog.on_sendButton_clicked</h4> +<b>on_sendButton_clicked</b>(<i></i>) +<p> + Private slot to send the input to the git process. +</p><a NAME="GitTagBranchListDialog.start" ID="GitTagBranchListDialog.start"></a> +<h4>GitTagBranchListDialog.start</h4> +<b>start</b>(<i>path, tags, listAll=True, merged=True</i>) +<p> + Public slot to start the tag/branch list command. +</p><dl> +<dt><i>path</i></dt> +<dd> +name of directory to be listed (string) +</dd><dt><i>tags</i></dt> +<dd> +flag indicating a list of tags is requested + (False = branches, True = tags) +</dd><dt><i>listAll</i></dt> +<dd> +flag indicating to show all tags or branches (boolean) +</dd><dt><i>merged</i></dt> +<dd> +flag indicating to show only merged or non-merged + branches (boolean) +</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.GitTagDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,117 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitTagDialog</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.GitTagDialog</h1> +<p> +Module implementing a dialog to enter the data for a tagging operation. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitTagDialog">GitTagDialog</a></td> +<td>Class implementing a dialog to enter the data for a tagging operation.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitTagDialog" ID="GitTagDialog"></a> +<h2>GitTagDialog</h2> +<p> + Class implementing a dialog to enter the data for a tagging operation. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitTagDialog +<h3>Class Attributes</h3> +<table> +<tr><td>AnnotatedTag</td></tr><tr><td>CreateTag</td></tr><tr><td>DeleteTag</td></tr><tr><td>LocalTag</td></tr><tr><td>SignedTag</td></tr><tr><td>VerifyTag</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#GitTagDialog.__init__">GitTagDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitTagDialog.getParameters">getParameters</a></td> +<td>Public method to retrieve the tag data.</td> +</tr><tr> +<td><a href="#GitTagDialog.on_tagCombo_editTextChanged">on_tagCombo_editTextChanged</a></td> +<td>Private method used to enable/disable the OK-button.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitTagDialog.__init__" ID="GitTagDialog.__init__"></a> +<h4>GitTagDialog (Constructor)</h4> +<b>GitTagDialog</b>(<i>taglist, revision=None, tagName=None, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>taglist</i></dt> +<dd> +list of previously entered tags (list of strings) +</dd><dt><i>revision</i></dt> +<dd> +revision to set tag for (string) +</dd><dt><i>tagName</i></dt> +<dd> +name of the tag (string) +</dd><dt><i>parent</i></dt> +<dd> +parent widget (QWidget) +</dd> +</dl><a NAME="GitTagDialog.getParameters" ID="GitTagDialog.getParameters"></a> +<h4>GitTagDialog.getParameters</h4> +<b>getParameters</b>(<i></i>) +<p> + Public method to retrieve the tag data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple of two strings, two int and a boolean (tag, revision, + tag operation, tag type, enforce operation) +</dd> +</dl><a NAME="GitTagDialog.on_tagCombo_editTextChanged" ID="GitTagDialog.on_tagCombo_editTextChanged"></a> +<h4>GitTagDialog.on_tagCombo_editTextChanged</h4> +<b>on_tagCombo_editTextChanged</b>(<i>text</i>) +<p> + Private method used to enable/disable the OK-button. +</p><dl> +<dt><i>text</i></dt> +<dd> +tag name entered in the combo (string) +</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.GitUserConfigDataDialog.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,98 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitUserConfigDataDialog</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.GitUserConfigDataDialog</h1> +<p> +Module implementing a dialog to enter some user data. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitUserConfigDataDialog">GitUserConfigDataDialog</a></td> +<td>Class implementing a dialog to enter some user data.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitUserConfigDataDialog" ID="GitUserConfigDataDialog"></a> +<h2>GitUserConfigDataDialog</h2> +<p> + Class implementing a dialog to enter some user data. +</p> +<h3>Derived from</h3> +QDialog, Ui_GitUserConfigDataDialog +<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="#GitUserConfigDataDialog.__init__">GitUserConfigDataDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitUserConfigDataDialog.getData">getData</a></td> +<td>Public method to retrieve the entered data.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitUserConfigDataDialog.__init__" ID="GitUserConfigDataDialog.__init__"></a> +<h4>GitUserConfigDataDialog (Constructor)</h4> +<b>GitUserConfigDataDialog</b>(<i>version=(0, 0), parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>version</i></dt> +<dd> +Git version info (tuple of two integers) +</dd><dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd> +</dl><a NAME="GitUserConfigDataDialog.getData" ID="GitUserConfigDataDialog.getData"></a> +<h4>GitUserConfigDataDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to retrieve the entered data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple with user's first name, last name and email address + (tuple of three strings) +</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.GitUtilities.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,90 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.GitUtilities</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.GitUtilities</h1> +<p> +Module implementing some common utility functions for the Git package. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Functions</h3> +<table> +<tr> +<td><a href="#getConfigPath">getConfigPath</a></td> +<td>Public function to get the filename of the config file.</td> +</tr><tr> +<td><a href="#prepareProcess">prepareProcess</a></td> +<td>Public function to prepare the given process.</td> +</tr><tr> +<td><a href="#strToQByteArray">strToQByteArray</a></td> +<td>Module function to convert a Python string into a QByteArray.</td> +</tr> +</table> +<hr /><hr /> +<a NAME="getConfigPath" ID="getConfigPath"></a> +<h2>getConfigPath</h2> +<b>getConfigPath</b>(<i></i>) +<p> + Public function to get the filename of the config file. +</p><dl> +<dt>Returns:</dt> +<dd> +filename of the config file (string) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="prepareProcess" ID="prepareProcess"></a> +<h2>prepareProcess</h2> +<b>prepareProcess</b>(<i>proc, language=""</i>) +<p> + Public function to prepare the given process. +</p><dl> +<dt><i>proc</i></dt> +<dd> +reference to the proces to be prepared (QProcess) +</dd><dt><i>language</i></dt> +<dd> +language to be set (string) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="strToQByteArray" ID="strToQByteArray"></a> +<h2>strToQByteArray</h2> +<b>strToQByteArray</b>(<i>txt</i>) +<p> + Module function to convert a Python string into a QByteArray. +</p><dl> +<dt><i>txt</i> (str, bytes, bytearray, unicode)</dt> +<dd> +Python string to be converted +</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.ProjectBrowserHelper.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,333 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper</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.ProjectBrowserHelper</h1> +<p> +Module implementing the VCS project browser helper for Git. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitProjectBrowserHelper">GitProjectBrowserHelper</a></td> +<td>Class implementing the VCS project browser helper for Git.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitProjectBrowserHelper" ID="GitProjectBrowserHelper"></a> +<h2>GitProjectBrowserHelper</h2> +<p> + Class implementing the VCS project browser helper for Git. +</p> +<h3>Derived from</h3> +VcsProjectBrowserHelper +<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="#GitProjectBrowserHelper.__init__">GitProjectBrowserHelper</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitProjectBrowserHelper.__GitBlame">__GitBlame</a></td> +<td>Private slot called by the context menu to show the annotations of a file.</td> +</tr><tr> +<td><a href="#GitProjectBrowserHelper.__GitConfigure">__GitConfigure</a></td> +<td>Private method to open the configuration dialog.</td> +</tr><tr> +<td><a href="#GitProjectBrowserHelper.__GitCopy">__GitCopy</a></td> +<td>Private slot called by the context menu to copy the selected file.</td> +</tr><tr> +<td><a href="#GitProjectBrowserHelper.__GitExtendedDiff">__GitExtendedDiff</a></td> +<td>Private slot called by the context menu to show the difference of a file to the repository.</td> +</tr><tr> +<td><a href="#GitProjectBrowserHelper.__GitForget">__GitForget</a></td> +<td>Private slot called by the context menu to remove the selected file from the Git repository leaving a copy in the project directory.</td> +</tr><tr> +<td><a href="#GitProjectBrowserHelper.__GitMove">__GitMove</a></td> +<td>Private slot called by the context menu to move the selected file.</td> +</tr><tr> +<td><a href="#GitProjectBrowserHelper.__GitRevert">__GitRevert</a></td> +<td>Private slot to revert changes of the working area.</td> +</tr><tr> +<td><a href="#GitProjectBrowserHelper.__GitSbsDiff">__GitSbsDiff</a></td> +<td>Private slot called by the context menu to show the difference of a file to the repository side-by-side.</td> +</tr><tr> +<td><a href="#GitProjectBrowserHelper.__GitSbsExtendedDiff">__GitSbsExtendedDiff</a></td> +<td>Private slot called by the context menu to show the difference of a file to the repository side-by-side.</td> +</tr><tr> +<td><a href="#GitProjectBrowserHelper.__GitUnstage">__GitUnstage</a></td> +<td>Private slot to unstage changes.</td> +</tr><tr> +<td><a href="#GitProjectBrowserHelper._addVCSMenu">_addVCSMenu</a></td> +<td>Protected method used to add the VCS menu to all project browsers.</td> +</tr><tr> +<td><a href="#GitProjectBrowserHelper._addVCSMenuBack">_addVCSMenuBack</a></td> +<td>Protected method used to add the VCS menu to all project browsers.</td> +</tr><tr> +<td><a href="#GitProjectBrowserHelper._addVCSMenuDir">_addVCSMenuDir</a></td> +<td>Protected method used to add the VCS menu to all project browsers.</td> +</tr><tr> +<td><a href="#GitProjectBrowserHelper._addVCSMenuDirMulti">_addVCSMenuDirMulti</a></td> +<td>Protected method used to add the VCS menu to all project browsers.</td> +</tr><tr> +<td><a href="#GitProjectBrowserHelper._addVCSMenuMulti">_addVCSMenuMulti</a></td> +<td>Protected method used to add the VCS menu for multi selection to all project browsers.</td> +</tr><tr> +<td><a href="#GitProjectBrowserHelper.showContextMenu">showContextMenu</a></td> +<td>Public slot called before the context menu is shown.</td> +</tr><tr> +<td><a href="#GitProjectBrowserHelper.showContextMenuDir">showContextMenuDir</a></td> +<td>Public slot called before the context menu is shown.</td> +</tr><tr> +<td><a href="#GitProjectBrowserHelper.showContextMenuDirMulti">showContextMenuDirMulti</a></td> +<td>Public slot called before the context menu is shown.</td> +</tr><tr> +<td><a href="#GitProjectBrowserHelper.showContextMenuMulti">showContextMenuMulti</a></td> +<td>Public slot called before the context menu (multiple selections) is shown.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitProjectBrowserHelper.__init__" ID="GitProjectBrowserHelper.__init__"></a> +<h4>GitProjectBrowserHelper (Constructor)</h4> +<b>GitProjectBrowserHelper</b>(<i>vcsObject, browserObject, projectObject, isTranslationsBrowser, parent=None, name=None</i>) +<p> + Constructor +</p><dl> +<dt><i>vcsObject</i></dt> +<dd> +reference to the vcs object +</dd><dt><i>browserObject</i></dt> +<dd> +reference to the project browser object +</dd><dt><i>projectObject</i></dt> +<dd> +reference to the project object +</dd><dt><i>isTranslationsBrowser</i></dt> +<dd> +flag indicating, the helper is requested + for the translations browser (this needs some special treatment) +</dd><dt><i>parent</i></dt> +<dd> +parent widget (QWidget) +</dd><dt><i>name</i></dt> +<dd> +name of this object (string) +</dd> +</dl><a NAME="GitProjectBrowserHelper.__GitBlame" ID="GitProjectBrowserHelper.__GitBlame"></a> +<h4>GitProjectBrowserHelper.__GitBlame</h4> +<b>__GitBlame</b>(<i></i>) +<p> + Private slot called by the context menu to show the annotations of a + file. +</p><a NAME="GitProjectBrowserHelper.__GitConfigure" ID="GitProjectBrowserHelper.__GitConfigure"></a> +<h4>GitProjectBrowserHelper.__GitConfigure</h4> +<b>__GitConfigure</b>(<i></i>) +<p> + Private method to open the configuration dialog. +</p><a NAME="GitProjectBrowserHelper.__GitCopy" ID="GitProjectBrowserHelper.__GitCopy"></a> +<h4>GitProjectBrowserHelper.__GitCopy</h4> +<b>__GitCopy</b>(<i></i>) +<p> + Private slot called by the context menu to copy the selected file. +</p><a NAME="GitProjectBrowserHelper.__GitExtendedDiff" ID="GitProjectBrowserHelper.__GitExtendedDiff"></a> +<h4>GitProjectBrowserHelper.__GitExtendedDiff</h4> +<b>__GitExtendedDiff</b>(<i></i>) +<p> + Private slot called by the context menu to show the difference of a + file to the repository. +</p><p> + This gives the chance to enter the revisions to compare. +</p><a NAME="GitProjectBrowserHelper.__GitForget" ID="GitProjectBrowserHelper.__GitForget"></a> +<h4>GitProjectBrowserHelper.__GitForget</h4> +<b>__GitForget</b>(<i></i>) +<p> + Private slot called by the context menu to remove the selected file + from the Git repository leaving a copy in the project directory. +</p><a NAME="GitProjectBrowserHelper.__GitMove" ID="GitProjectBrowserHelper.__GitMove"></a> +<h4>GitProjectBrowserHelper.__GitMove</h4> +<b>__GitMove</b>(<i></i>) +<p> + Private slot called by the context menu to move the selected file. +</p><a NAME="GitProjectBrowserHelper.__GitRevert" ID="GitProjectBrowserHelper.__GitRevert"></a> +<h4>GitProjectBrowserHelper.__GitRevert</h4> +<b>__GitRevert</b>(<i></i>) +<p> + Private slot to revert changes of the working area. +</p><a NAME="GitProjectBrowserHelper.__GitSbsDiff" ID="GitProjectBrowserHelper.__GitSbsDiff"></a> +<h4>GitProjectBrowserHelper.__GitSbsDiff</h4> +<b>__GitSbsDiff</b>(<i></i>) +<p> + Private slot called by the context menu to show the difference of a + file to the repository side-by-side. +</p><a NAME="GitProjectBrowserHelper.__GitSbsExtendedDiff" ID="GitProjectBrowserHelper.__GitSbsExtendedDiff"></a> +<h4>GitProjectBrowserHelper.__GitSbsExtendedDiff</h4> +<b>__GitSbsExtendedDiff</b>(<i></i>) +<p> + Private slot called by the context menu to show the difference of a + file to the repository side-by-side. +</p><p> + It allows the selection of revisions to compare. +</p><a NAME="GitProjectBrowserHelper.__GitUnstage" ID="GitProjectBrowserHelper.__GitUnstage"></a> +<h4>GitProjectBrowserHelper.__GitUnstage</h4> +<b>__GitUnstage</b>(<i></i>) +<p> + Private slot to unstage changes. +</p><a NAME="GitProjectBrowserHelper._addVCSMenu" ID="GitProjectBrowserHelper._addVCSMenu"></a> +<h4>GitProjectBrowserHelper._addVCSMenu</h4> +<b>_addVCSMenu</b>(<i>mainMenu</i>) +<p> + Protected method used to add the VCS menu to all project browsers. +</p><dl> +<dt><i>mainMenu</i></dt> +<dd> +reference to the menu to be amended +</dd> +</dl><a NAME="GitProjectBrowserHelper._addVCSMenuBack" ID="GitProjectBrowserHelper._addVCSMenuBack"></a> +<h4>GitProjectBrowserHelper._addVCSMenuBack</h4> +<b>_addVCSMenuBack</b>(<i>mainMenu</i>) +<p> + Protected method used to add the VCS menu to all project browsers. +</p><dl> +<dt><i>mainMenu</i></dt> +<dd> +reference to the menu to be amended +</dd> +</dl><a NAME="GitProjectBrowserHelper._addVCSMenuDir" ID="GitProjectBrowserHelper._addVCSMenuDir"></a> +<h4>GitProjectBrowserHelper._addVCSMenuDir</h4> +<b>_addVCSMenuDir</b>(<i>mainMenu</i>) +<p> + Protected method used to add the VCS menu to all project browsers. +</p><dl> +<dt><i>mainMenu</i></dt> +<dd> +reference to the menu to be amended +</dd> +</dl><a NAME="GitProjectBrowserHelper._addVCSMenuDirMulti" ID="GitProjectBrowserHelper._addVCSMenuDirMulti"></a> +<h4>GitProjectBrowserHelper._addVCSMenuDirMulti</h4> +<b>_addVCSMenuDirMulti</b>(<i>mainMenu</i>) +<p> + Protected method used to add the VCS menu to all project browsers. +</p><dl> +<dt><i>mainMenu</i></dt> +<dd> +reference to the menu to be amended +</dd> +</dl><a NAME="GitProjectBrowserHelper._addVCSMenuMulti" ID="GitProjectBrowserHelper._addVCSMenuMulti"></a> +<h4>GitProjectBrowserHelper._addVCSMenuMulti</h4> +<b>_addVCSMenuMulti</b>(<i>mainMenu</i>) +<p> + Protected method used to add the VCS menu for multi selection to all + project browsers. +</p><dl> +<dt><i>mainMenu</i></dt> +<dd> +reference to the menu to be amended +</dd> +</dl><a NAME="GitProjectBrowserHelper.showContextMenu" ID="GitProjectBrowserHelper.showContextMenu"></a> +<h4>GitProjectBrowserHelper.showContextMenu</h4> +<b>showContextMenu</b>(<i>menu, standardItems</i>) +<p> + Public slot called before the context menu is shown. +</p><p> + It enables/disables the VCS menu entries depending on the overall + VCS status and the file status. +</p><dl> +<dt><i>menu</i></dt> +<dd> +reference to the menu to be shown +</dd><dt><i>standardItems</i></dt> +<dd> +array of standard items that need + activation/deactivation depending on the overall VCS status +</dd> +</dl><a NAME="GitProjectBrowserHelper.showContextMenuDir" ID="GitProjectBrowserHelper.showContextMenuDir"></a> +<h4>GitProjectBrowserHelper.showContextMenuDir</h4> +<b>showContextMenuDir</b>(<i>menu, standardItems</i>) +<p> + Public slot called before the context menu is shown. +</p><p> + It enables/disables the VCS menu entries depending on the overall + VCS status and the directory status. +</p><dl> +<dt><i>menu</i></dt> +<dd> +reference to the menu to be shown +</dd><dt><i>standardItems</i></dt> +<dd> +array of standard items that need + activation/deactivation depending on the overall VCS status +</dd> +</dl><a NAME="GitProjectBrowserHelper.showContextMenuDirMulti" ID="GitProjectBrowserHelper.showContextMenuDirMulti"></a> +<h4>GitProjectBrowserHelper.showContextMenuDirMulti</h4> +<b>showContextMenuDirMulti</b>(<i>menu, standardItems</i>) +<p> + Public slot called before the context menu is shown. +</p><p> + It enables/disables the VCS menu entries depending on the overall + VCS status and the directory status. +</p><dl> +<dt><i>menu</i></dt> +<dd> +reference to the menu to be shown +</dd><dt><i>standardItems</i></dt> +<dd> +array of standard items that need + activation/deactivation depending on the overall VCS status +</dd> +</dl><a NAME="GitProjectBrowserHelper.showContextMenuMulti" ID="GitProjectBrowserHelper.showContextMenuMulti"></a> +<h4>GitProjectBrowserHelper.showContextMenuMulti</h4> +<b>showContextMenuMulti</b>(<i>menu, standardItems</i>) +<p> + Public slot called before the context menu (multiple selections) is + shown. +</p><p> + It enables/disables the VCS menu entries depending on the overall + VCS status and the files status. +</p><dl> +<dt><i>menu</i></dt> +<dd> +reference to the menu to be shown +</dd><dt><i>standardItems</i></dt> +<dd> +array of standard items that need + activation/deactivation depending on the overall VCS status +</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.ProjectHelper.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,785 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper</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.ProjectHelper</h1> +<p> +Module implementing the VCS project helper for Git. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GitProjectHelper">GitProjectHelper</a></td> +<td>Class implementing the VCS project helper for Git.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GitProjectHelper" ID="GitProjectHelper"></a> +<h2>GitProjectHelper</h2> +<p> + Class implementing the VCS project helper for Git. +</p> +<h3>Derived from</h3> +VcsProjectHelper +<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="#GitProjectHelper.__init__">GitProjectHelper</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitAddRemote">__gitAddRemote</a></td> +<td>Private slot to add a remote repository.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitApplyPatches">__gitApplyPatches</a></td> +<td>Private slot to apply a list of patch files.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitBisectBad">__gitBisectBad</a></td> +<td>Private slot used to execute the bisect bad command.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitBisectCreateReplay">__gitBisectCreateReplay</a></td> +<td>Private slot used to create a replay file for the current bisect session.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitBisectEditReplay">__gitBisectEditReplay</a></td> +<td>Private slot used to edit a bisect replay file.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitBisectGood">__gitBisectGood</a></td> +<td>Private slot used to execute the bisect good command.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitBisectLogBrowser">__gitBisectLogBrowser</a></td> +<td>Private slot used to show the bisect log browser window.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitBisectReplay">__gitBisectReplay</a></td> +<td>Private slot used to replay a bisect session.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitBisectReset">__gitBisectReset</a></td> +<td>Private slot used to execute the bisect reset command.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitBisectSkip">__gitBisectSkip</a></td> +<td>Private slot used to execute the bisect skip command.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitBisectStart">__gitBisectStart</a></td> +<td>Private slot used to execute the bisect start command.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitBisectStartExtended">__gitBisectStartExtended</a></td> +<td>Private slot used to execute the bisect start command with options.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitBranch">__gitBranch</a></td> +<td>Private slot used to perform branch operations for the project.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitBranchList">__gitBranchList</a></td> +<td>Private slot used to list the branches of the project.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitBundle">__gitBundle</a></td> +<td>Private slot used to create a bundle file.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitBundleFetch">__gitBundleFetch</a></td> +<td>Private slot to apply a head of a bundle file using the fetch method.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitBundleListHeads">__gitBundleListHeads</a></td> +<td>Private slot used to list the heads contained in a bundle file.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitBundlePull">__gitBundlePull</a></td> +<td>Private slot to apply a head of a bundle file using the pull method.</td> +</tr><tr> +<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.__gitCheckPatches">__gitCheckPatches</a></td> +<td>Private slot to check a list of patch files, if they would apply cleanly.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitCherryPick">__gitCherryPick</a></td> +<td>Private slot used to copy commits into the current branch.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitCherryPickAbort">__gitCherryPickAbort</a></td> +<td>Private slot used to cancel the last copying session and return to the previous state.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitCherryPickContinue">__gitCherryPickContinue</a></td> +<td>Private slot used to continue the last copying session after conflicts were resolved.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitCherryPickQuit">__gitCherryPickQuit</a></td> +<td>Private slot used to quit the current copying operation.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitCommitMerge">__gitCommitMerge</a></td> +<td>Private slot used to commit the ongoing merge.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitConfigure">__gitConfigure</a></td> +<td>Private method to open the configuration dialog.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitCreateArchive">__gitCreateArchive</a></td> +<td>Private slot used to create an archive from the local repository.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitCreateIgnore">__gitCreateIgnore</a></td> +<td>Private slot used to create a .gitignore file for the project.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitDeleteBranch">__gitDeleteBranch</a></td> +<td>Private slot used to delete a branch from a remote repository.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitDescribeTag">__gitDescribeTag</a></td> +<td>Private slot to show the most recent tag.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitEditRepoConfig">__gitEditRepoConfig</a></td> +<td>Private slot used to edit the repository configuration file.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitEditUserConfig">__gitEditUserConfig</a></td> +<td>Private slot used to edit the user configuration file.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitExtendedDiff">__gitExtendedDiff</a></td> +<td>Private slot used to perform a git diff with the selection of revisions.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitFetch">__gitFetch</a></td> +<td>Private slot used to fetch changes from a remote repository.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitHouseKeeping">__gitHouseKeeping</a></td> +<td>Private slot used to cleanup and optimize the local repository.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitMergedBranchList">__gitMergedBranchList</a></td> +<td>Private slot used to list the merged branches of the project.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitNotMergedBranchList">__gitNotMergedBranchList</a></td> +<td>Private slot used to list the not merged branches of the project.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitPruneRemote">__gitPruneRemote</a></td> +<td>Private slot to prune stale tracking branches of a remote repository.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitPull">__gitPull</a></td> +<td>Private slot used to pull changes from a remote repository.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitPush">__gitPush</a></td> +<td>Private slot used to push changes to a remote repository.</td> +</tr><tr> +<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.__gitRemoveRemote">__gitRemoveRemote</a></td> +<td>Private slot to remove a remote repository.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitRenameRemote">__gitRenameRemote</a></td> +<td>Private slot to rename a remote repository.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitRevert">__gitRevert</a></td> +<td>Private slot used to revert changes made to the local project.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitShowBranch">__gitShowBranch</a></td> +<td>Private slot used to show the current branch for the project.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitShowConfig">__gitShowConfig</a></td> +<td>Private slot used to show the combined configuration.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitShowPatchStatistics">__gitShowPatchStatistics</a></td> +<td>Private slot to show some patch statistics.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitShowRemote">__gitShowRemote</a></td> +<td>Private slot used to show information about a remote repository.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitShowRemotes">__gitShowRemotes</a></td> +<td>Private slot used to show the available remote repositories.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitStashApply">__gitStashApply</a></td> +<td>Private slot to restore a stash and keep it.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitStashBranch">__gitStashBranch</a></td> +<td>Private slot to create a new branch and restore a stash into it.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitStashBrowser">__gitStashBrowser</a></td> +<td>Private slot used to show the stash browser dialog.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitStashClear">__gitStashClear</a></td> +<td>Private slot to clear all stashes.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitStashDrop">__gitStashDrop</a></td> +<td>Private slot to drop a stash.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitStashPop">__gitStashPop</a></td> +<td>Private slot to restore a stash and delete it.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitStashSave">__gitStashSave</a></td> +<td>Private slot to stash all current changes.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitStashShow">__gitStashShow</a></td> +<td>Private slot to show the contents of the selected stash.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitStatistics">__gitStatistics</a></td> +<td>Private slot used to show some statistics of the local repository.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitSubmoduleAdd">__gitSubmoduleAdd</a></td> +<td>Private slot to add a submodule to the current project.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitSubmodulesDeinit">__gitSubmodulesDeinit</a></td> +<td>Private slot to unregister submodules of the project.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitSubmodulesInit">__gitSubmodulesInit</a></td> +<td>Private slot to initialize submodules of the project.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitSubmodulesList">__gitSubmodulesList</a></td> +<td>Private slot to list the submodules defined for the current project.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitSubmodulesStatus">__gitSubmodulesStatus</a></td> +<td>Private slot to show the status of submodules of the project.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitSubmodulesSummary">__gitSubmodulesSummary</a></td> +<td>Private slot to show summary information for submodules of the project.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitSubmodulesSync">__gitSubmodulesSync</a></td> +<td>Private slot to synchronize URLs of submodules of the project.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitSubmodulesUpdate">__gitSubmodulesUpdate</a></td> +<td>Private slot to update submodules of the project.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitSubmodulesUpdateInit">__gitSubmodulesUpdateInit</a></td> +<td>Private slot to initialize and update submodules of the project.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitSubmodulesUpdateOptions">__gitSubmodulesUpdateOptions</a></td> +<td>Private slot to update submodules of the project with options.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitSubmodulesUpdateRemote">__gitSubmodulesUpdateRemote</a></td> +<td>Private slot to fetch and update submodules of the project.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitTagList">__gitTagList</a></td> +<td>Private slot used to list the tags of the project.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitUnstage">__gitUnstage</a></td> +<td>Private slot used to unstage changes made to the local project.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitVerify">__gitVerify</a></td> +<td>Private slot used to verify the connectivity and validity of objects of the database.</td> +</tr><tr> +<td><a href="#GitProjectHelper.__gitVerifyBundle">__gitVerifyBundle</a></td> +<td>Private slot used to verify a bundle file.</td> +</tr><tr> +<td><a href="#GitProjectHelper.getActions">getActions</a></td> +<td>Public method to get a list of all actions.</td> +</tr><tr> +<td><a href="#GitProjectHelper.getProject">getProject</a></td> +<td>Public method to get a reference to the project object.</td> +</tr><tr> +<td><a href="#GitProjectHelper.initActions">initActions</a></td> +<td>Public method to generate the action objects.</td> +</tr><tr> +<td><a href="#GitProjectHelper.initMenu">initMenu</a></td> +<td>Public method to generate the VCS menu.</td> +</tr><tr> +<td><a href="#GitProjectHelper.initToolbar">initToolbar</a></td> +<td>Public slot to initialize the VCS toolbar.</td> +</tr><tr> +<td><a href="#GitProjectHelper.removeToolbar">removeToolbar</a></td> +<td>Public method to remove a toolbar created by initToolbar().</td> +</tr><tr> +<td><a href="#GitProjectHelper.setObjects">setObjects</a></td> +<td>Public method to set references to the vcs and project objects.</td> +</tr><tr> +<td><a href="#GitProjectHelper.shutdown">shutdown</a></td> +<td>Public method to perform shutdown actions.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GitProjectHelper.__init__" ID="GitProjectHelper.__init__"></a> +<h4>GitProjectHelper (Constructor)</h4> +<b>GitProjectHelper</b>(<i>vcsObject, projectObject, parent=None, name=None</i>) +<p> + Constructor +</p><dl> +<dt><i>vcsObject</i></dt> +<dd> +reference to the vcs object +</dd><dt><i>projectObject</i></dt> +<dd> +reference to the project object +</dd><dt><i>parent</i></dt> +<dd> +parent widget (QWidget) +</dd><dt><i>name</i></dt> +<dd> +name of this object (string) +</dd> +</dl><a NAME="GitProjectHelper.__gitAddRemote" ID="GitProjectHelper.__gitAddRemote"></a> +<h4>GitProjectHelper.__gitAddRemote</h4> +<b>__gitAddRemote</b>(<i></i>) +<p> + Private slot to add a remote repository. +</p><a NAME="GitProjectHelper.__gitApplyPatches" ID="GitProjectHelper.__gitApplyPatches"></a> +<h4>GitProjectHelper.__gitApplyPatches</h4> +<b>__gitApplyPatches</b>(<i></i>) +<p> + Private slot to apply a list of patch files. +</p><a NAME="GitProjectHelper.__gitBisectBad" ID="GitProjectHelper.__gitBisectBad"></a> +<h4>GitProjectHelper.__gitBisectBad</h4> +<b>__gitBisectBad</b>(<i></i>) +<p> + Private slot used to execute the bisect bad command. +</p><a NAME="GitProjectHelper.__gitBisectCreateReplay" ID="GitProjectHelper.__gitBisectCreateReplay"></a> +<h4>GitProjectHelper.__gitBisectCreateReplay</h4> +<b>__gitBisectCreateReplay</b>(<i></i>) +<p> + Private slot used to create a replay file for the current bisect + session. +</p><a NAME="GitProjectHelper.__gitBisectEditReplay" ID="GitProjectHelper.__gitBisectEditReplay"></a> +<h4>GitProjectHelper.__gitBisectEditReplay</h4> +<b>__gitBisectEditReplay</b>(<i></i>) +<p> + Private slot used to edit a bisect replay file. +</p><a NAME="GitProjectHelper.__gitBisectGood" ID="GitProjectHelper.__gitBisectGood"></a> +<h4>GitProjectHelper.__gitBisectGood</h4> +<b>__gitBisectGood</b>(<i></i>) +<p> + Private slot used to execute the bisect good command. +</p><a NAME="GitProjectHelper.__gitBisectLogBrowser" ID="GitProjectHelper.__gitBisectLogBrowser"></a> +<h4>GitProjectHelper.__gitBisectLogBrowser</h4> +<b>__gitBisectLogBrowser</b>(<i></i>) +<p> + Private slot used to show the bisect log browser window. +</p><a NAME="GitProjectHelper.__gitBisectReplay" ID="GitProjectHelper.__gitBisectReplay"></a> +<h4>GitProjectHelper.__gitBisectReplay</h4> +<b>__gitBisectReplay</b>(<i></i>) +<p> + Private slot used to replay a bisect session. +</p><a NAME="GitProjectHelper.__gitBisectReset" ID="GitProjectHelper.__gitBisectReset"></a> +<h4>GitProjectHelper.__gitBisectReset</h4> +<b>__gitBisectReset</b>(<i></i>) +<p> + Private slot used to execute the bisect reset command. +</p><a NAME="GitProjectHelper.__gitBisectSkip" ID="GitProjectHelper.__gitBisectSkip"></a> +<h4>GitProjectHelper.__gitBisectSkip</h4> +<b>__gitBisectSkip</b>(<i></i>) +<p> + Private slot used to execute the bisect skip command. +</p><a NAME="GitProjectHelper.__gitBisectStart" ID="GitProjectHelper.__gitBisectStart"></a> +<h4>GitProjectHelper.__gitBisectStart</h4> +<b>__gitBisectStart</b>(<i></i>) +<p> + Private slot used to execute the bisect start command. +</p><a NAME="GitProjectHelper.__gitBisectStartExtended" ID="GitProjectHelper.__gitBisectStartExtended"></a> +<h4>GitProjectHelper.__gitBisectStartExtended</h4> +<b>__gitBisectStartExtended</b>(<i></i>) +<p> + Private slot used to execute the bisect start command with options. +</p><a NAME="GitProjectHelper.__gitBranch" ID="GitProjectHelper.__gitBranch"></a> +<h4>GitProjectHelper.__gitBranch</h4> +<b>__gitBranch</b>(<i></i>) +<p> + Private slot used to perform branch operations for the project. +</p><a NAME="GitProjectHelper.__gitBranchList" ID="GitProjectHelper.__gitBranchList"></a> +<h4>GitProjectHelper.__gitBranchList</h4> +<b>__gitBranchList</b>(<i></i>) +<p> + Private slot used to list the branches of the project. +</p><a NAME="GitProjectHelper.__gitBundle" ID="GitProjectHelper.__gitBundle"></a> +<h4>GitProjectHelper.__gitBundle</h4> +<b>__gitBundle</b>(<i></i>) +<p> + Private slot used to create a bundle file. +</p><a NAME="GitProjectHelper.__gitBundleFetch" ID="GitProjectHelper.__gitBundleFetch"></a> +<h4>GitProjectHelper.__gitBundleFetch</h4> +<b>__gitBundleFetch</b>(<i></i>) +<p> + Private slot to apply a head of a bundle file using the fetch method. +</p><a NAME="GitProjectHelper.__gitBundleListHeads" ID="GitProjectHelper.__gitBundleListHeads"></a> +<h4>GitProjectHelper.__gitBundleListHeads</h4> +<b>__gitBundleListHeads</b>(<i></i>) +<p> + Private slot used to list the heads contained in a bundle file. +</p><a NAME="GitProjectHelper.__gitBundlePull" ID="GitProjectHelper.__gitBundlePull"></a> +<h4>GitProjectHelper.__gitBundlePull</h4> +<b>__gitBundlePull</b>(<i></i>) +<p> + Private slot to apply a head of a bundle file using the pull method. +</p><a NAME="GitProjectHelper.__gitCancelMerge" ID="GitProjectHelper.__gitCancelMerge"></a> +<h4>GitProjectHelper.__gitCancelMerge</h4> +<b>__gitCancelMerge</b>(<i></i>) +<p> + Private slot used to cancel an uncommitted or failed merge. +</p><a NAME="GitProjectHelper.__gitCheckPatches" ID="GitProjectHelper.__gitCheckPatches"></a> +<h4>GitProjectHelper.__gitCheckPatches</h4> +<b>__gitCheckPatches</b>(<i></i>) +<p> + Private slot to check a list of patch files, if they would apply + cleanly. +</p><a NAME="GitProjectHelper.__gitCherryPick" ID="GitProjectHelper.__gitCherryPick"></a> +<h4>GitProjectHelper.__gitCherryPick</h4> +<b>__gitCherryPick</b>(<i></i>) +<p> + Private slot used to copy commits into the current branch. +</p><a NAME="GitProjectHelper.__gitCherryPickAbort" ID="GitProjectHelper.__gitCherryPickAbort"></a> +<h4>GitProjectHelper.__gitCherryPickAbort</h4> +<b>__gitCherryPickAbort</b>(<i></i>) +<p> + Private slot used to cancel the last copying session and return to + the previous state. +</p><a NAME="GitProjectHelper.__gitCherryPickContinue" ID="GitProjectHelper.__gitCherryPickContinue"></a> +<h4>GitProjectHelper.__gitCherryPickContinue</h4> +<b>__gitCherryPickContinue</b>(<i></i>) +<p> + Private slot used to continue the last copying session after conflicts + were resolved. +</p><a NAME="GitProjectHelper.__gitCherryPickQuit" ID="GitProjectHelper.__gitCherryPickQuit"></a> +<h4>GitProjectHelper.__gitCherryPickQuit</h4> +<b>__gitCherryPickQuit</b>(<i></i>) +<p> + Private slot used to quit the current copying operation. +</p><a NAME="GitProjectHelper.__gitCommitMerge" ID="GitProjectHelper.__gitCommitMerge"></a> +<h4>GitProjectHelper.__gitCommitMerge</h4> +<b>__gitCommitMerge</b>(<i></i>) +<p> + Private slot used to commit the ongoing merge. +</p><a NAME="GitProjectHelper.__gitConfigure" ID="GitProjectHelper.__gitConfigure"></a> +<h4>GitProjectHelper.__gitConfigure</h4> +<b>__gitConfigure</b>(<i></i>) +<p> + Private method to open the configuration dialog. +</p><a NAME="GitProjectHelper.__gitCreateArchive" ID="GitProjectHelper.__gitCreateArchive"></a> +<h4>GitProjectHelper.__gitCreateArchive</h4> +<b>__gitCreateArchive</b>(<i></i>) +<p> + Private slot used to create an archive from the local repository. +</p><a NAME="GitProjectHelper.__gitCreateIgnore" ID="GitProjectHelper.__gitCreateIgnore"></a> +<h4>GitProjectHelper.__gitCreateIgnore</h4> +<b>__gitCreateIgnore</b>(<i></i>) +<p> + Private slot used to create a .gitignore file for the project. +</p><a NAME="GitProjectHelper.__gitDeleteBranch" ID="GitProjectHelper.__gitDeleteBranch"></a> +<h4>GitProjectHelper.__gitDeleteBranch</h4> +<b>__gitDeleteBranch</b>(<i></i>) +<p> + Private slot used to delete a branch from a remote repository. +</p><a NAME="GitProjectHelper.__gitDescribeTag" ID="GitProjectHelper.__gitDescribeTag"></a> +<h4>GitProjectHelper.__gitDescribeTag</h4> +<b>__gitDescribeTag</b>(<i></i>) +<p> + Private slot to show the most recent tag. +</p><a NAME="GitProjectHelper.__gitEditRepoConfig" ID="GitProjectHelper.__gitEditRepoConfig"></a> +<h4>GitProjectHelper.__gitEditRepoConfig</h4> +<b>__gitEditRepoConfig</b>(<i></i>) +<p> + Private slot used to edit the repository configuration file. +</p><a NAME="GitProjectHelper.__gitEditUserConfig" ID="GitProjectHelper.__gitEditUserConfig"></a> +<h4>GitProjectHelper.__gitEditUserConfig</h4> +<b>__gitEditUserConfig</b>(<i></i>) +<p> + Private slot used to edit the user configuration file. +</p><a NAME="GitProjectHelper.__gitExtendedDiff" ID="GitProjectHelper.__gitExtendedDiff"></a> +<h4>GitProjectHelper.__gitExtendedDiff</h4> +<b>__gitExtendedDiff</b>(<i></i>) +<p> + Private slot used to perform a git diff with the selection of + revisions. +</p><a NAME="GitProjectHelper.__gitFetch" ID="GitProjectHelper.__gitFetch"></a> +<h4>GitProjectHelper.__gitFetch</h4> +<b>__gitFetch</b>(<i></i>) +<p> + Private slot used to fetch changes from a remote repository. +</p><a NAME="GitProjectHelper.__gitHouseKeeping" ID="GitProjectHelper.__gitHouseKeeping"></a> +<h4>GitProjectHelper.__gitHouseKeeping</h4> +<b>__gitHouseKeeping</b>(<i></i>) +<p> + Private slot used to cleanup and optimize the local repository. +</p><a NAME="GitProjectHelper.__gitMergedBranchList" ID="GitProjectHelper.__gitMergedBranchList"></a> +<h4>GitProjectHelper.__gitMergedBranchList</h4> +<b>__gitMergedBranchList</b>(<i></i>) +<p> + Private slot used to list the merged branches of the project. +</p><a NAME="GitProjectHelper.__gitNotMergedBranchList" ID="GitProjectHelper.__gitNotMergedBranchList"></a> +<h4>GitProjectHelper.__gitNotMergedBranchList</h4> +<b>__gitNotMergedBranchList</b>(<i></i>) +<p> + Private slot used to list the not merged branches of the project. +</p><a NAME="GitProjectHelper.__gitPruneRemote" ID="GitProjectHelper.__gitPruneRemote"></a> +<h4>GitProjectHelper.__gitPruneRemote</h4> +<b>__gitPruneRemote</b>(<i></i>) +<p> + Private slot to prune stale tracking branches of a remote repository. +</p><a NAME="GitProjectHelper.__gitPull" ID="GitProjectHelper.__gitPull"></a> +<h4>GitProjectHelper.__gitPull</h4> +<b>__gitPull</b>(<i></i>) +<p> + Private slot used to pull changes from a remote repository. +</p><a NAME="GitProjectHelper.__gitPush" ID="GitProjectHelper.__gitPush"></a> +<h4>GitProjectHelper.__gitPush</h4> +<b>__gitPush</b>(<i></i>) +<p> + Private slot used to push changes to a remote repository. +</p><a NAME="GitProjectHelper.__gitReflogBrowser" ID="GitProjectHelper.__gitReflogBrowser"></a> +<h4>GitProjectHelper.__gitReflogBrowser</h4> +<b>__gitReflogBrowser</b>(<i></i>) +<p> + Private slot to show the reflog of the current project. +</p><a NAME="GitProjectHelper.__gitRemoveRemote" ID="GitProjectHelper.__gitRemoveRemote"></a> +<h4>GitProjectHelper.__gitRemoveRemote</h4> +<b>__gitRemoveRemote</b>(<i></i>) +<p> + Private slot to remove a remote repository. +</p><a NAME="GitProjectHelper.__gitRenameRemote" ID="GitProjectHelper.__gitRenameRemote"></a> +<h4>GitProjectHelper.__gitRenameRemote</h4> +<b>__gitRenameRemote</b>(<i></i>) +<p> + Private slot to rename a remote repository. +</p><a NAME="GitProjectHelper.__gitRevert" ID="GitProjectHelper.__gitRevert"></a> +<h4>GitProjectHelper.__gitRevert</h4> +<b>__gitRevert</b>(<i></i>) +<p> + Private slot used to revert changes made to the local project. +</p><a NAME="GitProjectHelper.__gitShowBranch" ID="GitProjectHelper.__gitShowBranch"></a> +<h4>GitProjectHelper.__gitShowBranch</h4> +<b>__gitShowBranch</b>(<i></i>) +<p> + Private slot used to show the current branch for the project. +</p><a NAME="GitProjectHelper.__gitShowConfig" ID="GitProjectHelper.__gitShowConfig"></a> +<h4>GitProjectHelper.__gitShowConfig</h4> +<b>__gitShowConfig</b>(<i></i>) +<p> + Private slot used to show the combined configuration. +</p><a NAME="GitProjectHelper.__gitShowPatchStatistics" ID="GitProjectHelper.__gitShowPatchStatistics"></a> +<h4>GitProjectHelper.__gitShowPatchStatistics</h4> +<b>__gitShowPatchStatistics</b>(<i></i>) +<p> + Private slot to show some patch statistics. +</p><a NAME="GitProjectHelper.__gitShowRemote" ID="GitProjectHelper.__gitShowRemote"></a> +<h4>GitProjectHelper.__gitShowRemote</h4> +<b>__gitShowRemote</b>(<i></i>) +<p> + Private slot used to show information about a remote repository. +</p><a NAME="GitProjectHelper.__gitShowRemotes" ID="GitProjectHelper.__gitShowRemotes"></a> +<h4>GitProjectHelper.__gitShowRemotes</h4> +<b>__gitShowRemotes</b>(<i></i>) +<p> + Private slot used to show the available remote repositories. +</p><a NAME="GitProjectHelper.__gitStashApply" ID="GitProjectHelper.__gitStashApply"></a> +<h4>GitProjectHelper.__gitStashApply</h4> +<b>__gitStashApply</b>(<i></i>) +<p> + Private slot to restore a stash and keep it. +</p><a NAME="GitProjectHelper.__gitStashBranch" ID="GitProjectHelper.__gitStashBranch"></a> +<h4>GitProjectHelper.__gitStashBranch</h4> +<b>__gitStashBranch</b>(<i></i>) +<p> + Private slot to create a new branch and restore a stash into it. +</p><a NAME="GitProjectHelper.__gitStashBrowser" ID="GitProjectHelper.__gitStashBrowser"></a> +<h4>GitProjectHelper.__gitStashBrowser</h4> +<b>__gitStashBrowser</b>(<i></i>) +<p> + Private slot used to show the stash browser dialog. +</p><a NAME="GitProjectHelper.__gitStashClear" ID="GitProjectHelper.__gitStashClear"></a> +<h4>GitProjectHelper.__gitStashClear</h4> +<b>__gitStashClear</b>(<i></i>) +<p> + Private slot to clear all stashes. +</p><a NAME="GitProjectHelper.__gitStashDrop" ID="GitProjectHelper.__gitStashDrop"></a> +<h4>GitProjectHelper.__gitStashDrop</h4> +<b>__gitStashDrop</b>(<i></i>) +<p> + Private slot to drop a stash. +</p><a NAME="GitProjectHelper.__gitStashPop" ID="GitProjectHelper.__gitStashPop"></a> +<h4>GitProjectHelper.__gitStashPop</h4> +<b>__gitStashPop</b>(<i></i>) +<p> + Private slot to restore a stash and delete it. +</p><a NAME="GitProjectHelper.__gitStashSave" ID="GitProjectHelper.__gitStashSave"></a> +<h4>GitProjectHelper.__gitStashSave</h4> +<b>__gitStashSave</b>(<i></i>) +<p> + Private slot to stash all current changes. +</p><a NAME="GitProjectHelper.__gitStashShow" ID="GitProjectHelper.__gitStashShow"></a> +<h4>GitProjectHelper.__gitStashShow</h4> +<b>__gitStashShow</b>(<i></i>) +<p> + Private slot to show the contents of the selected stash. +</p><a NAME="GitProjectHelper.__gitStatistics" ID="GitProjectHelper.__gitStatistics"></a> +<h4>GitProjectHelper.__gitStatistics</h4> +<b>__gitStatistics</b>(<i></i>) +<p> + Private slot used to show some statistics of the local repository. +</p><a NAME="GitProjectHelper.__gitSubmoduleAdd" ID="GitProjectHelper.__gitSubmoduleAdd"></a> +<h4>GitProjectHelper.__gitSubmoduleAdd</h4> +<b>__gitSubmoduleAdd</b>(<i></i>) +<p> + Private slot to add a submodule to the current project. +</p><a NAME="GitProjectHelper.__gitSubmodulesDeinit" ID="GitProjectHelper.__gitSubmodulesDeinit"></a> +<h4>GitProjectHelper.__gitSubmodulesDeinit</h4> +<b>__gitSubmodulesDeinit</b>(<i></i>) +<p> + Private slot to unregister submodules of the project. +</p><a NAME="GitProjectHelper.__gitSubmodulesInit" ID="GitProjectHelper.__gitSubmodulesInit"></a> +<h4>GitProjectHelper.__gitSubmodulesInit</h4> +<b>__gitSubmodulesInit</b>(<i></i>) +<p> + Private slot to initialize submodules of the project. +</p><a NAME="GitProjectHelper.__gitSubmodulesList" ID="GitProjectHelper.__gitSubmodulesList"></a> +<h4>GitProjectHelper.__gitSubmodulesList</h4> +<b>__gitSubmodulesList</b>(<i></i>) +<p> + Private slot to list the submodules defined for the current project. +</p><a NAME="GitProjectHelper.__gitSubmodulesStatus" ID="GitProjectHelper.__gitSubmodulesStatus"></a> +<h4>GitProjectHelper.__gitSubmodulesStatus</h4> +<b>__gitSubmodulesStatus</b>(<i></i>) +<p> + Private slot to show the status of submodules of the project. +</p><a NAME="GitProjectHelper.__gitSubmodulesSummary" ID="GitProjectHelper.__gitSubmodulesSummary"></a> +<h4>GitProjectHelper.__gitSubmodulesSummary</h4> +<b>__gitSubmodulesSummary</b>(<i></i>) +<p> + Private slot to show summary information for submodules of the project. +</p><a NAME="GitProjectHelper.__gitSubmodulesSync" ID="GitProjectHelper.__gitSubmodulesSync"></a> +<h4>GitProjectHelper.__gitSubmodulesSync</h4> +<b>__gitSubmodulesSync</b>(<i></i>) +<p> + Private slot to synchronize URLs of submodules of the project. +</p><a NAME="GitProjectHelper.__gitSubmodulesUpdate" ID="GitProjectHelper.__gitSubmodulesUpdate"></a> +<h4>GitProjectHelper.__gitSubmodulesUpdate</h4> +<b>__gitSubmodulesUpdate</b>(<i></i>) +<p> + Private slot to update submodules of the project. +</p><a NAME="GitProjectHelper.__gitSubmodulesUpdateInit" ID="GitProjectHelper.__gitSubmodulesUpdateInit"></a> +<h4>GitProjectHelper.__gitSubmodulesUpdateInit</h4> +<b>__gitSubmodulesUpdateInit</b>(<i></i>) +<p> + Private slot to initialize and update submodules of the project. +</p><a NAME="GitProjectHelper.__gitSubmodulesUpdateOptions" ID="GitProjectHelper.__gitSubmodulesUpdateOptions"></a> +<h4>GitProjectHelper.__gitSubmodulesUpdateOptions</h4> +<b>__gitSubmodulesUpdateOptions</b>(<i></i>) +<p> + Private slot to update submodules of the project with options. +</p><a NAME="GitProjectHelper.__gitSubmodulesUpdateRemote" ID="GitProjectHelper.__gitSubmodulesUpdateRemote"></a> +<h4>GitProjectHelper.__gitSubmodulesUpdateRemote</h4> +<b>__gitSubmodulesUpdateRemote</b>(<i></i>) +<p> + Private slot to fetch and update submodules of the project. +</p><a NAME="GitProjectHelper.__gitTagList" ID="GitProjectHelper.__gitTagList"></a> +<h4>GitProjectHelper.__gitTagList</h4> +<b>__gitTagList</b>(<i></i>) +<p> + Private slot used to list the tags of the project. +</p><a NAME="GitProjectHelper.__gitUnstage" ID="GitProjectHelper.__gitUnstage"></a> +<h4>GitProjectHelper.__gitUnstage</h4> +<b>__gitUnstage</b>(<i></i>) +<p> + Private slot used to unstage changes made to the local project. +</p><a NAME="GitProjectHelper.__gitVerify" ID="GitProjectHelper.__gitVerify"></a> +<h4>GitProjectHelper.__gitVerify</h4> +<b>__gitVerify</b>(<i></i>) +<p> + Private slot used to verify the connectivity and validity of objects + of the database. +</p><a NAME="GitProjectHelper.__gitVerifyBundle" ID="GitProjectHelper.__gitVerifyBundle"></a> +<h4>GitProjectHelper.__gitVerifyBundle</h4> +<b>__gitVerifyBundle</b>(<i></i>) +<p> + Private slot used to verify a bundle file. +</p><a NAME="GitProjectHelper.getActions" ID="GitProjectHelper.getActions"></a> +<h4>GitProjectHelper.getActions</h4> +<b>getActions</b>(<i></i>) +<p> + Public method to get a list of all actions. +</p><dl> +<dt>Returns:</dt> +<dd> +list of all actions (list of E5Action) +</dd> +</dl><a NAME="GitProjectHelper.getProject" ID="GitProjectHelper.getProject"></a> +<h4>GitProjectHelper.getProject</h4> +<b>getProject</b>(<i></i>) +<p> + Public method to get a reference to the project object. +</p><dl> +<dt>Returns:</dt> +<dd> +reference to the project object (Project) +</dd> +</dl><a NAME="GitProjectHelper.initActions" ID="GitProjectHelper.initActions"></a> +<h4>GitProjectHelper.initActions</h4> +<b>initActions</b>(<i></i>) +<p> + Public method to generate the action objects. +</p><a NAME="GitProjectHelper.initMenu" ID="GitProjectHelper.initMenu"></a> +<h4>GitProjectHelper.initMenu</h4> +<b>initMenu</b>(<i>menu</i>) +<p> + Public method to generate the VCS menu. +</p><dl> +<dt><i>menu</i></dt> +<dd> +reference to the menu to be populated (QMenu) +</dd> +</dl><a NAME="GitProjectHelper.initToolbar" ID="GitProjectHelper.initToolbar"></a> +<h4>GitProjectHelper.initToolbar</h4> +<b>initToolbar</b>(<i>ui, toolbarManager</i>) +<p> + Public slot to initialize the VCS toolbar. +</p><dl> +<dt><i>ui</i></dt> +<dd> +reference to the main window (UserInterface) +</dd><dt><i>toolbarManager</i></dt> +<dd> +reference to a toolbar manager object + (E5ToolBarManager) +</dd> +</dl><a NAME="GitProjectHelper.removeToolbar" ID="GitProjectHelper.removeToolbar"></a> +<h4>GitProjectHelper.removeToolbar</h4> +<b>removeToolbar</b>(<i>ui, toolbarManager</i>) +<p> + Public method to remove a toolbar created by initToolbar(). +</p><dl> +<dt><i>ui</i></dt> +<dd> +reference to the main window (UserInterface) +</dd><dt><i>toolbarManager</i></dt> +<dd> +reference to a toolbar manager object + (E5ToolBarManager) +</dd> +</dl><a NAME="GitProjectHelper.setObjects" ID="GitProjectHelper.setObjects"></a> +<h4>GitProjectHelper.setObjects</h4> +<b>setObjects</b>(<i>vcsObject, projectObject</i>) +<p> + Public method to set references to the vcs and project objects. +</p><dl> +<dt><i>vcsObject</i></dt> +<dd> +reference to the vcs object +</dd><dt><i>projectObject</i></dt> +<dd> +reference to the project object +</dd> +</dl><a NAME="GitProjectHelper.shutdown" ID="GitProjectHelper.shutdown"></a> +<h4>GitProjectHelper.shutdown</h4> +<b>shutdown</b>(<i></i>) +<p> + Public method to perform shutdown actions. +</p> +<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.git.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,2186 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.git</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.git</h1> +<p> +Module implementing the version control systems interface to Git. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#Git">Git</a></td> +<td>Class implementing the version control systems interface to Git.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="Git" ID="Git"></a> +<h2>Git</h2> +<p> + Class implementing the version control systems interface to Git. +</p><h3>Signals</h3> +<dl> +<dt>committed()</dt> +<dd> +emitted after the commit action has completed +</dd> +</dl> +<h3>Derived from</h3> +VersionControl +<h3>Class Attributes</h3> +<table> +<tr><td>IgnoreFileName</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#Git.__init__">Git</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#Git.__gitGetFileForRevision">__gitGetFileForRevision</a></td> +<td>Private method to get a file for a specific revision from the repository.</td> +</tr><tr> +<td><a href="#Git.__gitGetStashesList">__gitGetStashesList</a></td> +<td>Private method to get a list of stash names.</td> +</tr><tr> +<td><a href="#Git.__gitSubmodulesList">__gitSubmodulesList</a></td> +<td>Private method to get the data of defined submodules.</td> +</tr><tr> +<td><a href="#Git.__selectSubmodulePath">__selectSubmodulePath</a></td> +<td>Private method to select a submodule path.</td> +</tr><tr> +<td><a href="#Git.__selectSubmodulePaths">__selectSubmodulePaths</a></td> +<td>Private method to select a list of submodule paths.</td> +</tr><tr> +<td><a href="#Git.__vcsCommit_Step2">__vcsCommit_Step2</a></td> +<td>Private slot performing the second step of the commit action.</td> +</tr><tr> +<td><a href="#Git._createStatusMonitorThread">_createStatusMonitorThread</a></td> +<td>Protected method to create an instance of the VCS status monitor thread.</td> +</tr><tr> +<td><a href="#Git.clearStatusCache">clearStatusCache</a></td> +<td>Public method to clear the status cache.</td> +</tr><tr> +<td><a href="#Git.getPlugin">getPlugin</a></td> +<td>Public method to get a reference to the plugin object.</td> +</tr><tr> +<td><a href="#Git.gitAddRemote">gitAddRemote</a></td> +<td>Public method to add a remote repository.</td> +</tr><tr> +<td><a href="#Git.gitApply">gitApply</a></td> +<td>Public method to apply a patch stored in a given file.</td> +</tr><tr> +<td><a href="#Git.gitApplyCheckPatches">gitApplyCheckPatches</a></td> +<td>Public method to apply a list of patch files or check, if they would apply cleanly.</td> +</tr><tr> +<td><a href="#Git.gitBisect">gitBisect</a></td> +<td>Public method to perform bisect commands.</td> +</tr><tr> +<td><a href="#Git.gitBisectCreateReplayFile">gitBisectCreateReplayFile</a></td> +<td>Public method used to create a bisect replay file for the project.</td> +</tr><tr> +<td><a href="#Git.gitBisectEditReplayFile">gitBisectEditReplayFile</a></td> +<td>Public method used to edit a bisect replay file.</td> +</tr><tr> +<td><a href="#Git.gitBisectLogBrowser">gitBisectLogBrowser</a></td> +<td>Public method used to browse the bisect log of the project.</td> +</tr><tr> +<td><a href="#Git.gitBisectReplay">gitBisectReplay</a></td> +<td>Public method to replay a bisect session.</td> +</tr><tr> +<td><a href="#Git.gitBlame">gitBlame</a></td> +<td>Public method to show the output of the git blame command.</td> +</tr><tr> +<td><a href="#Git.gitBranch">gitBranch</a></td> +<td>Public method used to create, delete or move a branch in the Git repository.</td> +</tr><tr> +<td><a href="#Git.gitBundle">gitBundle</a></td> +<td>Public method to create a bundle file.</td> +</tr><tr> +<td><a href="#Git.gitBundleFetch">gitBundleFetch</a></td> +<td>Public method to fetch a head of a bundle file into the local repository.</td> +</tr><tr> +<td><a href="#Git.gitBundleListHeads">gitBundleListHeads</a></td> +<td>Public method to list the heads contained in a bundle file.</td> +</tr><tr> +<td><a href="#Git.gitBundlePull">gitBundlePull</a></td> +<td>Public method to pull a head of a bundle file into the local repository and working area.</td> +</tr><tr> +<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.gitCherryPick">gitCherryPick</a></td> +<td>Public method to cherry pick commits and apply them to the current branch.</td> +</tr><tr> +<td><a href="#Git.gitCherryPickAbort">gitCherryPickAbort</a></td> +<td>Public method to cancel the last copying session and return to the previous state.</td> +</tr><tr> +<td><a href="#Git.gitCherryPickContinue">gitCherryPickContinue</a></td> +<td>Public method to continue the last copying session after conflicts were resolved.</td> +</tr><tr> +<td><a href="#Git.gitCherryPickQuit">gitCherryPickQuit</a></td> +<td>Public method to quit the current copying operation.</td> +</tr><tr> +<td><a href="#Git.gitCommitMerge">gitCommitMerge</a></td> +<td>Public method to commit a failed merge.</td> +</tr><tr> +<td><a href="#Git.gitCopy">gitCopy</a></td> +<td>Public method used to copy a file/directory.</td> +</tr><tr> +<td><a href="#Git.gitCreateArchive">gitCreateArchive</a></td> +<td>Public method to show some statistics of the local repository.</td> +</tr><tr> +<td><a href="#Git.gitCreateIgnoreFile">gitCreateIgnoreFile</a></td> +<td>Public method to create the ignore file.</td> +</tr><tr> +<td><a href="#Git.gitDeleteRemoteBranch">gitDeleteRemoteBranch</a></td> +<td>Public method to delete a branch from a remote repository.</td> +</tr><tr> +<td><a href="#Git.gitDescribe">gitDescribe</a></td> +<td>Public method to find the most recent tag reachable from each commit.</td> +</tr><tr> +<td><a href="#Git.gitEditConfig">gitEditConfig</a></td> +<td>Public method used to edit the repository configuration file.</td> +</tr><tr> +<td><a href="#Git.gitEditUserConfig">gitEditUserConfig</a></td> +<td>Public method used to edit the user configuration file.</td> +</tr><tr> +<td><a href="#Git.gitExtendedDiff">gitExtendedDiff</a></td> +<td>Public method used to view the difference of a file/directory to the Git repository.</td> +</tr><tr> +<td><a href="#Git.gitFetch">gitFetch</a></td> +<td>Public method to fetch changes from a remote repository.</td> +</tr><tr> +<td><a href="#Git.gitGetArchiveFormats">gitGetArchiveFormats</a></td> +<td>Public method to get a list of supported archive formats.</td> +</tr><tr> +<td><a href="#Git.gitGetBranchesList">gitGetBranchesList</a></td> +<td>Public method to get the list of branches.</td> +</tr><tr> +<td><a href="#Git.gitGetBundleHeads">gitGetBundleHeads</a></td> +<td>Public method to get a list of heads contained in a bundle file.</td> +</tr><tr> +<td><a href="#Git.gitGetCurrentBranch">gitGetCurrentBranch</a></td> +<td>Public method used to show the current branch of the working directory.</td> +</tr><tr> +<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.gitGetRemoteUrlsList">gitGetRemoteUrlsList</a></td> +<td>Public method to get the list of remote repos and their URLs.</td> +</tr><tr> +<td><a href="#Git.gitGetRemotesList">gitGetRemotesList</a></td> +<td>Public method to get the list of remote repos.</td> +</tr><tr> +<td><a href="#Git.gitGetTagsList">gitGetTagsList</a></td> +<td>Public method to get the list of tags.</td> +</tr><tr> +<td><a href="#Git.gitHouseKeeping">gitHouseKeeping</a></td> +<td>Public method to cleanup and optimize the local repository.</td> +</tr><tr> +<td><a href="#Git.gitListTagBranch">gitListTagBranch</a></td> +<td>Public method used to list the available tags or branches.</td> +</tr><tr> +<td><a href="#Git.gitNormalizeURL">gitNormalizeURL</a></td> +<td>Public method to normalize a url for Git.</td> +</tr><tr> +<td><a href="#Git.gitPruneRemote">gitPruneRemote</a></td> +<td>Public method to prune stale remote-tracking branches.</td> +</tr><tr> +<td><a href="#Git.gitPull">gitPull</a></td> +<td>Public method used to pull changes from a remote Git repository.</td> +</tr><tr> +<td><a href="#Git.gitPush">gitPush</a></td> +<td>Public method used to push changes to a remote Git repository.</td> +</tr><tr> +<td><a href="#Git.gitReflogBrowser">gitReflogBrowser</a></td> +<td>Public method used to browse the reflog of the project.</td> +</tr><tr> +<td><a href="#Git.gitRemoveRemote">gitRemoveRemote</a></td> +<td>Public method to remove a remote repository.</td> +</tr><tr> +<td><a href="#Git.gitRenameRemote">gitRenameRemote</a></td> +<td>Public method to rename a remote repository.</td> +</tr><tr> +<td><a href="#Git.gitRevert">gitRevert</a></td> +<td>Public method used to revert changes made to a file/directory.</td> +</tr><tr> +<td><a href="#Git.gitSbsDiff">gitSbsDiff</a></td> +<td>Public method used to view the difference of a file to the Git repository side-by-side.</td> +</tr><tr> +<td><a href="#Git.gitShortlog">gitShortlog</a></td> +<td>Public method to show a short log suitable for inclusion in release announcements.</td> +</tr><tr> +<td><a href="#Git.gitShowBranch">gitShowBranch</a></td> +<td>Public method used to show the current branch of the working directory.</td> +</tr><tr> +<td><a href="#Git.gitShowConfig">gitShowConfig</a></td> +<td>Public method to show the combined configuration.</td> +</tr><tr> +<td><a href="#Git.gitShowPatchesStatistics">gitShowPatchesStatistics</a></td> +<td>Public method to show statistics for a set of patch files.</td> +</tr><tr> +<td><a href="#Git.gitShowRemote">gitShowRemote</a></td> +<td>Public method to show information about a remote repository.</td> +</tr><tr> +<td><a href="#Git.gitShowRemotes">gitShowRemotes</a></td> +<td>Public method to show available remote repositories.</td> +</tr><tr> +<td><a href="#Git.gitStashApply">gitStashApply</a></td> +<td>Public method to apply a stash but keep it.</td> +</tr><tr> +<td><a href="#Git.gitStashBranch">gitStashBranch</a></td> +<td>Public method to create a branch from a stash.</td> +</tr><tr> +<td><a href="#Git.gitStashBrowser">gitStashBrowser</a></td> +<td>Public method used to browse the stashed changes.</td> +</tr><tr> +<td><a href="#Git.gitStashClear">gitStashClear</a></td> +<td>Public method to delete all stashes.</td> +</tr><tr> +<td><a href="#Git.gitStashDrop">gitStashDrop</a></td> +<td>Public method to delete a stash.</td> +</tr><tr> +<td><a href="#Git.gitStashPop">gitStashPop</a></td> +<td>Public method to apply a stash and delete it.</td> +</tr><tr> +<td><a href="#Git.gitStashSave">gitStashSave</a></td> +<td>Public method to save the current changes to a new stash.</td> +</tr><tr> +<td><a href="#Git.gitStashShowPatch">gitStashShowPatch</a></td> +<td>Public method to show the contents of a stash.</td> +</tr><tr> +<td><a href="#Git.gitStatistics">gitStatistics</a></td> +<td>Public method to show some statistics of the local repository.</td> +</tr><tr> +<td><a href="#Git.gitSubmoduleAdd">gitSubmoduleAdd</a></td> +<td>Public method to add a submodule to the project.</td> +</tr><tr> +<td><a href="#Git.gitSubmoduleDeinit">gitSubmoduleDeinit</a></td> +<td>Public method to unregister submodules.</td> +</tr><tr> +<td><a href="#Git.gitSubmoduleInit">gitSubmoduleInit</a></td> +<td>Public method to initialize one or all submodules.</td> +</tr><tr> +<td><a href="#Git.gitSubmoduleList">gitSubmoduleList</a></td> +<td>Public method to show a list of all submodules of the project.</td> +</tr><tr> +<td><a href="#Git.gitSubmoduleStatus">gitSubmoduleStatus</a></td> +<td>Public method to show the status of the submodules.</td> +</tr><tr> +<td><a href="#Git.gitSubmoduleSummary">gitSubmoduleSummary</a></td> +<td>Public method to show the status of the submodules.</td> +</tr><tr> +<td><a href="#Git.gitSubmoduleSync">gitSubmoduleSync</a></td> +<td>Public method to synchronize submodules.</td> +</tr><tr> +<td><a href="#Git.gitSubmoduleUpdate">gitSubmoduleUpdate</a></td> +<td>Public method to update submodules.</td> +</tr><tr> +<td><a href="#Git.gitSubmoduleUpdateWithOptions">gitSubmoduleUpdateWithOptions</a></td> +<td>Public method to update submodules offering a dialog to select the update options.</td> +</tr><tr> +<td><a href="#Git.gitUnstage">gitUnstage</a></td> +<td>Public method used to unstage a file/directory.</td> +</tr><tr> +<td><a href="#Git.gitVerify">gitVerify</a></td> +<td>Public method to verify the connectivity and validity of objects of the database.</td> +</tr><tr> +<td><a href="#Git.gitVerifyBundle">gitVerifyBundle</a></td> +<td>Public method to verify a bundle file.</td> +</tr><tr> +<td><a href="#Git.initCommand">initCommand</a></td> +<td>Public method to initialize a command arguments list.</td> +</tr><tr> +<td><a href="#Git.vcsAdd">vcsAdd</a></td> +<td>Public method used to add a file/directory to the Git repository.</td> +</tr><tr> +<td><a href="#Git.vcsAddBinary">vcsAddBinary</a></td> +<td>Public method used to add a file/directory in binary mode to the Git repository.</td> +</tr><tr> +<td><a href="#Git.vcsAddTree">vcsAddTree</a></td> +<td>Public method to add a directory tree rooted at path to the Git repository.</td> +</tr><tr> +<td><a href="#Git.vcsAllRegisteredStates">vcsAllRegisteredStates</a></td> +<td>Public method used to get the registered states of a number of files in the vcs.</td> +</tr><tr> +<td><a href="#Git.vcsCheckout">vcsCheckout</a></td> +<td>Public method used to check the project out of a Git repository (clone).</td> +</tr><tr> +<td><a href="#Git.vcsCleanup">vcsCleanup</a></td> +<td>Public method used to cleanup the working directory.</td> +</tr><tr> +<td><a href="#Git.vcsCommandLine">vcsCommandLine</a></td> +<td>Public method used to execute arbitrary Git commands.</td> +</tr><tr> +<td><a href="#Git.vcsCommit">vcsCommit</a></td> +<td>Public method used to make the change of a file/directory permanent in the Git repository.</td> +</tr><tr> +<td><a href="#Git.vcsConvertProject">vcsConvertProject</a></td> +<td>Public method to convert an uncontrolled project to a version controlled project.</td> +</tr><tr> +<td><a href="#Git.vcsDiff">vcsDiff</a></td> +<td>Public method used to view the difference of a file/directory to the Git repository.</td> +</tr><tr> +<td><a href="#Git.vcsExists">vcsExists</a></td> +<td>Public method used to test for the presence of the git executable.</td> +</tr><tr> +<td><a href="#Git.vcsExport">vcsExport</a></td> +<td>Public method used to export a directory from the Git repository.</td> +</tr><tr> +<td><a href="#Git.vcsGetProjectBrowserHelper">vcsGetProjectBrowserHelper</a></td> +<td>Public method to instantiate a helper object for the different project browsers.</td> +</tr><tr> +<td><a href="#Git.vcsGetProjectHelper">vcsGetProjectHelper</a></td> +<td>Public method to instantiate a helper object for the project.</td> +</tr><tr> +<td><a href="#Git.vcsImport">vcsImport</a></td> +<td>Public method used to import the project into the Git repository.</td> +</tr><tr> +<td><a href="#Git.vcsInit">vcsInit</a></td> +<td>Public method used to initialize the Git repository.</td> +</tr><tr> +<td><a href="#Git.vcsInitConfig">vcsInitConfig</a></td> +<td>Public method to initialize the VCS configuration.</td> +</tr><tr> +<td><a href="#Git.vcsLogBrowser">vcsLogBrowser</a></td> +<td>Public method used to browse the log of a file/directory from the Git repository.</td> +</tr><tr> +<td><a href="#Git.vcsMerge">vcsMerge</a></td> +<td>Public method used to merge a URL/revision into the local project.</td> +</tr><tr> +<td><a href="#Git.vcsMove">vcsMove</a></td> +<td>Public method used to move a file/directory.</td> +</tr><tr> +<td><a href="#Git.vcsName">vcsName</a></td> +<td>Public method returning the name of the vcs.</td> +</tr><tr> +<td><a href="#Git.vcsNewProjectOptionsDialog">vcsNewProjectOptionsDialog</a></td> +<td>Public method to get a dialog to enter repository info for getting a new project.</td> +</tr><tr> +<td><a href="#Git.vcsOptionsDialog">vcsOptionsDialog</a></td> +<td>Public method to get a dialog to enter repository info.</td> +</tr><tr> +<td><a href="#Git.vcsRegisteredState">vcsRegisteredState</a></td> +<td>Public method used to get the registered state of a file in the vcs.</td> +</tr><tr> +<td><a href="#Git.vcsRemove">vcsRemove</a></td> +<td>Public method used to remove a file/directory from the Git repository.</td> +</tr><tr> +<td><a href="#Git.vcsRepositoryInfos">vcsRepositoryInfos</a></td> +<td>Public method to retrieve information about the repository.</td> +</tr><tr> +<td><a href="#Git.vcsShutdown">vcsShutdown</a></td> +<td>Public method used to shutdown the Git interface.</td> +</tr><tr> +<td><a href="#Git.vcsStatus">vcsStatus</a></td> +<td>Public method used to view the status of files/directories in the Git repository.</td> +</tr><tr> +<td><a href="#Git.vcsSupportCommandOptions">vcsSupportCommandOptions</a></td> +<td>Public method to signal the support of user settable command options.</td> +</tr><tr> +<td><a href="#Git.vcsSwitch">vcsSwitch</a></td> +<td>Public method used to switch a working directory to a different revision.</td> +</tr><tr> +<td><a href="#Git.vcsTag">vcsTag</a></td> +<td>Public method used to set/remove a tag in the Git repository.</td> +</tr><tr> +<td><a href="#Git.vcsUpdate">vcsUpdate</a></td> +<td>Public method used to update a file/directory with the Git repository.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="Git.__init__" ID="Git.__init__"></a> +<h4>Git (Constructor)</h4> +<b>Git</b>(<i>plugin, parent=None, name=None</i>) +<p> + Constructor +</p><dl> +<dt><i>plugin</i></dt> +<dd> +reference to the plugin object +</dd><dt><i>parent</i></dt> +<dd> +parent widget (QWidget) +</dd><dt><i>name</i></dt> +<dd> +name of this object (string) +</dd> +</dl><a NAME="Git.__gitGetFileForRevision" ID="Git.__gitGetFileForRevision"></a> +<h4>Git.__gitGetFileForRevision</h4> +<b>__gitGetFileForRevision</b>(<i>name, rev=""</i>) +<p> + Private method to get a file for a specific revision from the + repository. +</p><dl> +<dt><i>name</i></dt> +<dd> +file name to get from the repository (string) +</dd><dt><i>rev=</i></dt> +<dd> +revision to retrieve (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +contents of the file (string) and an error message (string) +</dd> +</dl><a NAME="Git.__gitGetStashesList" ID="Git.__gitGetStashesList"></a> +<h4>Git.__gitGetStashesList</h4> +<b>__gitGetStashesList</b>(<i>projectDir</i>) +<p> + Private method to get a list of stash names. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +list of available stashes (list of string) +</dd> +</dl><a NAME="Git.__gitSubmodulesList" ID="Git.__gitSubmodulesList"></a> +<h4>Git.__gitSubmodulesList</h4> +<b>__gitSubmodulesList</b>(<i>repodir</i>) +<p> + Private method to get the data of defined submodules. +</p><dl> +<dt><i>repodir</i> (str)</dt> +<dd> +name of the directory containing the repo subdirectory +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +list of dictionaries with submodule name, path, URL and branch +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +list of dict +</dd> +</dl><a NAME="Git.__selectSubmodulePath" ID="Git.__selectSubmodulePath"></a> +<h4>Git.__selectSubmodulePath</h4> +<b>__selectSubmodulePath</b>(<i>repodir</i>) +<p> + Private method to select a submodule path. +</p><dl> +<dt><i>repodir</i> (str)</dt> +<dd> +name of the directory containing the repo subdirectory +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +tuple of selected submodule path and flag indicating + a cancellation +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +tuple of (str, bool) +</dd> +</dl><a NAME="Git.__selectSubmodulePaths" ID="Git.__selectSubmodulePaths"></a> +<h4>Git.__selectSubmodulePaths</h4> +<b>__selectSubmodulePaths</b>(<i>repodir</i>) +<p> + Private method to select a list of submodule paths. +</p><dl> +<dt><i>repodir</i> (str)</dt> +<dd> +name of the directory containing the repo subdirectory +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +tuple of selected submodule paths and flag indicating + a cancellation +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +tuple of (list of str, bool) +</dd> +</dl><a NAME="Git.__vcsCommit_Step2" ID="Git.__vcsCommit_Step2"></a> +<h4>Git.__vcsCommit_Step2</h4> +<b>__vcsCommit_Step2</b>(<i></i>) +<p> + Private slot performing the second step of the commit action. +</p><a NAME="Git._createStatusMonitorThread" ID="Git._createStatusMonitorThread"></a> +<h4>Git._createStatusMonitorThread</h4> +<b>_createStatusMonitorThread</b>(<i>interval, project</i>) +<p> + Protected method to create an instance of the VCS status monitor + thread. +</p><dl> +<dt><i>interval</i></dt> +<dd> +check interval for the monitor thread in seconds + (integer) +</dd><dt><i>project</i></dt> +<dd> +reference to the project object (Project) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +reference to the monitor thread (QThread) +</dd> +</dl><a NAME="Git.clearStatusCache" ID="Git.clearStatusCache"></a> +<h4>Git.clearStatusCache</h4> +<b>clearStatusCache</b>(<i></i>) +<p> + Public method to clear the status cache. +</p><a NAME="Git.getPlugin" ID="Git.getPlugin"></a> +<h4>Git.getPlugin</h4> +<b>getPlugin</b>(<i></i>) +<p> + Public method to get a reference to the plugin object. +</p><dl> +<dt>Returns:</dt> +<dd> +reference to the plugin object (VcsGitPlugin) +</dd> +</dl><a NAME="Git.gitAddRemote" ID="Git.gitAddRemote"></a> +<h4>Git.gitAddRemote</h4> +<b>gitAddRemote</b>(<i>projectDir</i>) +<p> + Public method to add a remote repository. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd> +</dl><a NAME="Git.gitApply" ID="Git.gitApply"></a> +<h4>Git.gitApply</h4> +<b>gitApply</b>(<i>repodir, patchFile, cached=False, reverse=False, noDialog=False</i>) +<p> + Public method to apply a patch stored in a given file. +</p><dl> +<dt><i>repodir</i></dt> +<dd> +directory name of the repository (string) +</dd><dt><i>patchFile</i></dt> +<dd> +name of the patch file (string) +</dd><dt><i>cached</i></dt> +<dd> +flag indicating to apply the patch to the staging area + (boolean) +</dd><dt><i>reverse</i></dt> +<dd> +flag indicating to apply the patch in reverse (boolean) +</dd><dt><i>noDialog</i></dt> +<dd> +flag indicating quiet operations (boolean) +</dd> +</dl><a NAME="Git.gitApplyCheckPatches" ID="Git.gitApplyCheckPatches"></a> +<h4>Git.gitApplyCheckPatches</h4> +<b>gitApplyCheckPatches</b>(<i>projectDir, check=False</i>) +<p> + Public method to apply a list of patch files or check, if they would + apply cleanly. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +directory name of the project (string) +</dd><dt><i>check</i></dt> +<dd> +flag indicating to perform a check operation (boolean) +</dd> +</dl><a NAME="Git.gitBisect" ID="Git.gitBisect"></a> +<h4>Git.gitBisect</h4> +<b>gitBisect</b>(<i>projectDir, subcommand</i>) +<p> + Public method to perform bisect commands. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd><dt><i>subcommand</i></dt> +<dd> +name of the subcommand (string, one of 'start', + 'start_extended', 'good', 'bad', 'skip' or 'reset') +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating, that the update contained an add + or delete (boolean) +</dd> +</dl><dl> +<dt>Raises <b>ValueError</b>:</dt> +<dd> +raised to indicate an invalid bisect subcommand +</dd> +</dl><a NAME="Git.gitBisectCreateReplayFile" ID="Git.gitBisectCreateReplayFile"></a> +<h4>Git.gitBisectCreateReplayFile</h4> +<b>gitBisectCreateReplayFile</b>(<i>projectDir</i>) +<p> + Public method used to create a bisect replay file for the project. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd> +</dl><a NAME="Git.gitBisectEditReplayFile" ID="Git.gitBisectEditReplayFile"></a> +<h4>Git.gitBisectEditReplayFile</h4> +<b>gitBisectEditReplayFile</b>(<i>projectDir</i>) +<p> + Public method used to edit a bisect replay file. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd> +</dl><a NAME="Git.gitBisectLogBrowser" ID="Git.gitBisectLogBrowser"></a> +<h4>Git.gitBisectLogBrowser</h4> +<b>gitBisectLogBrowser</b>(<i>projectDir</i>) +<p> + Public method used to browse the bisect log of the project. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd> +</dl><a NAME="Git.gitBisectReplay" ID="Git.gitBisectReplay"></a> +<h4>Git.gitBisectReplay</h4> +<b>gitBisectReplay</b>(<i>projectDir</i>) +<p> + Public method to replay a bisect session. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating, that the update contained an add + or delete (boolean) +</dd> +</dl><a NAME="Git.gitBlame" ID="Git.gitBlame"></a> +<h4>Git.gitBlame</h4> +<b>gitBlame</b>(<i>name</i>) +<p> + Public method to show the output of the git blame command. +</p><dl> +<dt><i>name</i></dt> +<dd> +file name to show the annotations for (string) +</dd> +</dl><a NAME="Git.gitBranch" ID="Git.gitBranch"></a> +<h4>Git.gitBranch</h4> +<b>gitBranch</b>(<i>name, revision=None, branchName=None, branchOp=None</i>) +<p> + Public method used to create, delete or move a branch in the Git + repository. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name to be branched (string) +</dd><dt><i>revision</i></dt> +<dd> +revision to set tag for (string) +</dd><dt><i>branchName</i></dt> +<dd> +name of the branch (string) +</dd><dt><i>branchOp</i></dt> +<dd> +desired branch operation (integer) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating a performed branch action (boolean) and + a flag indicating, that the branch operation contained an add + or delete (boolean) +</dd> +</dl><a NAME="Git.gitBundle" ID="Git.gitBundle"></a> +<h4>Git.gitBundle</h4> +<b>gitBundle</b>(<i>projectDir</i>) +<p> + Public method to create a bundle file. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd> +</dl><a NAME="Git.gitBundleFetch" ID="Git.gitBundleFetch"></a> +<h4>Git.gitBundleFetch</h4> +<b>gitBundleFetch</b>(<i>projectDir</i>) +<p> + Public method to fetch a head of a bundle file into the local + repository. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd> +</dl><a NAME="Git.gitBundleListHeads" ID="Git.gitBundleListHeads"></a> +<h4>Git.gitBundleListHeads</h4> +<b>gitBundleListHeads</b>(<i>projectDir</i>) +<p> + Public method to list the heads contained in a bundle file. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd> +</dl><a NAME="Git.gitBundlePull" ID="Git.gitBundlePull"></a> +<h4>Git.gitBundlePull</h4> +<b>gitBundlePull</b>(<i>projectDir</i>) +<p> + Public method to pull a head of a bundle file into the local + repository and working area. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating, that the update contained an add + or delete (boolean) +</dd> +</dl><a NAME="Git.gitCancelMerge" ID="Git.gitCancelMerge"></a> +<h4>Git.gitCancelMerge</h4> +<b>gitCancelMerge</b>(<i>name</i>) +<p> + Public method to cancel an uncommitted or failed merge. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating, that the cancellation contained an add + or delete (boolean) +</dd> +</dl><a NAME="Git.gitCherryPick" ID="Git.gitCherryPick"></a> +<h4>Git.gitCherryPick</h4> +<b>gitCherryPick</b>(<i>projectDir, commits=None</i>) +<p> + Public method to cherry pick commits and apply them to the current + branch. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd><dt><i>commits</i></dt> +<dd> +list of commits to be applied (list of strings) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating that the project should be reread (boolean) +</dd> +</dl><a NAME="Git.gitCherryPickAbort" ID="Git.gitCherryPickAbort"></a> +<h4>Git.gitCherryPickAbort</h4> +<b>gitCherryPickAbort</b>(<i>projectDir</i>) +<p> + Public method to cancel the last copying session and return to + the previous state. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating that the project should be reread (boolean) +</dd> +</dl><a NAME="Git.gitCherryPickContinue" ID="Git.gitCherryPickContinue"></a> +<h4>Git.gitCherryPickContinue</h4> +<b>gitCherryPickContinue</b>(<i>projectDir</i>) +<p> + Public method to continue the last copying session after conflicts + were resolved. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating that the project should be reread (boolean) +</dd> +</dl><a NAME="Git.gitCherryPickQuit" ID="Git.gitCherryPickQuit"></a> +<h4>Git.gitCherryPickQuit</h4> +<b>gitCherryPickQuit</b>(<i>projectDir</i>) +<p> + Public method to quit the current copying operation. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating that the project should be reread (boolean) +</dd> +</dl><a NAME="Git.gitCommitMerge" ID="Git.gitCommitMerge"></a> +<h4>Git.gitCommitMerge</h4> +<b>gitCommitMerge</b>(<i>name</i>) +<p> + Public method to commit a failed merge. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name (string) +</dd> +</dl><a NAME="Git.gitCopy" ID="Git.gitCopy"></a> +<h4>Git.gitCopy</h4> +<b>gitCopy</b>(<i>name, project</i>) +<p> + Public method used to copy a file/directory. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name to be copied (string) +</dd><dt><i>project</i></dt> +<dd> +reference to the project object +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating successful operation (boolean) +</dd> +</dl><a NAME="Git.gitCreateArchive" ID="Git.gitCreateArchive"></a> +<h4>Git.gitCreateArchive</h4> +<b>gitCreateArchive</b>(<i>projectDir</i>) +<p> + Public method to show some statistics of the local repository. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd> +</dl><a NAME="Git.gitCreateIgnoreFile" ID="Git.gitCreateIgnoreFile"></a> +<h4>Git.gitCreateIgnoreFile</h4> +<b>gitCreateIgnoreFile</b>(<i>name, autoAdd=False</i>) +<p> + Public method to create the ignore file. +</p><dl> +<dt><i>name</i></dt> +<dd> +directory name to create the ignore file in (string) +</dd><dt><i>autoAdd</i></dt> +<dd> +flag indicating to add it automatically (boolean) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating success +</dd> +</dl><a NAME="Git.gitDeleteRemoteBranch" ID="Git.gitDeleteRemoteBranch"></a> +<h4>Git.gitDeleteRemoteBranch</h4> +<b>gitDeleteRemoteBranch</b>(<i>name</i>) +<p> + Public method to delete a branch from a remote repository. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name (string) +</dd> +</dl><a NAME="Git.gitDescribe" ID="Git.gitDescribe"></a> +<h4>Git.gitDescribe</h4> +<b>gitDescribe</b>(<i>projectDir, commits</i>) +<p> + Public method to find the most recent tag reachable from each commit. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd><dt><i>commits</i></dt> +<dd> +list of commits to start the search from + (list of strings) +</dd> +</dl><a NAME="Git.gitEditConfig" ID="Git.gitEditConfig"></a> +<h4>Git.gitEditConfig</h4> +<b>gitEditConfig</b>(<i>projectDir</i>) +<p> + Public method used to edit the repository configuration file. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd> +</dl><a NAME="Git.gitEditUserConfig" ID="Git.gitEditUserConfig"></a> +<h4>Git.gitEditUserConfig</h4> +<b>gitEditUserConfig</b>(<i></i>) +<p> + Public method used to edit the user configuration file. +</p><a NAME="Git.gitExtendedDiff" ID="Git.gitExtendedDiff"></a> +<h4>Git.gitExtendedDiff</h4> +<b>gitExtendedDiff</b>(<i>name</i>) +<p> + Public method used to view the difference of a file/directory to the + Git repository. +</p><p> + If name is a directory and is the project directory, all project files + are saved first. If name is a file (or list of files), which is/are + being edited and has unsaved modification, they can be saved or the + operation may be aborted. +</p><p> + This method gives the chance to enter the revisions to be compared. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name to be diffed (string) +</dd> +</dl><a NAME="Git.gitFetch" ID="Git.gitFetch"></a> +<h4>Git.gitFetch</h4> +<b>gitFetch</b>(<i>name</i>) +<p> + Public method to fetch changes from a remote repository. +</p><dl> +<dt><i>name</i></dt> +<dd> +directory name (string) +</dd> +</dl><a NAME="Git.gitGetArchiveFormats" ID="Git.gitGetArchiveFormats"></a> +<h4>Git.gitGetArchiveFormats</h4> +<b>gitGetArchiveFormats</b>(<i>repodir</i>) +<p> + Public method to get a list of supported archive formats. +</p><dl> +<dt><i>repodir</i></dt> +<dd> +directory name of the repository (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +list of supported archive formats (list of strings) +</dd> +</dl><a NAME="Git.gitGetBranchesList" ID="Git.gitGetBranchesList"></a> +<h4>Git.gitGetBranchesList</h4> +<b>gitGetBranchesList</b>(<i>repodir, withMaster=False, allBranches=False, remotes=False</i>) +<p> + Public method to get the list of branches. +</p><dl> +<dt><i>repodir</i></dt> +<dd> +directory name of the repository (string) +</dd><dt><i>withMaster</i></dt> +<dd> +flag indicating to get 'master' as well (boolean) +</dd><dt><i>allBranches</i></dt> +<dd> +flag indicating to return all branches (boolean) +</dd><dt><i>remotes</i></dt> +<dd> +flag indicating to return remote branches only (boolean) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +list of branches (list of string) +</dd> +</dl><a NAME="Git.gitGetBundleHeads" ID="Git.gitGetBundleHeads"></a> +<h4>Git.gitGetBundleHeads</h4> +<b>gitGetBundleHeads</b>(<i>repodir, bundleFile</i>) +<p> + Public method to get a list of heads contained in a bundle file. +</p><dl> +<dt><i>repodir</i></dt> +<dd> +directory name of the repository (string) +</dd><dt><i>bundleFile</i></dt> +<dd> +file name of a git bundle file (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +list of heads (list of strings) +</dd> +</dl><a NAME="Git.gitGetCurrentBranch" ID="Git.gitGetCurrentBranch"></a> +<h4>Git.gitGetCurrentBranch</h4> +<b>gitGetCurrentBranch</b>(<i>repodir</i>) +<p> + Public method used to show the current branch of the working directory. +</p><dl> +<dt><i>repodir</i></dt> +<dd> +directory name of the repository (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +name of the current branch (string) +</dd> +</dl><a NAME="Git.gitGetRemoteBranchesList" ID="Git.gitGetRemoteBranchesList"></a> +<h4>Git.gitGetRemoteBranchesList</h4> +<b>gitGetRemoteBranchesList</b>(<i>repodir, remote</i>) +<p> + Public method to get the list of a remote repository branches. +</p><dl> +<dt><i>repodir</i></dt> +<dd> +directory name of the repository (string) +</dd><dt><i>remote</i></dt> +<dd> +remote repository name (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +list of remote repository branches (list of string) +</dd> +</dl><a NAME="Git.gitGetRemoteUrlsList" ID="Git.gitGetRemoteUrlsList"></a> +<h4>Git.gitGetRemoteUrlsList</h4> +<b>gitGetRemoteUrlsList</b>(<i>repodir, forFetch=True</i>) +<p> + Public method to get the list of remote repos and their URLs. +</p><dl> +<dt><i>repodir</i></dt> +<dd> +directory name of the repository (string) +</dd><dt><i>forFetch</i></dt> +<dd> +flag indicating to get Fetch info (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +list of tuples of remote repo name and repo URL (list of + tuple of two strings) +</dd> +</dl><a NAME="Git.gitGetRemotesList" ID="Git.gitGetRemotesList"></a> +<h4>Git.gitGetRemotesList</h4> +<b>gitGetRemotesList</b>(<i>repodir</i>) +<p> + Public method to get the list of remote repos. +</p><dl> +<dt><i>repodir</i></dt> +<dd> +directory name of the repository (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +list of remote repos (list of string) +</dd> +</dl><a NAME="Git.gitGetTagsList" ID="Git.gitGetTagsList"></a> +<h4>Git.gitGetTagsList</h4> +<b>gitGetTagsList</b>(<i>repodir, withType=False</i>) +<p> + Public method to get the list of tags. +</p><dl> +<dt><i>repodir</i></dt> +<dd> +directory name of the repository (string) +</dd><dt><i>withType</i></dt> +<dd> +flag indicating to get the tag type as well (boolean) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +list of tags (list of string) or list of tuples of + tag name and flag indicating a local tag (list of tuple of string + and boolean), if withType is True +</dd> +</dl><a NAME="Git.gitHouseKeeping" ID="Git.gitHouseKeeping"></a> +<h4>Git.gitHouseKeeping</h4> +<b>gitHouseKeeping</b>(<i>projectDir</i>) +<p> + Public method to cleanup and optimize the local repository. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd> +</dl><a NAME="Git.gitListTagBranch" ID="Git.gitListTagBranch"></a> +<h4>Git.gitListTagBranch</h4> +<b>gitListTagBranch</b>(<i>path, tags=True, listAll=True, merged=True</i>) +<p> + Public method used to list the available tags or branches. +</p><dl> +<dt><i>path</i></dt> +<dd> +directory name of the project (string) +</dd><dt><i>tags</i></dt> +<dd> +flag indicating listing of branches or tags + (False = branches, True = tags) +</dd><dt><i>listAll</i></dt> +<dd> +flag indicating to show all tags or branches (boolean) +</dd><dt><i>merged</i></dt> +<dd> +flag indicating to show only merged or non-merged + branches (boolean) +</dd> +</dl><a NAME="Git.gitNormalizeURL" ID="Git.gitNormalizeURL"></a> +<h4>Git.gitNormalizeURL</h4> +<b>gitNormalizeURL</b>(<i>url</i>) +<p> + Public method to normalize a url for Git. +</p><dl> +<dt><i>url</i></dt> +<dd> +url string (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +properly normalized url for git (string) +</dd> +</dl><a NAME="Git.gitPruneRemote" ID="Git.gitPruneRemote"></a> +<h4>Git.gitPruneRemote</h4> +<b>gitPruneRemote</b>(<i>projectDir, remoteName</i>) +<p> + Public method to prune stale remote-tracking branches. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd><dt><i>remoteName</i></dt> +<dd> +name of the remote repository (string) +</dd> +</dl><a NAME="Git.gitPull" ID="Git.gitPull"></a> +<h4>Git.gitPull</h4> +<b>gitPull</b>(<i>name</i>) +<p> + Public method used to pull changes from a remote Git repository. +</p><dl> +<dt><i>name</i></dt> +<dd> +directory name of the project to be pulled to (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating, that the update contained an add + or delete (boolean) +</dd> +</dl><a NAME="Git.gitPush" ID="Git.gitPush"></a> +<h4>Git.gitPush</h4> +<b>gitPush</b>(<i>name</i>) +<p> + Public method used to push changes to a remote Git repository. +</p><dl> +<dt><i>name</i></dt> +<dd> +directory name of the project to be pushed from (string) +</dd> +</dl><a NAME="Git.gitReflogBrowser" ID="Git.gitReflogBrowser"></a> +<h4>Git.gitReflogBrowser</h4> +<b>gitReflogBrowser</b>(<i>projectDir</i>) +<p> + Public method used to browse the reflog of the project. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd> +</dl><a NAME="Git.gitRemoveRemote" ID="Git.gitRemoveRemote"></a> +<h4>Git.gitRemoveRemote</h4> +<b>gitRemoveRemote</b>(<i>projectDir, remoteName</i>) +<p> + Public method to remove a remote repository. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd><dt><i>remoteName</i></dt> +<dd> +name of the remote repository (string) +</dd> +</dl><a NAME="Git.gitRenameRemote" ID="Git.gitRenameRemote"></a> +<h4>Git.gitRenameRemote</h4> +<b>gitRenameRemote</b>(<i>projectDir, remoteName</i>) +<p> + Public method to rename a remote repository. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd><dt><i>remoteName</i></dt> +<dd> +name of the remote repository (string) +</dd> +</dl><a NAME="Git.gitRevert" ID="Git.gitRevert"></a> +<h4>Git.gitRevert</h4> +<b>gitRevert</b>(<i>name</i>) +<p> + Public method used to revert changes made to a file/directory. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name to be reverted (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating, that the update contained an add + or delete (boolean) +</dd> +</dl><a NAME="Git.gitSbsDiff" ID="Git.gitSbsDiff"></a> +<h4>Git.gitSbsDiff</h4> +<b>gitSbsDiff</b>(<i>name, extended=False, revisions=None</i>) +<p> + Public method used to view the difference of a file to the Git + repository side-by-side. +</p><dl> +<dt><i>name</i></dt> +<dd> +file name to be diffed (string) +</dd><dt><i>extended=</i></dt> +<dd> +flag indicating the extended variant (boolean) +</dd><dt><i>revisions=</i></dt> +<dd> +tuple of two revisions (tuple of strings) +</dd> +</dl><dl> +<dt>Raises <b>ValueError</b>:</dt> +<dd> +raised to indicate an invalid name parameter +</dd> +</dl><a NAME="Git.gitShortlog" ID="Git.gitShortlog"></a> +<h4>Git.gitShortlog</h4> +<b>gitShortlog</b>(<i>projectDir, commit</i>) +<p> + Public method to show a short log suitable for inclusion in release + announcements. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd><dt><i>commit</i></dt> +<dd> +commit to start the log at (strings) +</dd> +</dl><a NAME="Git.gitShowBranch" ID="Git.gitShowBranch"></a> +<h4>Git.gitShowBranch</h4> +<b>gitShowBranch</b>(<i>name</i>) +<p> + Public method used to show the current branch of the working directory. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name (string) +</dd> +</dl><a NAME="Git.gitShowConfig" ID="Git.gitShowConfig"></a> +<h4>Git.gitShowConfig</h4> +<b>gitShowConfig</b>(<i>projectDir</i>) +<p> + Public method to show the combined configuration. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd> +</dl><a NAME="Git.gitShowPatchesStatistics" ID="Git.gitShowPatchesStatistics"></a> +<h4>Git.gitShowPatchesStatistics</h4> +<b>gitShowPatchesStatistics</b>(<i>projectDir</i>) +<p> + Public method to show statistics for a set of patch files. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +directory name of the project (string) +</dd> +</dl><a NAME="Git.gitShowRemote" ID="Git.gitShowRemote"></a> +<h4>Git.gitShowRemote</h4> +<b>gitShowRemote</b>(<i>projectDir, remoteName</i>) +<p> + Public method to show information about a remote repository. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd><dt><i>remoteName</i></dt> +<dd> +name of the remote repository (string) +</dd> +</dl><a NAME="Git.gitShowRemotes" ID="Git.gitShowRemotes"></a> +<h4>Git.gitShowRemotes</h4> +<b>gitShowRemotes</b>(<i>projectDir</i>) +<p> + Public method to show available remote repositories. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd> +</dl><a NAME="Git.gitStashApply" ID="Git.gitStashApply"></a> +<h4>Git.gitStashApply</h4> +<b>gitStashApply</b>(<i>projectDir, stashName=""</i>) +<p> + Public method to apply a stash but keep it. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd><dt><i>stashName</i></dt> +<dd> +name of a stash (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating, that the restore contained an add + or delete (boolean) +</dd> +</dl><a NAME="Git.gitStashBranch" ID="Git.gitStashBranch"></a> +<h4>Git.gitStashBranch</h4> +<b>gitStashBranch</b>(<i>projectDir, stashName=""</i>) +<p> + Public method to create a branch from a stash. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd><dt><i>stashName</i></dt> +<dd> +name of a stash (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating, that the restore contained an add + or delete (boolean) +</dd> +</dl><a NAME="Git.gitStashBrowser" ID="Git.gitStashBrowser"></a> +<h4>Git.gitStashBrowser</h4> +<b>gitStashBrowser</b>(<i>projectDir</i>) +<p> + Public method used to browse the stashed changes. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd> +</dl><a NAME="Git.gitStashClear" ID="Git.gitStashClear"></a> +<h4>Git.gitStashClear</h4> +<b>gitStashClear</b>(<i>projectDir</i>) +<p> + Public method to delete all stashes. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating a successful deletion (boolean) +</dd> +</dl><a NAME="Git.gitStashDrop" ID="Git.gitStashDrop"></a> +<h4>Git.gitStashDrop</h4> +<b>gitStashDrop</b>(<i>projectDir, stashName=""</i>) +<p> + Public method to delete a stash. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd><dt><i>stashName</i></dt> +<dd> +name of a stash (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating a successful deletion (boolean) +</dd> +</dl><a NAME="Git.gitStashPop" ID="Git.gitStashPop"></a> +<h4>Git.gitStashPop</h4> +<b>gitStashPop</b>(<i>projectDir, stashName=""</i>) +<p> + Public method to apply a stash and delete it. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd><dt><i>stashName</i></dt> +<dd> +name of a stash (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating, that the restore contained an add + or delete (boolean) +</dd> +</dl><a NAME="Git.gitStashSave" ID="Git.gitStashSave"></a> +<h4>Git.gitStashSave</h4> +<b>gitStashSave</b>(<i>projectDir</i>) +<p> + Public method to save the current changes to a new stash. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating, that the save contained an add + or delete (boolean) +</dd> +</dl><a NAME="Git.gitStashShowPatch" ID="Git.gitStashShowPatch"></a> +<h4>Git.gitStashShowPatch</h4> +<b>gitStashShowPatch</b>(<i>projectDir, stashName=""</i>) +<p> + Public method to show the contents of a stash. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd><dt><i>stashName</i></dt> +<dd> +name of a stash (string) +</dd> +</dl><a NAME="Git.gitStatistics" ID="Git.gitStatistics"></a> +<h4>Git.gitStatistics</h4> +<b>gitStatistics</b>(<i>projectDir</i>) +<p> + Public method to show some statistics of the local repository. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd> +</dl><a NAME="Git.gitSubmoduleAdd" ID="Git.gitSubmoduleAdd"></a> +<h4>Git.gitSubmoduleAdd</h4> +<b>gitSubmoduleAdd</b>(<i>projectDir</i>) +<p> + Public method to add a submodule to the project. +</p><dl> +<dt><i>projectDir</i> (str)</dt> +<dd> +name of the project directory +</dd> +</dl><a NAME="Git.gitSubmoduleDeinit" ID="Git.gitSubmoduleDeinit"></a> +<h4>Git.gitSubmoduleDeinit</h4> +<b>gitSubmoduleDeinit</b>(<i>projectDir</i>) +<p> + Public method to unregister submodules. +</p><dl> +<dt><i>projectDir</i> (str)</dt> +<dd> +name of the project directory +</dd> +</dl><a NAME="Git.gitSubmoduleInit" ID="Git.gitSubmoduleInit"></a> +<h4>Git.gitSubmoduleInit</h4> +<b>gitSubmoduleInit</b>(<i>projectDir</i>) +<p> + Public method to initialize one or all submodules. +</p><dl> +<dt><i>projectDir</i> (str)</dt> +<dd> +name of the project directory +</dd> +</dl><a NAME="Git.gitSubmoduleList" ID="Git.gitSubmoduleList"></a> +<h4>Git.gitSubmoduleList</h4> +<b>gitSubmoduleList</b>(<i>projectDir</i>) +<p> + Public method to show a list of all submodules of the project. +</p><dl> +<dt><i>projectDir</i> (str)</dt> +<dd> +name of the project directory +</dd> +</dl><a NAME="Git.gitSubmoduleStatus" ID="Git.gitSubmoduleStatus"></a> +<h4>Git.gitSubmoduleStatus</h4> +<b>gitSubmoduleStatus</b>(<i>projectDir</i>) +<p> + Public method to show the status of the submodules. +</p><dl> +<dt><i>projectDir</i> (str)</dt> +<dd> +name of the project directory +</dd> +</dl><a NAME="Git.gitSubmoduleSummary" ID="Git.gitSubmoduleSummary"></a> +<h4>Git.gitSubmoduleSummary</h4> +<b>gitSubmoduleSummary</b>(<i>projectDir</i>) +<p> + Public method to show the status of the submodules. +</p><dl> +<dt><i>projectDir</i> (str)</dt> +<dd> +name of the project directory +</dd> +</dl><a NAME="Git.gitSubmoduleSync" ID="Git.gitSubmoduleSync"></a> +<h4>Git.gitSubmoduleSync</h4> +<b>gitSubmoduleSync</b>(<i>projectDir</i>) +<p> + Public method to synchronize submodules. +</p><dl> +<dt><i>projectDir</i> (str)</dt> +<dd> +name of the project directory +</dd> +</dl><a NAME="Git.gitSubmoduleUpdate" ID="Git.gitSubmoduleUpdate"></a> +<h4>Git.gitSubmoduleUpdate</h4> +<b>gitSubmoduleUpdate</b>(<i>projectDir, initialize=False, remote=False</i>) +<p> + Public method to update submodules. +</p><dl> +<dt><i>projectDir</i> (str)</dt> +<dd> +name of the project directory +</dd><dt><i>initialize</i> (bool)</dt> +<dd> +flag indicating an initialize and update operation +</dd><dt><i>remote</i> (bool)</dt> +<dd> +flag indicating a fetch and update operation +</dd> +</dl><a NAME="Git.gitSubmoduleUpdateWithOptions" ID="Git.gitSubmoduleUpdateWithOptions"></a> +<h4>Git.gitSubmoduleUpdateWithOptions</h4> +<b>gitSubmoduleUpdateWithOptions</b>(<i>projectDir</i>) +<p> + Public method to update submodules offering a dialog to select the + update options. +</p><dl> +<dt><i>projectDir</i> (str)</dt> +<dd> +name of the project directory +</dd> +</dl><a NAME="Git.gitUnstage" ID="Git.gitUnstage"></a> +<h4>Git.gitUnstage</h4> +<b>gitUnstage</b>(<i>name</i>) +<p> + Public method used to unstage a file/directory. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name to be reverted (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating, that the update contained an add + or delete (boolean) +</dd> +</dl><a NAME="Git.gitVerify" ID="Git.gitVerify"></a> +<h4>Git.gitVerify</h4> +<b>gitVerify</b>(<i>projectDir</i>) +<p> + Public method to verify the connectivity and validity of objects + of the database. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd> +</dl><a NAME="Git.gitVerifyBundle" ID="Git.gitVerifyBundle"></a> +<h4>Git.gitVerifyBundle</h4> +<b>gitVerifyBundle</b>(<i>projectDir</i>) +<p> + Public method to verify a bundle file. +</p><dl> +<dt><i>projectDir</i></dt> +<dd> +name of the project directory (string) +</dd> +</dl><a NAME="Git.initCommand" ID="Git.initCommand"></a> +<h4>Git.initCommand</h4> +<b>initCommand</b>(<i>command</i>) +<p> + Public method to initialize a command arguments list. +</p><dl> +<dt><i>command</i></dt> +<dd> +command name (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +list of command options (list of string) +</dd> +</dl><a NAME="Git.vcsAdd" ID="Git.vcsAdd"></a> +<h4>Git.vcsAdd</h4> +<b>vcsAdd</b>(<i>name, isDir=False, noDialog=False</i>) +<p> + Public method used to add a file/directory to the Git repository. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name to be added (string) +</dd><dt><i>isDir</i></dt> +<dd> +flag indicating name is a directory (boolean) +</dd><dt><i>noDialog</i></dt> +<dd> +flag indicating quiet operations +</dd> +</dl><a NAME="Git.vcsAddBinary" ID="Git.vcsAddBinary"></a> +<h4>Git.vcsAddBinary</h4> +<b>vcsAddBinary</b>(<i>name, isDir=False</i>) +<p> + Public method used to add a file/directory in binary mode to the + Git repository. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name to be added (string) +</dd><dt><i>isDir</i></dt> +<dd> +flag indicating name is a directory (boolean) +</dd> +</dl><a NAME="Git.vcsAddTree" ID="Git.vcsAddTree"></a> +<h4>Git.vcsAddTree</h4> +<b>vcsAddTree</b>(<i>path</i>) +<p> + Public method to add a directory tree rooted at path to the Git + repository. +</p><dl> +<dt><i>path</i></dt> +<dd> +root directory of the tree to be added (string or list of + strings)) +</dd> +</dl><a NAME="Git.vcsAllRegisteredStates" ID="Git.vcsAllRegisteredStates"></a> +<h4>Git.vcsAllRegisteredStates</h4> +<b>vcsAllRegisteredStates</b>(<i>names, dname, shortcut=True</i>) +<p> + Public method used to get the registered states of a number of files + in the vcs. +</p><p> + <b>Note:</b> If a shortcut is to be taken, the code will only check, + if the named directory has been scanned already. If so, it is assumed, + that the states for all files have been populated by the previous run. +</p><dl> +<dt><i>names</i></dt> +<dd> +dictionary with all filenames to be checked as keys +</dd><dt><i>dname</i></dt> +<dd> +directory to check in (string) +</dd><dt><i>shortcut</i></dt> +<dd> +flag indicating a shortcut should be taken (boolean) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +the received dictionary completed with a combination of + canBeCommited and canBeAdded or None in order to signal an error +</dd> +</dl><a NAME="Git.vcsCheckout" ID="Git.vcsCheckout"></a> +<h4>Git.vcsCheckout</h4> +<b>vcsCheckout</b>(<i>vcsDataDict, projectDir, noDialog=False</i>) +<p> + Public method used to check the project out of a Git repository + (clone). +</p><dl> +<dt><i>vcsDataDict</i></dt> +<dd> +dictionary of data required for the checkout +</dd><dt><i>projectDir</i></dt> +<dd> +project directory to create (string) +</dd><dt><i>noDialog</i></dt> +<dd> +flag indicating quiet operations +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating an execution without errors (boolean) +</dd> +</dl><a NAME="Git.vcsCleanup" ID="Git.vcsCleanup"></a> +<h4>Git.vcsCleanup</h4> +<b>vcsCleanup</b>(<i>name</i>) +<p> + Public method used to cleanup the working directory. +</p><dl> +<dt><i>name</i></dt> +<dd> +directory name to be cleaned up (string) +</dd> +</dl><a NAME="Git.vcsCommandLine" ID="Git.vcsCommandLine"></a> +<h4>Git.vcsCommandLine</h4> +<b>vcsCommandLine</b>(<i>name</i>) +<p> + Public method used to execute arbitrary Git commands. +</p><dl> +<dt><i>name</i></dt> +<dd> +directory name of the working directory (string) +</dd> +</dl><a NAME="Git.vcsCommit" ID="Git.vcsCommit"></a> +<h4>Git.vcsCommit</h4> +<b>vcsCommit</b>(<i>name, message="", noDialog=False, commitAll=True, amend=False</i>) +<p> + Public method used to make the change of a file/directory permanent + in the Git repository. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name to be committed (string or list of + strings) +</dd><dt><i>message</i></dt> +<dd> +message for this operation (string) +</dd><dt><i>noDialog</i></dt> +<dd> +flag indicating quiet operations (boolean) +</dd><dt><i>commitAll</i></dt> +<dd> +flag indicating to commit all local changes (boolean) +</dd><dt><i>amend</i></dt> +<dd> +flag indicating to amend the HEAD commit (boolean) +</dd> +</dl><a NAME="Git.vcsConvertProject" ID="Git.vcsConvertProject"></a> +<h4>Git.vcsConvertProject</h4> +<b>vcsConvertProject</b>(<i>vcsDataDict, project</i>) +<p> + Public method to convert an uncontrolled project to a version + controlled project. +</p><dl> +<dt><i>vcsDataDict</i></dt> +<dd> +dictionary of data required for the conversion +</dd><dt><i>project</i></dt> +<dd> +reference to the project object +</dd> +</dl><a NAME="Git.vcsDiff" ID="Git.vcsDiff"></a> +<h4>Git.vcsDiff</h4> +<b>vcsDiff</b>(<i>name</i>) +<p> + Public method used to view the difference of a file/directory to the + Git repository. +</p><p> + If name is a directory and is the project directory, all project files + are saved first. If name is a file (or list of files), which is/are + being edited and has unsaved modification, they can be saved or the + operation may be aborted. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name to be diffed (string) +</dd> +</dl><a NAME="Git.vcsExists" ID="Git.vcsExists"></a> +<h4>Git.vcsExists</h4> +<b>vcsExists</b>(<i></i>) +<p> + Public method used to test for the presence of the git executable. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the existance (boolean) and an error message + (string) +</dd> +</dl><a NAME="Git.vcsExport" ID="Git.vcsExport"></a> +<h4>Git.vcsExport</h4> +<b>vcsExport</b>(<i>vcsDataDict, projectDir</i>) +<p> + Public method used to export a directory from the Git repository. +</p><dl> +<dt><i>vcsDataDict</i></dt> +<dd> +dictionary of data required for the checkout +</dd><dt><i>projectDir</i></dt> +<dd> +project directory to create (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating an execution without errors (boolean) +</dd> +</dl><a NAME="Git.vcsGetProjectBrowserHelper" ID="Git.vcsGetProjectBrowserHelper"></a> +<h4>Git.vcsGetProjectBrowserHelper</h4> +<b>vcsGetProjectBrowserHelper</b>(<i>browser, project, isTranslationsBrowser=False</i>) +<p> + Public method to instantiate a helper object for the different + project browsers. +</p><dl> +<dt><i>browser</i></dt> +<dd> +reference to the project browser object +</dd><dt><i>project</i></dt> +<dd> +reference to the project object +</dd><dt><i>isTranslationsBrowser</i></dt> +<dd> +flag indicating, the helper is requested + for the translations browser (this needs some special treatment) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +the project browser helper object +</dd> +</dl><a NAME="Git.vcsGetProjectHelper" ID="Git.vcsGetProjectHelper"></a> +<h4>Git.vcsGetProjectHelper</h4> +<b>vcsGetProjectHelper</b>(<i>project</i>) +<p> + Public method to instantiate a helper object for the project. +</p><dl> +<dt><i>project</i></dt> +<dd> +reference to the project object +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +the project helper object +</dd> +</dl><a NAME="Git.vcsImport" ID="Git.vcsImport"></a> +<h4>Git.vcsImport</h4> +<b>vcsImport</b>(<i>vcsDataDict, projectDir, noDialog=False</i>) +<p> + Public method used to import the project into the Git repository. +</p><dl> +<dt><i>vcsDataDict</i></dt> +<dd> +dictionary of data required for the import +</dd><dt><i>projectDir</i></dt> +<dd> +project directory (string) +</dd><dt><i>noDialog</i></dt> +<dd> +flag indicating quiet operations +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating an execution without errors (boolean) + and a flag indicating the version controll status (boolean) +</dd> +</dl><a NAME="Git.vcsInit" ID="Git.vcsInit"></a> +<h4>Git.vcsInit</h4> +<b>vcsInit</b>(<i>vcsDir, noDialog=False</i>) +<p> + Public method used to initialize the Git repository. +</p><p> + The initialization is done, when a project is converted into a + Git controlled project. Therefore we always return TRUE without + doing anything. +</p><dl> +<dt><i>vcsDir</i></dt> +<dd> +name of the VCS directory (string) +</dd><dt><i>noDialog</i></dt> +<dd> +flag indicating quiet operations (boolean) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +always TRUE +</dd> +</dl><a NAME="Git.vcsInitConfig" ID="Git.vcsInitConfig"></a> +<h4>Git.vcsInitConfig</h4> +<b>vcsInitConfig</b>(<i>project</i>) +<p> + Public method to initialize the VCS configuration. +</p><p> + This method ensures, that an ignore file exists. +</p><dl> +<dt><i>project</i></dt> +<dd> +reference to the project (Project) +</dd> +</dl><a NAME="Git.vcsLogBrowser" ID="Git.vcsLogBrowser"></a> +<h4>Git.vcsLogBrowser</h4> +<b>vcsLogBrowser</b>(<i>name, isFile=False</i>) +<p> + Public method used to browse the log of a file/directory from the + Git repository. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name to show the log of (string) +</dd><dt><i>isFile=</i></dt> +<dd> +flag indicating log for a file is to be shown + (boolean) +</dd> +</dl><a NAME="Git.vcsMerge" ID="Git.vcsMerge"></a> +<h4>Git.vcsMerge</h4> +<b>vcsMerge</b>(<i>name</i>) +<p> + Public method used to merge a URL/revision into the local project. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name to be merged (string) +</dd> +</dl><a NAME="Git.vcsMove" ID="Git.vcsMove"></a> +<h4>Git.vcsMove</h4> +<b>vcsMove</b>(<i>name, project, target=None, noDialog=False</i>) +<p> + Public method used to move a file/directory. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name to be moved (string) +</dd><dt><i>project</i></dt> +<dd> +reference to the project object +</dd><dt><i>target</i></dt> +<dd> +new name of the file/directory (string) +</dd><dt><i>noDialog</i></dt> +<dd> +flag indicating quiet operations +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating successful operation (boolean) +</dd> +</dl><a NAME="Git.vcsName" ID="Git.vcsName"></a> +<h4>Git.vcsName</h4> +<b>vcsName</b>(<i></i>) +<p> + Public method returning the name of the vcs. +</p><dl> +<dt>Returns:</dt> +<dd> +always 'Git' (string) +</dd> +</dl><a NAME="Git.vcsNewProjectOptionsDialog" ID="Git.vcsNewProjectOptionsDialog"></a> +<h4>Git.vcsNewProjectOptionsDialog</h4> +<b>vcsNewProjectOptionsDialog</b>(<i>parent=None</i>) +<p> + Public method to get a dialog to enter repository info for getting a + new project. +</p><dl> +<dt><i>parent</i></dt> +<dd> +parent widget (QWidget) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +reference to the instantiated options dialog + (GitNewProjectOptionsDialog) +</dd> +</dl><a NAME="Git.vcsOptionsDialog" ID="Git.vcsOptionsDialog"></a> +<h4>Git.vcsOptionsDialog</h4> +<b>vcsOptionsDialog</b>(<i>project, archive, editable=False, parent=None</i>) +<p> + Public method to get a dialog to enter repository info. +</p><dl> +<dt><i>project</i></dt> +<dd> +reference to the project object +</dd><dt><i>archive</i></dt> +<dd> +name of the project in the repository (string) +</dd><dt><i>editable</i></dt> +<dd> +flag indicating that the project name is editable + (boolean) +</dd><dt><i>parent</i></dt> +<dd> +parent widget (QWidget) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +reference to the instantiated options dialog (GitOptionsDialog) +</dd> +</dl><a NAME="Git.vcsRegisteredState" ID="Git.vcsRegisteredState"></a> +<h4>Git.vcsRegisteredState</h4> +<b>vcsRegisteredState</b>(<i>name</i>) +<p> + Public method used to get the registered state of a file in the vcs. +</p><dl> +<dt><i>name</i></dt> +<dd> +filename to check (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +a combination of canBeCommited and canBeAdded +</dd> +</dl><a NAME="Git.vcsRemove" ID="Git.vcsRemove"></a> +<h4>Git.vcsRemove</h4> +<b>vcsRemove</b>(<i>name, project=False, noDialog=False, stageOnly=False</i>) +<p> + Public method used to remove a file/directory from the Git + repository. +</p><p> + The default operation is to remove the local copy as well. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name to be removed (string or list of + strings)) +</dd><dt><i>project</i></dt> +<dd> +flag indicating deletion of a project tree (boolean) + (not needed) +</dd><dt><i>noDialog</i></dt> +<dd> +flag indicating quiet operations (boolean) +</dd><dt><i>stageOnly</i></dt> +<dd> +flag indicating to just remove the file from the + staging area (boolean) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating successful operation (boolean) +</dd> +</dl><a NAME="Git.vcsRepositoryInfos" ID="Git.vcsRepositoryInfos"></a> +<h4>Git.vcsRepositoryInfos</h4> +<b>vcsRepositoryInfos</b>(<i>ppath</i>) +<p> + Public method to retrieve information about the repository. +</p><dl> +<dt><i>ppath</i></dt> +<dd> +local path to get the repository infos (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +string with ready formated info for display (string) +</dd> +</dl><a NAME="Git.vcsShutdown" ID="Git.vcsShutdown"></a> +<h4>Git.vcsShutdown</h4> +<b>vcsShutdown</b>(<i></i>) +<p> + Public method used to shutdown the Git interface. +</p><a NAME="Git.vcsStatus" ID="Git.vcsStatus"></a> +<h4>Git.vcsStatus</h4> +<b>vcsStatus</b>(<i>name</i>) +<p> + Public method used to view the status of files/directories in the + Git repository. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name(s) to show the status of + (string or list of strings) +</dd> +</dl><a NAME="Git.vcsSupportCommandOptions" ID="Git.vcsSupportCommandOptions"></a> +<h4>Git.vcsSupportCommandOptions</h4> +<b>vcsSupportCommandOptions</b>(<i></i>) +<p> + Public method to signal the support of user settable command options. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the support of user settable command options + (boolean) +</dd> +</dl><a NAME="Git.vcsSwitch" ID="Git.vcsSwitch"></a> +<h4>Git.vcsSwitch</h4> +<b>vcsSwitch</b>(<i>name</i>) +<p> + Public method used to switch a working directory to a different + revision. +</p><dl> +<dt><i>name</i></dt> +<dd> +directory name to be switched (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating, that the switch contained an add + or delete (boolean) +</dd> +</dl><a NAME="Git.vcsTag" ID="Git.vcsTag"></a> +<h4>Git.vcsTag</h4> +<b>vcsTag</b>(<i>name, revision=None, tagName=None</i>) +<p> + Public method used to set/remove a tag in the Git repository. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name to determine the repo root from + (string) +</dd><dt><i>revision</i></dt> +<dd> +revision to set tag for (string) +</dd><dt><i>tagName</i></dt> +<dd> +name of the tag (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating a performed tag action (boolean) +</dd> +</dl><a NAME="Git.vcsUpdate" ID="Git.vcsUpdate"></a> +<h4>Git.vcsUpdate</h4> +<b>vcsUpdate</b>(<i>name, noDialog=False, revision=None</i>) +<p> + Public method used to update a file/directory with the Git + repository. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name to be updated (string or list of + strings) +</dd><dt><i>noDialog</i></dt> +<dd> +flag indicating quiet operations (boolean) +</dd><dt><i>revision=</i></dt> +<dd> +revision to update to (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating, that the update contained an add + or delete (boolean) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- a/Documentation/Source/index-eric6.Plugins.VcsPlugins.html Sun Dec 10 16:43:11 2017 +0100 +++ b/Documentation/Source/index-eric6.Plugins.VcsPlugins.html Sun Dec 10 17:42:11 2017 +0100 @@ -27,6 +27,9 @@ <h3>Packages</h3> <table> <tr> +<td><a href="index-eric6.Plugins.VcsPlugins.vcsGit.html">vcsGit</a></td> +<td>Package implementing the vcs interface to Git.</td> +</tr><tr> <td><a href="index-eric6.Plugins.VcsPlugins.vcsMercurial.html">vcsMercurial</a></td> <td>Package implementing the vcs interface to Mercurial.</td> </tr><tr>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsGit.ConfigurationPage.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,35 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit.ConfigurationPage</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> +<h1>eric6.Plugins.VcsPlugins.vcsGit.ConfigurationPage</h1> +<p> +Package implementing the the Git configuration page. +</p> + + +<h3>Modules</h3> +<table> +<tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.ConfigurationPage.GitPage.html">GitPage</a></td> +<td>Module implementing the Git configuration page.</td> +</tr> +</table> +</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsGit.html Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,198 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsGit</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> +<h1>eric6.Plugins.VcsPlugins.vcsGit</h1> +<p> +Package implementing the vcs interface to Git. +</p><p> +It consists of the git class, the project helper classes and some +Git specific dialogs. +</p> + +<h3>Packages</h3> +<table> +<tr> +<td><a href="index-eric6.Plugins.VcsPlugins.vcsGit.ConfigurationPage.html">ConfigurationPage</a></td> +<td>Package implementing the the Git configuration page.</td> +</tr> +</table> + +<h3>Modules</h3> +<table> +<tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.Config.html">Config</a></td> +<td>Module defining configuration variables for the Git package.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitAddRemoteDialog.html">GitAddRemoteDialog</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.GitApplyBundleDataDialog.html">GitApplyBundleDataDialog</a></td> +<td>Module implementing a dialog to enter the data for applying a bundle.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitArchiveDataDialog.html">GitArchiveDataDialog</a></td> +<td>Module implementing a dialog to enter the data for the creation of an archive.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitBisectLogBrowserDialog.html">GitBisectLogBrowserDialog</a></td> +<td>Module implementing a dialog to browse the bisect log history.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitBisectStartDialog.html">GitBisectStartDialog</a></td> +<td>Module implementing a dialog to enter the data for an extended bisect start.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitBlameDialog.html">GitBlameDialog</a></td> +<td>Module implementing a dialog to show the output of git blame.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitBranchDialog.html">GitBranchDialog</a></td> +<td>Module implementing a dialog to enter the data for a branching operation.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitBranchPushDialog.html">GitBranchPushDialog</a></td> +<td>Module implementing a dialog to select the data for pushing a branch.</td> +</tr><tr> +<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.GitCherryPickDialog.html">GitCherryPickDialog</a></td> +<td>Module implementing a dialog to enter cherry-pick data.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitCommandDialog.html">GitCommandDialog</a></td> +<td>Module implementing the Git command dialog.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitCommitDialog.html">GitCommitDialog</a></td> +<td>Module implementing a dialog to enter the commit message.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitCopyDialog.html">GitCopyDialog</a></td> +<td>Module implementing a dialog to enter the data for a copy or rename operation.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitDescribeDialog.html">GitDescribeDialog</a></td> +<td>Module implementing a dialog to show the results of the git describe action.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitDialog.html">GitDialog</a></td> +<td>Module implementing a dialog starting a process and showing its output.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitDiffDialog.html">GitDiffDialog</a></td> +<td>Module implementing a dialog to show the output of the git diff command process.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitDiffGenerator.html">GitDiffGenerator</a></td> +<td>Module implementing a class to generate the output of the git diff command process.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitDiffHighlighter.html">GitDiffHighlighter</a></td> +<td>Module implementing a syntax highlighter for diff outputs.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitDiffParser.html">GitDiffParser</a></td> +<td>Module implementing a class to store and parse diff output.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitFetchDialog.html">GitFetchDialog</a></td> +<td>Module implementing a dialog to enter data for a Fetch operation.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitListDialog.html">GitListDialog</a></td> +<td>Module implementing a dialog to select from a list.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html">GitLogBrowserDialog</a></td> +<td>Module implementing a dialog to browse the log history.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html">GitMergeDialog</a></td> +<td>Module implementing a dialog to enter the merge data.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitNewProjectOptionsDialog.html">GitNewProjectOptionsDialog</a></td> +<td>Module implementing the Git Options Dialog for a new project from the repository.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitOptionsDialog.html">GitOptionsDialog</a></td> +<td>Module implementing a dialog to enter options used to start a project in the VCS.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitPatchFilesDialog.html">GitPatchFilesDialog</a></td> +<td>Module implementing a dialog to select a list of patch files.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitPatchStatisticsDialog.html">GitPatchStatisticsDialog</a></td> +<td>Module implementing a dialog to show some patch file statistics.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitPullDialog.html">GitPullDialog</a></td> +<td>Module implementing a dialog to enter data for a Pull operation.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitPushDialog.html">GitPushDialog</a></td> +<td>Module implementing a dialog to enter data for a Push operation.</td> +</tr><tr> +<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.GitRemoteRepositoriesDialog.html">GitRemoteRepositoriesDialog</a></td> +<td>Module implementing a dialog to show available remote repositories.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionSelectionDialog.html">GitRevisionSelectionDialog</a></td> +<td>Module implementing a dialog to select a revision.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.html">GitRevisionsSelectionDialog</a></td> +<td>Module implementing a dialog to enter the revisions for the git diff command.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitStashBrowserDialog.html">GitStashBrowserDialog</a></td> +<td>Module implementing a dialog to show the stashes.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitStashDataDialog.html">GitStashDataDialog</a></td> +<td>Module implementing a dialog to enter the data for a stash operation.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html">GitStatusDialog</a></td> +<td>Module implementing a dialog to show the output of the git status command process.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitStatusMonitorThread.html">GitStatusMonitorThread</a></td> +<td>Module implementing the VCS status monitor thread class for Git.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitSubmoduleAddDialog.html">GitSubmoduleAddDialog</a></td> +<td>Module implementing a dialog to enter the data to add a submodule.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesDeinitDialog.html">GitSubmodulesDeinitDialog</a></td> +<td>Module implementing a dialog to get the data for a submodule deinit operation.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesListDialog.html">GitSubmodulesListDialog</a></td> +<td>Module implementing a dialog to list the defined submodules.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesStatusDialog.html">GitSubmodulesStatusDialog</a></td> +<td>Module implementing a dialog to show the status of the submodules of the project.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesSummaryOptionsDialog.html">GitSubmodulesSummaryOptionsDialog</a></td> +<td>Module implementing a dialog to enter submodule summary options.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesSyncDialog.html">GitSubmodulesSyncDialog</a></td> +<td>Module implementing a dialog to enter submodule synchronization options.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitSubmodulesUpdateOptionsDialog.html">GitSubmodulesUpdateOptionsDialog</a></td> +<td>Module implementing a dialog to enter options for a submodule update command.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitTagBranchListDialog.html">GitTagBranchListDialog</a></td> +<td>Module implementing a dialog to show a list of tags or branches.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitTagDialog.html">GitTagDialog</a></td> +<td>Module implementing a dialog to enter the data for a tagging operation.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitUserConfigDataDialog.html">GitUserConfigDataDialog</a></td> +<td>Module implementing a dialog to enter some user data.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.GitUtilities.html">GitUtilities</a></td> +<td>Module implementing some common utility functions for the Git package.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.html">ProjectBrowserHelper</a></td> +<td>Module implementing the VCS project browser helper for Git.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html">ProjectHelper</a></td> +<td>Module implementing the VCS project helper for Git.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsGit.git.html">git</a></td> +<td>Module implementing the version control systems interface to Git.</td> +</tr> +</table> +</body></html> \ No newline at end of file
--- a/Documentation/Source/index-eric6.Plugins.html Sun Dec 10 16:43:11 2017 +0100 +++ b/Documentation/Source/index-eric6.Plugins.html Sun Dec 10 17:42:11 2017 +0100 @@ -77,6 +77,9 @@ <td><a href="eric6.Plugins.PluginTranslator.html">PluginTranslator</a></td> <td>Module implementing the Translator plugin.</td> </tr><tr> +<td><a href="eric6.Plugins.PluginVcsGit.html">PluginVcsGit</a></td> +<td>Module implementing the Git version control plugin.</td> +</tr><tr> <td><a href="eric6.Plugins.PluginVcsMercurial.html">PluginVcsMercurial</a></td> <td>Module implementing the Mercurial version control plugin.</td> </tr><tr>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/PluginVcsGit.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,360 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the Git version control plugin. +""" + +from __future__ import unicode_literals + +import os + +from PyQt5.QtCore import QObject, QCoreApplication, QTranslator, QByteArray + +from E5Gui.E5Application import e5App + +import Preferences +from Preferences.Shortcuts import readShortcuts + +from VcsPlugins.vcsGit.GitUtilities import getConfigPath + +import Utilities +import UI.Info + +# Start-Of-Header +name = "Git Plugin" +author = "Detlev Offenbach <detlev@die-offenbachs.de>" +autoactivate = False +deactivateable = True +version = UI.Info.VersionOnly +pluginType = "version_control" +pluginTypename = "Git" +className = "VcsGitPlugin" +packageName = "__core__" +shortDescription = "Implements the Git version control interface." +longDescription = \ + """This plugin provides the Git version control interface.""" +pyqtApi = 2 +python2Compatible = True +# End-Of-Header + +error = "" + + +def exeDisplayData(): + """ + Public method to support the display of some executable info. + + @return dictionary containing the data to query the presence of + the executable + """ + exe = 'git' + if Utilities.isWindowsPlatform(): + exe += '.exe' + + data = { + "programEntry": True, + "header": QCoreApplication.translate( + "VcsGitPlugin", "Version Control - Git"), + "exe": exe, + "versionCommand": 'version', + "versionStartsWith": 'git', + "versionPosition": 2, + "version": "", + "versionCleanup": None, + } + + return data + + +def getVcsSystemIndicator(): + """ + Public function to get the indicators for this version control system. + + @return dictionary with indicator as key and a tuple with the vcs name + (string) and vcs display string (string) + """ + global pluginTypename + data = {} + exe = 'git' + if Utilities.isWindowsPlatform(): + exe += '.exe' + if Utilities.isinpath(exe): + data[".git"] = (pluginTypename, displayString()) + data["_git"] = (pluginTypename, displayString()) + return data + + +def displayString(): + """ + Public function to get the display string. + + @return display string (string) + """ + exe = 'git' + if Utilities.isWindowsPlatform(): + exe += '.exe' + if Utilities.isinpath(exe): + return QCoreApplication.translate('VcsGitPlugin', 'Git') + else: + return "" + + +gitCfgPluginObject = None + + +def createConfigurationPage(configDlg): + """ + Module function to create the configuration page. + + @param configDlg reference to the configuration dialog (QDialog) + @return reference to the configuration page + """ + global gitCfgPluginObject + from VcsPlugins.vcsGit.ConfigurationPage.GitPage import \ + GitPage + if gitCfgPluginObject is None: + gitCfgPluginObject = VcsGitPlugin(None) + page = GitPage(gitCfgPluginObject) + return page + + +def getConfigData(): + """ + Module function returning data as required by the configuration dialog. + + @return dictionary with key "zzz_gitPage" containing the relevant + data + """ + return { + "zzz_gitPage": + [QCoreApplication.translate("VcsGitPlugin", "Git"), + os.path.join("VcsPlugins", "vcsGit", "icons", + "preferences-git.png"), + createConfigurationPage, "vcsPage", None], + } + + +def prepareUninstall(): + """ + Module function to prepare for an uninstallation. + """ + if not e5App().getObject("PluginManager").isPluginLoaded( + "PluginVcsGit"): + Preferences.Prefs.settings.remove("Git") + + +def clearPrivateData(): + """ + Module function to clear the private data of the plug-in. + """ + for key in ["RepositoryUrlHistory"]: + VcsGitPlugin.setPreferences(key, []) + + +class VcsGitPlugin(QObject): + """ + Class implementing the Git version control plugin. + """ + GitDefaults = { + "StopLogOnCopy": True, # used in log browser + "ShowAuthorColumns": True, # used in log browser + "ShowCommitterColumns": True, # used in log browser + "ShowCommitIdColumn": True, # used in log browser + "ShowBranchesColumn": True, # used in log browser + "ShowTagsColumn": True, # used in log browser + "FindCopiesHarder": False, # used in log browser + "LogLimit": 20, + "LogSubjectColumnWidth": 30, + "LogBrowserGeometry": QByteArray(), + "LogBrowserSplitterStates": [QByteArray(), QByteArray(), + QByteArray()], + # mainSplitter, detailsSplitter, diffSplitter + "StatusDialogGeometry": QByteArray(), + "StatusDialogSplitterStates": [QByteArray(), QByteArray()], + # vertical splitter, horizontal splitter + "CommitMessages": 20, + "Commits": [], + "CommitIdLength": 10, + "CleanupPatterns": "*.orig *.rej *~", + "AggressiveGC": True, + "RepositoryUrlHistory": [], + } + + def __init__(self, ui): + """ + Constructor + + @param ui reference to the user interface object (UI.UserInterface) + """ + super(VcsGitPlugin, self).__init__(ui) + self.__ui = ui + + self.__translator = None + self.__loadTranslator() + + from VcsPlugins.vcsGit.ProjectHelper import GitProjectHelper + self.__projectHelperObject = GitProjectHelper(None, None) + try: + e5App().registerPluginObject( + pluginTypename, self.__projectHelperObject, pluginType) + except KeyError: + pass # ignore duplicate registration + + readShortcuts(pluginName=pluginTypename) + + def getProjectHelper(self): + """ + Public method to get a reference to the project helper object. + + @return reference to the project helper object + """ + return self.__projectHelperObject + + def initToolbar(self, ui, toolbarManager): + """ + Public slot to initialize the VCS toolbar. + + @param ui reference to the main window (UserInterface) + @param toolbarManager reference to a toolbar manager object + (E5ToolBarManager) + """ + if self.__projectHelperObject: + self.__projectHelperObject.initToolbar(ui, toolbarManager) + + def activate(self): + """ + Public method to activate this plugin. + + @return tuple of reference to instantiated viewmanager and + activation status (boolean) + """ + from VcsPlugins.vcsGit.git import Git + self.__object = Git(self, self.__ui) + + tbData = self.__ui.getToolbar("vcs") + if tbData: + tb = tbData[1] + tb.setVisible(False) + tb.setEnabled(False) + + tbData = self.__ui.getToolbar("git") + if tbData: + tb = tbData[1] + tb.setVisible(True) + tb.setEnabled(True) + + return self.__object, True + + def deactivate(self): + """ + Public method to deactivate this plugin. + """ + self.__object = None + + tbData = self.__ui.getToolbar("git") + if tbData: + tb = tbData[1] + tb.setVisible(False) + tb.setEnabled(False) + + tbData = self.__ui.getToolbar("vcs") + if tbData: + tb = tbData[1] + tb.setVisible(True) + tb.setEnabled(True) + + @classmethod + def getPreferences(cls, key): + """ + Class method to retrieve the various settings. + + @param key the key of the value to get + @return the requested setting + """ + if key in ["StopLogOnCopy", "ShowReflogInfo", "ShowAuthorColumns", + "ShowCommitterColumns", "ShowCommitIdColumn", + "ShowBranchesColumn", "ShowTagsColumn", "FindCopiesHarder", + "AggressiveGC"]: + return Preferences.toBool(Preferences.Prefs.settings.value( + "Git/" + key, cls.GitDefaults[key])) + elif key in ["LogLimit", "CommitMessages", "CommitIdLength", + "LogSubjectColumnWidth"]: + return int(Preferences.Prefs.settings.value( + "Git/" + key, cls.GitDefaults[key])) + elif key in ["Commits", "RepositoryUrlHistory"]: + return Preferences.toList(Preferences.Prefs.settings.value( + "Git/" + key)) + elif key in ["LogBrowserGeometry", "StatusDialogGeometry"]: + v = Preferences.Prefs.settings.value("Git/" + key) + if v is not None: + return v + else: + return cls.GitDefaults[key] + elif key in ["LogBrowserSplitterStates", "StatusDialogSplitterStates"]: + states = Preferences.Prefs.settings.value("Git/" + key) + if states is not None: + return states + else: + return cls.GitDefaults[key] + else: + return Preferences.Prefs.settings.value( + "Git/" + key, cls.GitDefaults[key]) + + @classmethod + def setPreferences(cls, key, value): + """ + Class method to store the various settings. + + @param key the key of the setting to be set + @param value the value to be set + """ + Preferences.Prefs.settings.setValue("Git/" + key, value) + + def getConfigPath(self): + """ + Public method to get the filename of the config file. + + @return filename of the config file (string) + """ + return getConfigPath() + + def prepareUninstall(self): + """ + Public method to prepare for an uninstallation. + """ + e5App().unregisterPluginObject(pluginTypename) + + def prepareUnload(self): + """ + Public method to prepare for an unload. + """ + if self.__projectHelperObject: + self.__projectHelperObject.removeToolbar( + self.__ui, e5App().getObject("ToolbarManager")) + e5App().unregisterPluginObject(pluginTypename) + + def __loadTranslator(self): + """ + Private method to load the translation file. + """ + if self.__ui is not None: + loc = self.__ui.getLocale() + if loc and loc != "C": + locale_dir = os.path.join( + os.path.dirname(__file__), "vcsGit", "i18n") + translation = "git_{0}".format(loc) + translator = QTranslator(None) + loaded = translator.load(translation, locale_dir) + if loaded: + self.__translator = translator + e5App().installTranslator(self.__translator) + else: + print("Warning: translation file '{0}' could not be" + " loaded.".format(translation)) + print("Using default.") + +# +# eflag: noqa = M801
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/Config.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module defining configuration variables for the Git package. +""" + +from __future__ import unicode_literals + +# Available protocols for the repository URL +ConfigGitSchemes = [ + 'file', + 'ftp', + 'ftps', + 'git', + 'http', + 'https', + 'rsync', + 'ssh', + 'ssh+scp', +]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,107 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + + +""" +Module implementing the Git configuration page. +""" + +from __future__ import unicode_literals + +import os + +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog + +from Preferences.ConfigurationPages.ConfigurationPageBase import \ + ConfigurationPageBase +from .Ui_GitPage import Ui_GitPage + + +class GitPage(ConfigurationPageBase, Ui_GitPage): + """ + Class implementing the Git configuration page. + """ + def __init__(self, plugin): + """ + Constructor + + @param plugin reference to the plugin object + """ + super(GitPage, self).__init__() + self.setupUi(self) + self.setObjectName("GitPage") + + self.__plugin = plugin + + # set initial values + # log + self.logSpinBox.setValue( + self.__plugin.getPreferences("LogLimit")) + self.logWidthSpinBox.setValue( + self.__plugin.getPreferences("LogSubjectColumnWidth")) + self.findHarderCheckBox.setChecked( + self.__plugin.getPreferences("FindCopiesHarder")) + # commit + self.commitSpinBox.setValue( + self.__plugin.getPreferences("CommitMessages")) + self.commitIdSpinBox.setValue( + self.__plugin.getPreferences("CommitIdLength")) + # cleanup + self.cleanupPatternEdit.setText( + self.__plugin.getPreferences("CleanupPatterns")) + # repository optimization + self.aggressiveCheckBox.setChecked( + self.__plugin.getPreferences("AggressiveGC")) + + def save(self): + """ + Public slot to save the Git configuration. + """ + # log + self.__plugin.setPreferences( + "LogLimit", self.logSpinBox.value()) + self.__plugin.setPreferences( + "LogSubjectColumnWidth", self.logWidthSpinBox.value()) + self.__plugin.setPreferences( + "FindCopiesHarder", self.findHarderCheckBox.isChecked()) + # commit + self.__plugin.setPreferences( + "CommitMessages", self.commitSpinBox.value()) + self.__plugin.setPreferences( + "CommitMessages", self.commitIdSpinBox.value()) + # cleanup + self.__plugin.setPreferences( + "CleanupPatterns", self.cleanupPatternEdit.text()) + # repository optimization + self.__plugin.setPreferences( + "AggressiveGC", self.aggressiveCheckBox.isChecked()) + + @pyqtSlot() + def on_configButton_clicked(self): + """ + Private slot to edit the (per user) Git configuration file. + """ + from QScintilla.MiniEditor import MiniEditor + cfgFile = self.__plugin.getConfigPath() + if not os.path.exists(cfgFile): + from ..GitUserConfigDataDialog import GitUserConfigDataDialog + dlg = GitUserConfigDataDialog() + if dlg.exec_() == QDialog.Accepted: + firstName, lastName, email = dlg.getData() + else: + firstName, lastName, email = ( + "Firstname", "Lastname", "email_address") + try: + f = open(cfgFile, "w") + f.write("[user]\n") + f.write(" name = {0} {1}\n".format(firstName, lastName)) + f.write(" email = {0}\n".format(email)) + f.close() + except (IOError, OSError): + # ignore these + pass + editor = MiniEditor(cfgFile, "Properties", self) + editor.show()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,275 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitPage</class> + <widget class="QWidget" name="GitPage"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>609</width> + <height>751</height> + </rect> + </property> + <property name="toolTip"> + <string>Select to perform an expensive copy detection</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QLabel" name="headerLabel"> + <property name="text"> + <string><b>Configure Git Interface</b></string> + </property> + </widget> + </item> + <item> + <widget class="Line" name="line15"> + <property name="frameShape"> + <enum>QFrame::HLine</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Sunken</enum> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Log</string> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>No. of log messages shown:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QSpinBox" name="logSpinBox"> + <property name="toolTip"> + <string>Enter the number of log messages to be shown</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="maximum"> + <number>999999</number> + </property> + <property name="singleStep"> + <number>5</number> + </property> + </widget> + </item> + <item row="0" column="2"> + <spacer> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>41</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_7"> + <property name="text"> + <string>No. of subject characters shown in list:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QSpinBox" name="logWidthSpinBox"> + <property name="toolTip"> + <string>Enter the number of characters of the commit subject to be shown in the list</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="specialValueText"> + <string>All</string> + </property> + <property name="singleStep"> + <number>5</number> + </property> + </widget> + </item> + <item row="2" column="0" colspan="3"> + <widget class="QCheckBox" name="findHarderCheckBox"> + <property name="toolTip"> + <string>Select to perform expensive copy detection</string> + </property> + <property name="text"> + <string>Find copies harder</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox_2"> + <property name="title"> + <string>Commit</string> + </property> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>No. of commit messages to remember:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QSpinBox" name="commitSpinBox"> + <property name="toolTip"> + <string>Enter the number of commit messages to remember</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>100</number> + </property> + </widget> + </item> + <item row="0" column="2"> + <spacer> + <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 row="1" column="0"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>Commit ID length:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QSpinBox" name="commitIdSpinBox"> + <property name="toolTip"> + <string>Enter the number of character to show for the commit ID</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>40</number> + </property> + </widget> + </item> + <item row="1" column="2"> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>269</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox_5"> + <property name="title"> + <string>Cleanup</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Pattern:</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="cleanupPatternEdit"> + <property name="toolTip"> + <string>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox_3"> + <property name="title"> + <string>Repository Optimization</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QCheckBox" name="aggressiveCheckBox"> + <property name="toolTip"> + <string>Select this to use the '--aggressive' option for garbage collection</string> + </property> + <property name="text"> + <string>Perform aggressive repository optimization</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QPushButton" name="configButton"> + <property name="toolTip"> + <string>Edit the Git configuration file</string> + </property> + <property name="text"> + <string>Edit configuration file</string> + </property> + </widget> + </item> + <item> + <spacer> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>388</width> + <height>21</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <tabstops> + <tabstop>logSpinBox</tabstop> + <tabstop>logWidthSpinBox</tabstop> + <tabstop>findHarderCheckBox</tabstop> + <tabstop>commitSpinBox</tabstop> + <tabstop>commitIdSpinBox</tabstop> + <tabstop>cleanupPatternEdit</tabstop> + <tabstop>aggressiveCheckBox</tabstop> + <tabstop>configButton</tabstop> + </tabstops> + <resources/> + <connections/> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/ConfigurationPage/__init__.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,9 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + + +""" +Package implementing the the Git configuration page. +"""
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,66 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 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 +from PyQt5.QtWidgets import QDialog, QDialogButtonBox + +from .Ui_GitAddRemoteDialog import Ui_GitAddRemoteDialog + + +class GitAddRemoteDialog(QDialog, Ui_GitAddRemoteDialog): + """ + Class implementing a dialog to enter the data of a remote repository. + """ + def __init__(self, parent=None): + """ + Constructor + + @param parent reference to the parent widget (QWidget) + """ + super(GitAddRemoteDialog, self).__init__(parent) + self.setupUi(self) + + self.__updateOK() + + def __updateOK(self): + """ + Private method to update the status of the OK button. + """ + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled( + self.nameEdit.text() != "" and + self.urlEdit.text() != "") + + @pyqtSlot(str) + def on_nameEdit_textChanged(self, txt): + """ + Private slot handling changes of the entered name. + + @param txt current text (string) + """ + self.__updateOK() + + @pyqtSlot(str) + def on_urlEdit_textChanged(self, txt): + """ + Private slot handling changes of the entered URL. + + @param txt current text (string) + """ + self.__updateOK() + + def getData(self): + """ + Public method to get the entered data. + + @return tuple with the name (string) and URL (string) of + the remote repository + """ + return self.nameEdit.text(), self.urlEdit.text()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,95 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitAddRemoteDialog</class> + <widget class="QDialog" name="GitAddRemoteDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>700</width> + <height>107</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git Add Remote</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>Enter the remote name</string> + </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>Enter the remote URL</string> + </property> + </widget> + </item> + <item row="2" 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>GitAddRemoteDialog</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>GitAddRemoteDialog</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/GitApplyBundleDataDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,43 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter the data for applying a bundle. +""" + +from __future__ import unicode_literals + +from PyQt5.QtWidgets import QDialog + +from .Ui_GitApplyBundleDataDialog import Ui_GitApplyBundleDataDialog + + +class GitApplyBundleDataDialog(QDialog, Ui_GitApplyBundleDataDialog): + """ + Class implementing a dialog to enter the data for applying a bundle. + """ + def __init__(self, bundleHeads, branches, parent=None): + """ + Constructor + + @param bundleHeads list of heads contained in a bundle + (list of strings) + @param branches list of available branch names (list of strings) + @param parent reference to the parent widget (QWidget) + """ + super(GitApplyBundleDataDialog, self).__init__(parent) + self.setupUi(self) + + self.headCombo.addItems(sorted(bundleHeads)) + self.branchCombo.addItems([""] + sorted(branches)) + + def getData(self): + """ + Public method to get the entered data. + + @return tuple with the bundle head (string) and the local branch + name (string) + """ + return self.headCombo.currentText(), self.branchCombo.currentText()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,110 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitApplyBundleDataDialog</class> + <widget class="QDialog" name="GitApplyBundleDataDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>400</width> + <height>94</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git Apply Data</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>Bundle Head:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QComboBox" name="headCombo"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Select a head to apply</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Local Branch:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QComboBox" name="branchCombo"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Enter a local branch</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="2" 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>GitApplyBundleDataDialog</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>GitApplyBundleDataDialog</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/GitArchiveDataDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,171 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter the data for the creation of an archive. +""" + +from __future__ import unicode_literals + +import os + +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox + +from E5Gui import E5FileDialog + +from .Ui_GitArchiveDataDialog import Ui_GitArchiveDataDialog + +import UI.PixmapCache +import Utilities + + +class GitArchiveDataDialog(QDialog, Ui_GitArchiveDataDialog): + """ + Class implementing a dialog to enter the data for the creation of an + archive. + """ + def __init__(self, tagsList, branchesList, formatsList, parent=None): + """ + Constructor + + @param tagsList list of tags (list of strings) + @param branchesList list of branches (list of strings) + @param formatsList list of archive formats (list of strings) + @param parent reference to the parent widget (QWidget) + """ + super(GitArchiveDataDialog, self).__init__(parent) + self.setupUi(self) + + self.fileButton.setIcon(UI.PixmapCache.getIcon("open.png")) + + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) + + self.tagCombo.addItems(sorted(tagsList)) + self.branchCombo.addItems(["master"] + sorted(branchesList)) + self.formatComboBox.addItems(sorted(formatsList)) + self.formatComboBox.setCurrentIndex( + self.formatComboBox.findText("zip")) + + msh = self.minimumSizeHint() + self.resize(max(self.width(), msh.width()), msh.height()) + + def __updateOK(self): + """ + Private slot to update the OK button. + """ + enabled = True + if self.revButton.isChecked(): + enabled = self.revEdit.text() != "" + elif self.tagButton.isChecked(): + enabled = self.tagCombo.currentText() != "" + elif self.branchButton.isChecked(): + enabled = self.branchCombo.currentText() != "" + + enabled &= bool(self.fileEdit.text()) + + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enabled) + + @pyqtSlot(str) + def on_fileEdit_textChanged(self, txt): + """ + Private slot to handle changes of the file edit. + + @param txt text of the edit (string) + """ + self.__updateOK() + + @pyqtSlot() + def on_fileButton_clicked(self): + """ + Private slot to select a file via a file selection dialog. + """ + fileName = E5FileDialog.getSaveFileName( + self, + self.tr("Select Archive File"), + Utilities.fromNativeSeparators(self.fileEdit.text()), + "") + + if fileName: + root, ext = os.path.splitext(fileName) + if not ext: + ext = "." + self.formatComboBox.currentText() + fileName = root + ext + self.fileEdit.setText(Utilities.toNativeSeparators(fileName)) + + @pyqtSlot(bool) + def on_revButton_toggled(self, checked): + """ + Private slot to handle changes of the rev select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(str) + def on_revEdit_textChanged(self, txt): + """ + Private slot to handle changes of the rev edit. + + @param txt text of the edit (string) + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_tagButton_toggled(self, checked): + """ + Private slot to handle changes of the Tag select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(str) + def on_tagCombo_editTextChanged(self, txt): + """ + Private slot to handle changes of the Tag combo. + + @param txt text of the combo (string) + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_branchButton_toggled(self, checked): + """ + Private slot to handle changes of the Branch select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(str) + def on_branchCombo_editTextChanged(self, txt): + """ + Private slot to handle changes of the Branch combo. + + @param txt text of the combo (string) + """ + self.__updateOK() + + def getData(self): + """ + Public method to retrieve the entered data. + + @return tuple of selected revision (string), archive format (string), + archive file (string) and prefix (string) + """ + if self.revButton.isChecked(): + rev = self.revEdit.text() + elif self.tagButton.isChecked(): + rev = self.tagCombo.currentText() + elif self.branchButton.isChecked(): + rev = self.branchCombo.currentText() + else: + rev = "HEAD" + + return (rev, self.formatComboBox.currentText(), + Utilities.toNativeSeparators(self.fileEdit.text()), + self.prefixEdit.text() + )
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,281 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitArchiveDataDialog</class> + <widget class="QDialog" name="GitArchiveDataDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>553</width> + <height>308</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git Archive</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Revision</string> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QRadioButton" name="revButton"> + <property name="toolTip"> + <string>Select to specify a revision by a revision expression</string> + </property> + <property name="text"> + <string>Commit:</string> + </property> + </widget> + </item> + <item row="0" column="1" colspan="2"> + <widget class="QLineEdit" name="revEdit"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter a commit id</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QRadioButton" name="tagButton"> + <property name="toolTip"> + <string>Select to specify a revision by a tag</string> + </property> + <property name="text"> + <string>Tag:</string> + </property> + </widget> + </item> + <item row="1" column="1" colspan="2"> + <widget class="QComboBox" name="tagCombo"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Enter a tag name</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QRadioButton" name="branchButton"> + <property name="toolTip"> + <string>Select to specify a revision by a branch</string> + </property> + <property name="text"> + <string>Branch:</string> + </property> + </widget> + </item> + <item row="2" column="1" colspan="2"> + <widget class="QComboBox" name="branchCombo"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Enter a branch name</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="3" column="0" colspan="3"> + <widget class="QRadioButton" name="tipButton"> + <property name="toolTip"> + <string>Select HEAD revision</string> + </property> + <property name="text"> + <string>HEAD</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Format:</string> + </property> + </widget> + </item> + <item row="0" column="1" colspan="2"> + <widget class="QComboBox" name="formatComboBox"> + <property name="toolTip"> + <string>Select the archive format</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>File Name:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLineEdit" name="fileEdit"> + <property name="toolTip"> + <string>Enter the name of the archive file</string> + </property> + </widget> + </item> + <item row="1" column="2"> + <widget class="QToolButton" name="fileButton"> + <property name="toolTip"> + <string>Select the archive file via a file selection dialog</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Prefix:</string> + </property> + </widget> + </item> + <item row="2" column="1" colspan="2"> + <widget class="QLineEdit" name="prefixEdit"> + <property name="toolTip"> + <string>Enter a prefix to be prepended to each file</string> + </property> + </widget> + </item> + </layout> + </item> + <item> + <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> + <tabstops> + <tabstop>revButton</tabstop> + <tabstop>revEdit</tabstop> + <tabstop>tagButton</tabstop> + <tabstop>tagCombo</tabstop> + <tabstop>branchButton</tabstop> + <tabstop>branchCombo</tabstop> + <tabstop>tipButton</tabstop> + <tabstop>formatComboBox</tabstop> + <tabstop>fileEdit</tabstop> + <tabstop>fileButton</tabstop> + <tabstop>prefixEdit</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>GitArchiveDataDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>228</x> + <y>287</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>GitArchiveDataDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>296</x> + <y>293</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>revButton</sender> + <signal>toggled(bool)</signal> + <receiver>revEdit</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>81</x> + <y>59</y> + </hint> + <hint type="destinationlabel"> + <x>222</x> + <y>58</y> + </hint> + </hints> + </connection> + <connection> + <sender>tagButton</sender> + <signal>toggled(bool)</signal> + <receiver>tagCombo</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>78</x> + <y>86</y> + </hint> + <hint type="destinationlabel"> + <x>224</x> + <y>86</y> + </hint> + </hints> + </connection> + <connection> + <sender>branchButton</sender> + <signal>toggled(bool)</signal> + <receiver>branchCombo</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>75</x> + <y>115</y> + </hint> + <hint type="destinationlabel"> + <x>229</x> + <y>115</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,376 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to browse the bisect log history. +""" + +from __future__ import unicode_literals +try: + str = unicode +except NameError: + pass + +import os + +from PyQt5.QtCore import pyqtSlot, Qt, QPoint, QProcess, QTimer +from PyQt5.QtGui import QCursor +from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QHeaderView, \ + QTreeWidgetItem, QApplication, QLineEdit + +from E5Gui import E5MessageBox + +from .Ui_GitBisectLogBrowserDialog import Ui_GitBisectLogBrowserDialog + +from .GitUtilities import strToQByteArray + +import Preferences + + +class GitBisectLogBrowserDialog(QWidget, Ui_GitBisectLogBrowserDialog): + """ + Class implementing a dialog to browse the bisect log history. + """ + CommitIdColumn = 0 + OperationColumn = 1 + SubjectColumn = 2 + + def __init__(self, vcs, parent=None): + """ + Constructor + + @param vcs reference to the vcs object + @param parent reference to the parent widget (QWidget) + """ + super(GitBisectLogBrowserDialog, self).__init__(parent) + self.setupUi(self) + + self.__position = QPoint() + + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) + + self.logTree.headerItem().setText(self.logTree.columnCount(), "") + + self.refreshButton = self.buttonBox.addButton( + self.tr("&Refresh"), QDialogButtonBox.ActionRole) + self.refreshButton.setToolTip( + self.tr("Press to refresh the list of commits")) + self.refreshButton.setEnabled(False) + + self.vcs = vcs + + self.repodir = "" + self.__currentCommitId = "" + + self.__initData() + self.__resetUI() + + self.process = QProcess() + self.process.finished.connect(self.__procFinished) + self.process.readyReadStandardOutput.connect(self.__readStdout) + self.process.readyReadStandardError.connect(self.__readStderr) + + def __initData(self): + """ + Private method to (re-)initialize some data. + """ + self.buf = [] # buffer for stdout + + def closeEvent(self, e): + """ + Protected slot implementing a close event handler. + + @param e close event (QCloseEvent) + """ + if self.process is not None and \ + self.process.state() != QProcess.NotRunning: + self.process.terminate() + QTimer.singleShot(2000, self.process.kill) + self.process.waitForFinished(3000) + + self.__position = self.pos() + + e.accept() + + def show(self): + """ + Public slot to show the dialog. + """ + if not self.__position.isNull(): + self.move(self.__position) + self.__resetUI() + + super(GitBisectLogBrowserDialog, self).show() + + def __resetUI(self): + """ + Private method to reset the user interface. + """ + self.logTree.clear() + + def __resizeColumnsLog(self): + """ + Private method to resize the log tree columns. + """ + self.logTree.header().resizeSections(QHeaderView.ResizeToContents) + self.logTree.header().setStretchLastSection(True) + + def __generateLogItem(self, commitId, operation, subject): + """ + Private method to generate a bisect log tree entry. + + @param commitId commit id info (string) + @param operation bisect operation (string) + @param subject subject of the bisect log entry (string) + @return reference to the generated item (QTreeWidgetItem) + """ + columnLabels = [ + commitId, + operation, + subject, + ] + itm = QTreeWidgetItem(self.logTree, columnLabels) + return itm + + def __getLogEntries(self): + """ + Private method to retrieve bisect log entries from the repository. + """ + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True) + self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) + + self.inputGroup.setEnabled(True) + self.inputGroup.show() + self.refreshButton.setEnabled(False) + + QApplication.setOverrideCursor(QCursor(Qt.WaitCursor)) + QApplication.processEvents() + + self.buf = [] + self.cancelled = False + self.errors.clear() + self.intercept = False + + args = self.vcs.initCommand("bisect") + args.append("log") + + self.process.kill() + + self.process.setWorkingDirectory(self.repodir) + + self.inputGroup.setEnabled(True) + self.inputGroup.show() + + self.process.start('git', args) + procStarted = self.process.waitForStarted(5000) + if not procStarted: + self.inputGroup.setEnabled(False) + self.inputGroup.hide() + E5MessageBox.critical( + self, + self.tr('Process Generation Error'), + self.tr( + 'The process {0} could not be started. ' + 'Ensure, that it is in the search path.' + ).format('git')) + + def start(self, projectdir): + """ + Public slot to start the git bisect log command. + + @param projectdir directory name of the project (string) + """ + self.errorGroup.hide() + QApplication.processEvents() + + self.__initData() + + # find the root of the repo + self.repodir = projectdir + while not os.path.isdir(os.path.join(self.repodir, self.vcs.adminDir)): + self.repodir = os.path.dirname(self.repodir) + if os.path.splitdrive(self.repodir)[1] == os.sep: + return + + self.activateWindow() + self.raise_() + + self.logTree.clear() + self.__getLogEntries() + + def __procFinished(self, exitCode, exitStatus): + """ + Private slot connected to the finished signal. + + @param exitCode exit code of the process (integer) + @param exitStatus exit status of the process (QProcess.ExitStatus) + """ + self.__processBuffer() + self.__finish() + + def __finish(self): + """ + Private slot called when the process finished or the user pressed + the button. + """ + if self.process is not None and \ + self.process.state() != QProcess.NotRunning: + self.process.terminate() + QTimer.singleShot(2000, self.process.kill) + self.process.waitForFinished(3000) + + QApplication.restoreOverrideCursor() + + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) + self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) + + self.inputGroup.setEnabled(False) + self.inputGroup.hide() + self.refreshButton.setEnabled(True) + + def __processBuffer(self): + """ + Private method to process the buffered output of the git log command. + """ + for line in self.buf: + line = line.rstrip() + + if line.startswith("# "): + operation, commitId, subject = line[2:].split(None, 2) + # commit is surrounded by [...], abbreviate to 20 chars + commitId = commitId[1:-1][:20] + # operation is followed by ':' + operation = operation[:-1] + self.__generateLogItem(commitId, operation, subject) + + self.__resizeColumnsLog() + self.logTree.setCurrentItem(self.logTree.topLevelItem(0)) + + # restore current item + if self.__currentCommitId: + items = self.logTree.findItems( + self.__currentCommitId, Qt.MatchExactly, self.CommitIdColumn) + if items: + self.logTree.setCurrentItem(items[0]) + self.__currentCommitId = "" + + def __readStdout(self): + """ + Private slot to handle the readyReadStandardOutput signal. + + It reads the output of the process and inserts it into a buffer. + """ + self.process.setReadChannel(QProcess.StandardOutput) + + while self.process.canReadLine(): + line = str(self.process.readLine(), + Preferences.getSystem("IOEncoding"), + 'replace') + self.buf.append(line) + + def __readStderr(self): + """ + Private slot to handle the readyReadStandardError signal. + + It reads the error output of the process and inserts it into the + error pane. + """ + if self.process is not None: + s = str(self.process.readAllStandardError(), + Preferences.getSystem("IOEncoding"), + 'replace') + self.__showError(s) + + def __showError(self, out): + """ + Private slot to show some error. + + @param out error to be shown (string) + """ + self.errorGroup.show() + self.errors.insertPlainText(out) + self.errors.ensureCursorVisible() + + def on_buttonBox_clicked(self, button): + """ + Private slot called by a button of the button box clicked. + + @param button button that was clicked (QAbstractButton) + """ + if button == self.buttonBox.button(QDialogButtonBox.Close): + self.close() + elif button == self.buttonBox.button(QDialogButtonBox.Cancel): + self.cancelled = True + self.__finish() + elif button == self.refreshButton: + self.on_refreshButton_clicked() + + @pyqtSlot() + def on_refreshButton_clicked(self): + """ + Private slot to refresh the log. + """ + # save the current item's commit ID + itm = self.logTree.currentItem() + if itm is not None: + self.__currentCommitId = itm.text(self.CommitIdColumn) + else: + self.__currentCommitId = "" + + self.start(self.repodir) + + def on_passwordCheckBox_toggled(self, isOn): + """ + Private slot to handle the password checkbox toggled. + + @param isOn flag indicating the status of the check box (boolean) + """ + if isOn: + self.input.setEchoMode(QLineEdit.Password) + else: + self.input.setEchoMode(QLineEdit.Normal) + + @pyqtSlot() + def on_sendButton_clicked(self): + """ + Private slot to send the input to the git process. + """ + inputTxt = self.input.text() + inputTxt += os.linesep + + if self.passwordCheckBox.isChecked(): + self.errors.insertPlainText(os.linesep) + self.errors.ensureCursorVisible() + else: + self.errors.insertPlainText(inputTxt) + self.errors.ensureCursorVisible() + self.errorGroup.show() + + self.process.write(strToQByteArray(inputTxt)) + + self.passwordCheckBox.setChecked(False) + self.input.clear() + + def on_input_returnPressed(self): + """ + Private slot to handle the press of the return key in the input field. + """ + self.intercept = True + self.on_sendButton_clicked() + + def keyPressEvent(self, evt): + """ + Protected slot to handle a key press event. + + @param evt the key press event (QKeyEvent) + """ + if self.intercept: + self.intercept = False + evt.accept() + return + super(GitBisectLogBrowserDialog, self).keyPressEvent(evt)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,164 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitBisectLogBrowserDialog</class> + <widget class="QWidget" name="GitBisectLogBrowserDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>800</width> + <height>600</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git Bisect Log</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QTreeWidget" name="logTree"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>7</verstretch> + </sizepolicy> + </property> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::ExtendedSelection</enum> + </property> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <property name="itemsExpandable"> + <bool>false</bool> + </property> + <property name="allColumnsShowFocus"> + <bool>true</bool> + </property> + <column> + <property name="text"> + <string>Commit</string> + </property> + </column> + <column> + <property name="text"> + <string>Operation</string> + </property> + </column> + <column> + <property name="text"> + <string>Subject</string> + </property> + </column> + </widget> + </item> + <item> + <widget class="QGroupBox" name="errorGroup"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Errors</string> + </property> + <layout class="QVBoxLayout"> + <item> + <widget class="QTextEdit" name="errors"> + <property name="whatsThis"> + <string><b>Git log errors</b><p>This shows possible error messages of the git log command.</p></string> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="acceptRichText"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="inputGroup"> + <property name="title"> + <string>Input</string> + </property> + <layout class="QGridLayout"> + <item row="1" column="1"> + <spacer> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>327</width> + <height>29</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="2"> + <widget class="QPushButton" name="sendButton"> + <property name="toolTip"> + <string>Press to send the input to the git process</string> + </property> + <property name="text"> + <string>&Send</string> + </property> + <property name="shortcut"> + <string>Alt+S</string> + </property> + </widget> + </item> + <item row="0" column="0" colspan="3"> + <widget class="QLineEdit" name="input"> + <property name="toolTip"> + <string>Enter data to be sent to the git process</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QCheckBox" name="passwordCheckBox"> + <property name="toolTip"> + <string>Select to switch the input field to password mode</string> + </property> + <property name="text"> + <string>&Password Mode</string> + </property> + <property name="shortcut"> + <string>Alt+P</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close</set> + </property> + </widget> + </item> + </layout> + </widget> + <tabstops> + <tabstop>logTree</tabstop> + <tabstop>errors</tabstop> + <tabstop>input</tabstop> + <tabstop>passwordCheckBox</tabstop> + <tabstop>sendButton</tabstop> + </tabstops> + <resources/> + <connections/> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,65 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter the data for an extended bisect start. +""" + +from __future__ import unicode_literals + +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox + +from .Ui_GitBisectStartDialog import Ui_GitBisectStartDialog + + +class GitBisectStartDialog(QDialog, Ui_GitBisectStartDialog): + """ + Class implementing a dialog to enter the data for an extended bisect start. + """ + def __init__(self, parent=None): + """ + Constructor + + @param parent reference to the parent widget (QWidget) + """ + super(GitBisectStartDialog, self).__init__(parent) + self.setupUi(self) + + self.okButton = self.buttonBox.button(QDialogButtonBox.Ok) + self.okButton.setEnabled(False) + + msh = self.minimumSizeHint() + self.resize(max(self.width(), msh.width()), msh.height()) + + def __updateOK(self): + """ + Private method used to enable/disable the OK-button. + """ + enable = self.badEdit.text() != "" + self.okButton.setEnabled(enable) + + @pyqtSlot(str) + def on_badEdit_textChanged(self, txt): + """ + Private slot to handle a change of the bad commit. + + @param txt bad commit entered (string) + """ + self.__updateOK() + + def getData(self): + """ + Public method to get the entered data. + + @return tuple containing a bad commit (string), a list of good + commits (list of strings) and a flag indicating to not + checkout the working tree (boolean) + """ + return ( + self.badEdit.text().strip(), + self.goodEdit.text().strip().split(), + self.noCheckoutCheckBox.isChecked(), + )
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,105 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitBisectStartDialog</class> + <widget class="QDialog" name="GitBisectStartDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>450</width> + <height>117</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git Bisect Start</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>Bad Commit:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLineEdit" name="badEdit"> + <property name="toolTip"> + <string>Enter a bad commit</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Good Commits:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLineEdit" name="goodEdit"> + <property name="toolTip"> + <string>Enter a list of good commits separated by space</string> + </property> + </widget> + </item> + <item row="2" column="0" colspan="2"> + <widget class="QCheckBox" name="noCheckoutCheckBox"> + <property name="toolTip"> + <string>Select to not checkout the working tree</string> + </property> + <property name="text"> + <string>Don't checkout working tree</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>GitBisectStartDialog</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>GitBisectStartDialog</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/GitBlameDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,278 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to show the output of git blame. +""" + +from __future__ import unicode_literals +try: + str = unicode +except NameError: + pass + +import os +import re + +from PyQt5.QtCore import pyqtSlot, QProcess, QTimer, Qt, QCoreApplication +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QHeaderView, \ + QLineEdit, QTreeWidgetItem + +from E5Gui import E5MessageBox + +from .Ui_GitBlameDialog import Ui_GitBlameDialog + +from .GitUtilities import strToQByteArray + +import Preferences + + +class GitBlameDialog(QDialog, Ui_GitBlameDialog): + """ + Class implementing a dialog to show the output of git blame. + """ + def __init__(self, vcs, parent=None): + """ + Constructor + + @param vcs reference to the vcs object + @param parent reference to the parent widget (QWidget) + """ + super(GitBlameDialog, self).__init__(parent) + self.setupUi(self) + self.setWindowFlags(Qt.Window) + + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) + + self.vcs = vcs + + self.__blameRe = re.compile( + r"""\^?([0-9a-fA-F]+)\s+\((.+)\s+(\d{4}-\d{2}-\d{2})\s+""" + """(\d{2}:\d{2}):\d{2}\s+[+-]\d{4}\s+(\d+)\)\s?(.*)""") + # commit - author - date - time - lineno. - text + + self.blameList.headerItem().setText( + self.blameList.columnCount(), "") + font = Preferences.getEditorOtherFonts("MonospacedFont") + self.blameList.setFont(font) + + self.process = QProcess() + self.process.finished.connect(self.__procFinished) + self.process.readyReadStandardOutput.connect(self.__readStdout) + self.process.readyReadStandardError.connect(self.__readStderr) + + self.show() + QCoreApplication.processEvents() + + def closeEvent(self, e): + """ + Protected slot implementing a close event handler. + + @param e close event (QCloseEvent) + """ + if self.process is not None and \ + self.process.state() != QProcess.NotRunning: + self.process.terminate() + QTimer.singleShot(2000, self.process.kill) + self.process.waitForFinished(3000) + + e.accept() + + def start(self, fn): + """ + Public slot to start the blame command. + + @param fn filename to show the blame for (string) + """ + self.blameList.clear() + + self.errorGroup.hide() + self.intercept = False + self.activateWindow() + + dname, fname = self.vcs.splitPath(fn) + + # find the root of the repo + repodir = dname + while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): + repodir = os.path.dirname(repodir) + if os.path.splitdrive(repodir)[1] == os.sep: + return + + args = self.vcs.initCommand("blame") + args.append('--abbrev={0}'.format( + self.vcs.getPlugin().getPreferences("CommitIdLength"))) + args.append('--date=iso') + args.append(fn) + + self.process.kill() + self.process.setWorkingDirectory(repodir) + + self.process.start('git', args) + procStarted = self.process.waitForStarted(5000) + if not procStarted: + self.inputGroup.setEnabled(False) + self.inputGroup.hide() + E5MessageBox.critical( + self, + self.tr('Process Generation Error'), + self.tr( + 'The process {0} could not be started. ' + 'Ensure, that it is in the search path.' + ).format('git')) + else: + self.inputGroup.setEnabled(True) + self.inputGroup.show() + + def __finish(self): + """ + Private slot called when the process finished or the user pressed + the button. + """ + if self.process is not None and \ + self.process.state() != QProcess.NotRunning: + self.process.terminate() + QTimer.singleShot(2000, self.process.kill) + self.process.waitForFinished(3000) + + self.inputGroup.setEnabled(False) + self.inputGroup.hide() + + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) + self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) + self.buttonBox.button(QDialogButtonBox.Close).setFocus( + Qt.OtherFocusReason) + + self.__resizeColumns() + + def on_buttonBox_clicked(self, button): + """ + Private slot called by a button of the button box clicked. + + @param button button that was clicked (QAbstractButton) + """ + if button == self.buttonBox.button(QDialogButtonBox.Close): + self.close() + elif button == self.buttonBox.button(QDialogButtonBox.Cancel): + self.__finish() + + def __procFinished(self, exitCode, exitStatus): + """ + Private slot connected to the finished signal. + + @param exitCode exit code of the process (integer) + @param exitStatus exit status of the process (QProcess.ExitStatus) + """ + self.__finish() + + def __resizeColumns(self): + """ + Private method to resize the list columns. + """ + self.blameList.header().resizeSections(QHeaderView.ResizeToContents) + + def __generateItem(self, commitId, author, date, time, lineno, text): + """ + Private method to generate a blame item in the annotation list. + + @param commitId commit identifier (string) + @param author author of the change (string) + @param date date of the change (string) + @param time time of the change (string) + @param lineno line number of the change (string) + @param text name (path) of the tag (string) + """ + itm = QTreeWidgetItem( + self.blameList, + [commitId, author, date, time, lineno, text]) + itm.setTextAlignment(0, Qt.AlignRight) + itm.setTextAlignment(4, Qt.AlignRight) + + def __readStdout(self): + """ + Private slot to handle the readyReadStdout signal. + + It reads the output of the process, formats it and inserts it into + the annotation list. + """ + self.process.setReadChannel(QProcess.StandardOutput) + + while self.process.canReadLine(): + line = str(self.process.readLine(), + Preferences.getSystem("IOEncoding"), + 'replace').strip() + match = self.__blameRe.match(line) + commitId, author, date, time, lineno, text = match.groups() + self.__generateItem(commitId, author, date, time, lineno, text) + + def __readStderr(self): + """ + Private slot to handle the readyReadStderr signal. + + It reads the error output of the process and inserts it into the + error pane. + """ + if self.process is not None: + s = str(self.process.readAllStandardError(), + Preferences.getSystem("IOEncoding"), + 'replace') + + self.errorGroup.show() + self.errors.insertPlainText(s) + self.errors.ensureCursorVisible() + + @pyqtSlot() + def on_sendButton_clicked(self): + """ + Private slot to send the input to the git process. + """ + inputTxt = self.input.text() + inputTxt += os.linesep + + if self.passwordCheckBox.isChecked(): + self.errors.insertPlainText(os.linesep) + self.errors.ensureCursorVisible() + else: + self.errors.insertPlainText(inputTxt) + self.errors.ensureCursorVisible() + + self.process.write(strToQByteArray(inputTxt)) + + self.passwordCheckBox.setChecked(False) + self.input.clear() + + @pyqtSlot() + def on_input_returnPressed(self): + """ + Private slot to handle the press of the return key in the input field. + """ + self.intercept = True + self.on_sendButton_clicked() + + @pyqtSlot(bool) + def on_passwordCheckBox_toggled(self, checked): + """ + Private slot to handle the password checkbox toggled. + + @param checked flag indicating the status of the check box (boolean) + """ + if checked: + self.input.setEchoMode(QLineEdit.Password) + else: + self.input.setEchoMode(QLineEdit.Normal) + + def keyPressEvent(self, evt): + """ + Protected slot to handle a key press event. + + @param evt the key press event (QKeyEvent) + """ + if self.intercept: + self.intercept = False + evt.accept() + return + super(GitBlameDialog, self).keyPressEvent(evt)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,175 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitBlameDialog</class> + <widget class="QDialog" name="GitBlameDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>800</width> + <height>750</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git Blame</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout"> + <item> + <widget class="QTreeWidget" name="blameList"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>6</verstretch> + </sizepolicy> + </property> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::NoSelection</enum> + </property> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <property name="itemsExpandable"> + <bool>false</bool> + </property> + <attribute name="headerStretchLastSection"> + <bool>false</bool> + </attribute> + <column> + <property name="text"> + <string>Commit</string> + </property> + </column> + <column> + <property name="text"> + <string>Author</string> + </property> + </column> + <column> + <property name="text"> + <string>Date</string> + </property> + </column> + <column> + <property name="text"> + <string>Time</string> + </property> + </column> + <column> + <property name="text"> + <string>Line</string> + </property> + </column> + </widget> + </item> + <item> + <widget class="QGroupBox" name="errorGroup"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Errors</string> + </property> + <layout class="QVBoxLayout"> + <item> + <widget class="QTextEdit" name="errors"> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="acceptRichText"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="inputGroup"> + <property name="title"> + <string>Input</string> + </property> + <layout class="QGridLayout"> + <item row="1" column="1"> + <spacer> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>327</width> + <height>29</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="2"> + <widget class="QPushButton" name="sendButton"> + <property name="toolTip"> + <string>Press to send the input to the git process</string> + </property> + <property name="text"> + <string>&Send</string> + </property> + <property name="shortcut"> + <string>Alt+S</string> + </property> + </widget> + </item> + <item row="0" column="0" colspan="3"> + <widget class="QLineEdit" name="input"> + <property name="toolTip"> + <string>Enter data to be sent to the git process</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QCheckBox" name="passwordCheckBox"> + <property name="toolTip"> + <string>Select to switch the input field to password mode</string> + </property> + <property name="text"> + <string>&Password Mode</string> + </property> + <property name="shortcut"> + <string>Alt+P</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close</set> + </property> + </widget> + </item> + </layout> + </widget> + <tabstops> + <tabstop>blameList</tabstop> + <tabstop>errors</tabstop> + <tabstop>input</tabstop> + <tabstop>passwordCheckBox</tabstop> + <tabstop>sendButton</tabstop> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections/> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitBranchDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,186 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter the data for a branching operation. +""" + +from __future__ import unicode_literals + +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox + +from .Ui_GitBranchDialog import Ui_GitBranchDialog + + +class GitBranchDialog(QDialog, Ui_GitBranchDialog): + """ + Class implementing a dialog to enter the data for a branching operation. + """ + CreateBranch = 1 + DeleteBranch = 2 + RenameBranch = 3 + CreateSwitchBranch = 4 + CreateTrackingBranch = 5 + SetTrackingBranch = 6 + UnsetTrackingBranch = 7 + + def __init__(self, branchlist, revision=None, branchName=None, + branchOp=None, parent=None): + """ + Constructor + + @param branchlist list of previously entered branches (list of strings) + @param revision revision to set tag for (string) + @param branchName name of the branch (string) + @param branchOp desired branch operation (integer) + @param parent parent widget (QWidget) + """ + super(GitBranchDialog, self).__init__(parent) + self.setupUi(self) + + self.okButton = self.buttonBox.button(QDialogButtonBox.Ok) + self.okButton.setEnabled(False) + + self.__remoteBranches = [b for b in branchlist if "/" in b] + self.__lokalBranches = [b for b in branchlist if "/" not in b] + + self.branchCombo.clear() + self.branchCombo.addItem("") + self.branchCombo.addItems(sorted(self.__lokalBranches)) + + self.remoteBranchCombo.clear() + self.remoteBranchCombo.addItems(sorted(self.__remoteBranches)) + + if revision: + self.revisionEdit.setText(revision) + + if branchName: + index = self.branchCombo.findText(branchName) + if index > -1: + self.branchCombo.setCurrentIndex(index) + # suggest the most relevant branch action + self.deleteBranchButton.setChecked(True) + else: + self.branchCombo.setEditText(branchName) + self.createBranchButton.setChecked(True) + + if branchOp: + if branchOp == GitBranchDialog.CreateBranch: + self.createBranchButton.setChecked(True) + elif branchOp == GitBranchDialog.DeleteBranch: + self.deleteBranchButton.setChecked(True) + elif branchOp == GitBranchDialog.RenameBranch: + self.moveBranchButton.setChecked(True) + elif branchOp == GitBranchDialog.CreateSwitchBranch: + self.createSwitchButton.setChecked(True) + elif branchOp == GitBranchDialog.CreateTrackingBranch: + self.createTrackingButton.setChecked(True) + elif branchOp == GitBranchDialog.SetTrackingBranch: + self.setTrackingButton.setChecked(True) + elif branchOp == GitBranchDialog.UnsetTrackingBranch: + self.unsetTrackingButton.setChecked(True) + else: + # Oops, fall back to a save default + self.createBranchButton.setChecked(True) + + msh = self.minimumSizeHint() + self.resize(max(self.width(), msh.width()), msh.height()) + + def __updateOK(self): + """ + Private method used to enable/disable the OK-button. + """ + if self.setTrackingButton.isChecked() or \ + self.unsetTrackingButton.isChecked(): + enable = True + else: + enable = self.branchCombo.currentText() != "" + if self.moveBranchButton.isChecked(): + enable &= self.newBranchNameEdit.text() != "" + + self.okButton.setEnabled(enable) + + @pyqtSlot(bool) + def on_createTrackingButton_toggled(self, checked): + """ + Private slot to handle the selection of creating a tracking branch. + + @param checked state of the selection (boolean) + """ + self.branchCombo.setEditable(not checked) + self.branchCombo.clear() + if checked: + self.branchCombo.addItems(sorted(self.__remoteBranches)) + else: + self.branchCombo.addItem("") + self.branchCombo.addItems(sorted(self.__lokalBranches)) + self.__updateOK() + + @pyqtSlot(bool) + def on_setTrackingButton_toggled(self, checked): + """ + Private slot to handle the selection of setting a tracking branch. + + @param checked state of the selection (boolean) + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_unsetTrackingButton_toggled(self, checked): + """ + Private slot to handle the selection of unsetting a tracking branch. + + @param checked state of the selection (boolean) + """ + self.__updateOK() + + @pyqtSlot(str) + def on_branchCombo_editTextChanged(self, text): + """ + Private slot to handle a change of the branch. + + @param text branch name entered in the combo (string) + """ + self.__updateOK() + + @pyqtSlot(str) + def on_newBranchNameEdit_textChanged(self, text): + """ + Private slot to handle a change of the new branch. + + @param text new branch name entered (string) + """ + self.__updateOK() + + def getParameters(self): + """ + Public method to retrieve the branch data. + + @return tuple of an int, four strings and a boolean + (branch operation, branch name, revision, new branch name, + remote branch name, enforce operation) + """ + branch = self.branchCombo.currentText().replace(" ", "_") + + if self.createBranchButton.isChecked(): + branchOp = GitBranchDialog.CreateBranch + elif self.deleteBranchButton.isChecked(): + branchOp = GitBranchDialog.DeleteBranch + elif self.moveBranchButton.isChecked(): + branchOp = GitBranchDialog.RenameBranch + elif self.createSwitchButton.isChecked(): + branchOp = GitBranchDialog.CreateSwitchBranch + elif self.createTrackingButton.isChecked(): + branchOp = GitBranchDialog.CreateTrackingBranch + elif self.setTrackingButton.isChecked(): + branchOp = GitBranchDialog.SetTrackingBranch + else: + branchOp = GitBranchDialog.UnsetTrackingBranch + + return (branchOp, branch, self.revisionEdit.text(), + self.newBranchNameEdit.text(), + self.remoteBranchCombo.currentText(), + self.forceCheckBox.isChecked())
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,387 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitBranchDialog</class> + <widget class="QDialog" name="GitBranchDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>391</width> + <height>499</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git Branch</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QGroupBox" name="tagActionGroup"> + <property name="title"> + <string>Branch Action</string> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QRadioButton" name="createBranchButton"> + <property name="toolTip"> + <string>Select to create a branch</string> + </property> + <property name="whatsThis"> + <string><b>Create Branch</b> +<p>Select this entry in order to create a branch.</p></string> + </property> + <property name="text"> + <string>Create</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QRadioButton" name="moveBranchButton"> + <property name="toolTip"> + <string>Select to rename a branch</string> + </property> + <property name="whatsThis"> + <string><b>Rename</b> +<p>Select this entry in order to rename the selected branch.</p></string> + </property> + <property name="text"> + <string>Rename</string> + </property> + </widget> + </item> + <item row="0" column="2"> + <widget class="QRadioButton" name="deleteBranchButton"> + <property name="toolTip"> + <string>Select to delete a branch</string> + </property> + <property name="whatsThis"> + <string><b>Delete Branch</b> +<p>Select this entry in order to delete the selected branch.</p></string> + </property> + <property name="text"> + <string>Delete</string> + </property> + </widget> + </item> + <item row="1" column="0" colspan="3"> + <widget class="QRadioButton" name="createSwitchButton"> + <property name="toolTip"> + <string>Select to create a new branch and switch to it</string> + </property> + <property name="whatsThis"> + <string><b>Create &amp; Switch</b>\n<p>Select this entry in order to create a new branch and switch the working tree to it.</p></string> + </property> + <property name="text"> + <string>Create && Switch</string> + </property> + </widget> + </item> + <item row="2" column="0" colspan="3"> + <widget class="QRadioButton" name="createTrackingButton"> + <property name="toolTip"> + <string>Select to create a tracking branch and switch to it</string> + </property> + <property name="whatsThis"> + <string><b>Create Tracking Branch &amp; Switch</b>\n<p>Select this entry in order to create a new branch tracking a remote repository branch. The working tree is switched to it.</p></string> + </property> + <property name="text"> + <string>Create Tracking Branch && Switch</string> + </property> + </widget> + </item> + <item row="3" column="0" colspan="3"> + <widget class="QRadioButton" name="setTrackingButton"> + <property name="toolTip"> + <string>Select to associate a remote branch</string> + </property> + <property name="text"> + <string>Set Tracking Branch</string> + </property> + </widget> + </item> + <item row="4" column="0" colspan="3"> + <widget class="QRadioButton" name="unsetTrackingButton"> + <property name="toolTip"> + <string>Select to de-associate a remote branch</string> + </property> + <property name="text"> + <string>Unset Tracking Branch Information</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <item> + <widget class="QLabel" name="TextLabel1"> + <property name="text"> + <string>Name:</string> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="branchCombo"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Enter the name of the branch</string> + </property> + <property name="whatsThis"> + <string><b>Branch Name</b> +<p>Enter the name of the branch to be created, deleted or moved.</p></string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + <property name="duplicatesEnabled"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QGroupBox" name="createBranchGroup"> + <property name="title"> + <string>Create Branch</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Revision:</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="revisionEdit"> + <property name="toolTip"> + <string>Enter a revision at which to start the branch</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="moveBranchGroup"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="title"> + <string>Rename Branch</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>New Name:</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="newBranchNameEdit"> + <property name="statusTip"> + <string>Enter a new name for the selected branch</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="trackingBranchGroup"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="title"> + <string>Set Tracking Branch</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_4"> + <item> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Remote Branch:</string> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="remoteBranchCombo"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Select the remote branch to associate</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QCheckBox" name="forceCheckBox"> + <property name="toolTip"> + <string>Select to enforce the create operation</string> + </property> + <property name="text"> + <string>Enforce Operation</string> + </property> + </widget> + </item> + <item> + <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> + <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> + <tabstops> + <tabstop>createBranchButton</tabstop> + <tabstop>moveBranchButton</tabstop> + <tabstop>deleteBranchButton</tabstop> + <tabstop>createSwitchButton</tabstop> + <tabstop>createTrackingButton</tabstop> + <tabstop>setTrackingButton</tabstop> + <tabstop>unsetTrackingButton</tabstop> + <tabstop>branchCombo</tabstop> + <tabstop>revisionEdit</tabstop> + <tabstop>newBranchNameEdit</tabstop> + <tabstop>remoteBranchCombo</tabstop> + <tabstop>forceCheckBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>GitBranchDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>134</x> + <y>461</y> + </hint> + <hint type="destinationlabel"> + <x>25</x> + <y>214</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>GitBranchDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>171</x> + <y>461</y> + </hint> + <hint type="destinationlabel"> + <x>128</x> + <y>210</y> + </hint> + </hints> + </connection> + <connection> + <sender>createBranchButton</sender> + <signal>toggled(bool)</signal> + <receiver>createBranchGroup</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>63</x> + <y>57</y> + </hint> + <hint type="destinationlabel"> + <x>66</x> + <y>246</y> + </hint> + </hints> + </connection> + <connection> + <sender>moveBranchButton</sender> + <signal>toggled(bool)</signal> + <receiver>moveBranchGroup</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>243</x> + <y>61</y> + </hint> + <hint type="destinationlabel"> + <x>51</x> + <y>323</y> + </hint> + </hints> + </connection> + <connection> + <sender>createSwitchButton</sender> + <signal>toggled(bool)</signal> + <receiver>createBranchGroup</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>107</x> + <y>86</y> + </hint> + <hint type="destinationlabel"> + <x>196</x> + <y>259</y> + </hint> + </hints> + </connection> + <connection> + <sender>createTrackingButton</sender> + <signal>toggled(bool)</signal> + <receiver>forceCheckBox</receiver> + <slot>setDisabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>122</x> + <y>115</y> + </hint> + <hint type="destinationlabel"> + <x>147</x> + <y>432</y> + </hint> + </hints> + </connection> + <connection> + <sender>setTrackingButton</sender> + <signal>toggled(bool)</signal> + <receiver>trackingBranchGroup</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>108</x> + <y>132</y> + </hint> + <hint type="destinationlabel"> + <x>93</x> + <y>360</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,75 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to select the data for pushing a branch. +""" + +from __future__ import unicode_literals + +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox + +from .Ui_GitBranchPushDialog import Ui_GitBranchPushDialog + + +class GitBranchPushDialog(QDialog, Ui_GitBranchPushDialog): + """ + Class implementing a dialog to select the data for pushing a branch. + """ + def __init__(self, branches, remotes, delete=False, parent=None): + """ + Constructor + + @param branches list of branch names (list of string) + @param remotes list of remote names (list of string) + @param delete flag indicating a delete branch action (boolean) + @param parent reference to the parent widget (QWidget) + """ + super(GitBranchPushDialog, self).__init__(parent) + self.setupUi(self) + + self.__okButton = self.buttonBox.button(QDialogButtonBox.Ok) + + self.__allBranches = self.tr("<all branches>") + + if "origin" in remotes: + self.remoteComboBox.addItem("origin") + remotes.remove("origin") + self.remoteComboBox.addItems(sorted(remotes)) + + if delete: + self.branchComboBox.addItem("") + else: + self.branchComboBox.addItem(self.__allBranches) + if "master" in branches: + if not delete: + self.branchComboBox.addItem("master") + branches.remove("master") + self.branchComboBox.addItems(sorted(branches)) + + if delete: + self.__okButton.setEnabled(False) + self.branchComboBox.setEditable(True) + + @pyqtSlot(str) + def on_branchComboBox_editTextChanged(self, txt): + """ + Private slot to handle a change of the branch name. + + @param txt branch name (string) + """ + self.__okButton.setEnabled(bool(txt)) + + def getData(self): + """ + Public method to get the selected data. + + @return tuple of selected branch name, remote name and a flag + indicating all branches (tuple of two strings and a boolean) + """ + return (self.branchComboBox.currentText(), + self.remoteComboBox.currentText(), + self.branchComboBox.currentText() == self.__allBranches)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,111 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitBranchPushDialog</class> + <widget class="QDialog" name="GitBranchPushDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>497</width> + <height>107</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git Push Branch</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>Branch Name:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QComboBox" name="branchComboBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Select the branch</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Remote Name:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QComboBox" name="remoteComboBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Select the remote repository</string> + </property> + </widget> + </item> + <item row="2" 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> + <tabstops> + <tabstop>branchComboBox</tabstop> + <tabstop>remoteComboBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>GitBranchPushDialog</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>GitBranchPushDialog</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/GitBundleDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,121 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter the data for a bundle operation. +""" + +from __future__ import unicode_literals + +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox + +from .Ui_GitBundleDialog import Ui_GitBundleDialog + + +class GitBundleDialog(QDialog, Ui_GitBundleDialog): + """ + Class implementing a dialog to enter the data for a bundle operation. + """ + def __init__(self, tagsList, branchesList, parent=None): + """ + Constructor + + @param tagsList list of tags (list of strings) + @param branchesList list of branches (list of strings) + @param parent parent widget (QWidget) + """ + super(GitBundleDialog, self).__init__(parent) + self.setupUi(self) + + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) + + self.tagCombo.addItems(sorted(tagsList)) + self.branchCombo.addItems(["master"] + sorted(branchesList)) + + def __updateOK(self): + """ + Private slot to update the OK button. + """ + enabled = True + if self.revisionsButton.isChecked(): + enabled = self.revisionsEdit.text() != "" + elif self.tagButton.isChecked(): + enabled = self.tagCombo.currentText() != "" + elif self.branchButton.isChecked(): + enabled = self.branchCombo.currentText() != "" + + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enabled) + + @pyqtSlot(bool) + def on_revisionsButton_toggled(self, checked): + """ + Private slot to handle changes of the revisions select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_tagButton_toggled(self, checked): + """ + Private slot to handle changes of the Tag select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_branchButton_toggled(self, checked): + """ + Private slot to handle changes of the Branch select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(str) + def on_revisionsEdit_textChanged(self, txt): + """ + Private slot to handle changes of the Revisions edit. + + @param txt text of the line edit (string) + """ + self.__updateOK() + + @pyqtSlot(str) + def on_tagCombo_editTextChanged(self, txt): + """ + Private slot to handle changes of the Tag combo. + + @param txt text of the combo (string) + """ + self.__updateOK() + + @pyqtSlot(str) + def on_branchCombo_editTextChanged(self, txt): + """ + Private slot to handle changes of the Branch combo. + + @param txt text of the combo (string) + """ + self.__updateOK() + + def getData(self): + """ + Public method to retrieve the bundle data. + + @return list of revision expressions (list of strings) + """ + if self.revisionsButton.isChecked(): + revs = self.revisionsEdit.text().strip().split() + elif self.tagButton.isChecked(): + revs = [self.tagCombo.currentText()] + elif self.branchButton.isChecked(): + revs = [self.branchCombo.currentText()] + else: + revs = [] + + return revs
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,181 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitBundleDialog</class> + <widget class="QDialog" name="GitBundleDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>450</width> + <height>184</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git Bundle</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Revision</string> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QRadioButton" name="revisionsButton"> + <property name="toolTip"> + <string>Select to specify a revision or revision range</string> + </property> + <property name="text"> + <string>Revisions:</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLineEdit" name="revisionsEdit"> + <property name="toolTip"> + <string>Enter revisions or revision range expressions</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QRadioButton" name="tagButton"> + <property name="toolTip"> + <string>Select to specify a revision by a tag</string> + </property> + <property name="text"> + <string>Tag:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QComboBox" name="tagCombo"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter a tag name</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QRadioButton" name="branchButton"> + <property name="toolTip"> + <string>Select to specify a revision by a branch</string> + </property> + <property name="text"> + <string>Branch:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QComboBox" name="branchCombo"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter a branch name</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <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> + <tabstops> + <tabstop>tagButton</tabstop> + <tabstop>tagCombo</tabstop> + <tabstop>branchButton</tabstop> + <tabstop>branchCombo</tabstop> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>GitBundleDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>270</x> + <y>442</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>229</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>GitBundleDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>338</x> + <y>442</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>229</y> + </hint> + </hints> + </connection> + <connection> + <sender>tagButton</sender> + <signal>toggled(bool)</signal> + <receiver>tagCombo</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>72</x> + <y>154</y> + </hint> + <hint type="destinationlabel"> + <x>234</x> + <y>154</y> + </hint> + </hints> + </connection> + <connection> + <sender>branchButton</sender> + <signal>toggled(bool)</signal> + <receiver>branchCombo</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>91</x> + <y>181</y> + </hint> + <hint type="destinationlabel"> + <x>233</x> + <y>181</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,58 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter cherry-pick data. +""" + +from __future__ import unicode_literals + +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox + +from .Ui_GitCherryPickDialog import Ui_GitCherryPickDialog + + +class GitCherryPickDialog(QDialog, Ui_GitCherryPickDialog): + """ + Class implementing a dialog to enter cherry-pick data. + """ + def __init__(self, commits=None, parent=None): + """ + Constructor + + @param commits list of commits to show in the commits pane (list of + strings) + @param parent reference to the parent widget (QWidget) + """ + super(GitCherryPickDialog, self).__init__(parent) + self.setupUi(self) + + if commits: + self.commitsEdit.setPlainText("\n".join(commits)) + + self.on_commitsEdit_textChanged() + + @pyqtSlot() + def on_commitsEdit_textChanged(self): + """ + Private slot to react upon changes of commits. + """ + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled( + self.commitsEdit.toPlainText() != "") + + def getData(self): + """ + Public method to retrieve the entered data. + + @return tuple with list of commits, a flag indicating to append + cherry-pick info to the commit message, a flag indicating to append + a signed-off-by line to the commit message and a flag indicating to + not commit the action (list of strings, boolean, boolean, boolean) + """ + return (self.commitsEdit.toPlainText().strip().splitlines(), + self.appendCheckBox.isChecked(), + self.signoffCheckBox.isChecked(), + self.nocommitCheckBox.isChecked())
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,128 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitCherryPickDialog</class> + <widget class="QDialog" name="GitCherryPickDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>450</width> + <height>300</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git Cherry-pick</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Commits</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QPlainTextEdit" name="commitsEdit"> + <property name="toolTip"> + <string>Enter commits by id, branch or tag one per line</string> + </property> + <property name="tabChangesFocus"> + <bool>true</bool> + </property> + <property name="lineWrapMode"> + <enum>QPlainTextEdit::NoWrap</enum> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QCheckBox" name="appendCheckBox"> + <property name="toolTip"> + <string>Select to append cherry-pick info to the commit message</string> + </property> + <property name="text"> + <string>Append Cherry-pick &Info</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="signoffCheckBox"> + <property name="toolTip"> + <string>Select to add a 'Signed-off-by' line to the commit message</string> + </property> + <property name="text"> + <string>Append '&Signed-off-by' line</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="nocommitCheckBox"> + <property name="toolTip"> + <string>Select to not commit the cherry-pick</string> + </property> + <property name="text"> + <string>Don't &commit</string> + </property> + </widget> + </item> + <item> + <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> + <tabstops> + <tabstop>commitsEdit</tabstop> + <tabstop>appendCheckBox</tabstop> + <tabstop>signoffCheckBox</tabstop> + <tabstop>nocommitCheckBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>GitCherryPickDialog</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>GitCherryPickDialog</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/GitCommandDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,72 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the Git command dialog. +""" + +from __future__ import unicode_literals + +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox + +from .Ui_GitCommandDialog import Ui_GitCommandDialog + +import Utilities + + +class GitCommandDialog(QDialog, Ui_GitCommandDialog): + """ + Class implementing the Git command dialog. + + It implements a dialog that is used to enter an + arbitrary Git command. It asks the user to enter + the commandline parameters. + """ + def __init__(self, argvList, ppath, parent=None): + """ + Constructor + + @param argvList history list of commandline arguments (list of strings) + @param ppath pathname of the project directory (string) + @param parent parent widget of this dialog (QWidget) + """ + super(GitCommandDialog, self).__init__(parent) + self.setupUi(self) + + self.okButton = self.buttonBox.button(QDialogButtonBox.Ok) + self.okButton.setEnabled(False) + + self.commandCombo.clear() + self.commandCombo.addItems(argvList) + if len(argvList) > 0: + self.commandCombo.setCurrentIndex(0) + self.projectDirLabel.setText(ppath) + + # modify some what's this help texts + t = self.commandCombo.whatsThis() + if t: + t += Utilities.getPercentReplacementHelp() + self.commandCombo.setWhatsThis(t) + + msh = self.minimumSizeHint() + self.resize(max(self.width(), msh.width()), msh.height()) + + @pyqtSlot(str) + def on_commandCombo_editTextChanged(self, text): + """ + Private method used to enable/disable the OK-button. + + @param text ignored + """ + self.okButton.setDisabled(self.commandCombo.currentText() == "") + + def getData(self): + """ + Public method to retrieve the data entered into this dialog. + + @return commandline parameters (string) + """ + return self.commandCombo.currentText()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,137 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitCommandDialog</class> + <widget class="QDialog" name="GitCommandDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>628</width> + <height>99</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git Command</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="textLabel1"> + <property name="text"> + <string>Git Command:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QComboBox" name="commandCombo"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Enter the Git command to be executed with all necessary parameters</string> + </property> + <property name="whatsThis"> + <string><b>Git Command</b> +<p>Enter the Git command to be executed including all necessary +parameters. If a parameter of the commandline includes a space you have to +surround this parameter by single or double quotes. Do not include the name +of the Git client executable (i.e. git).</p></string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + <property name="insertPolicy"> + <enum>QComboBox::InsertAtTop</enum> + </property> + <property name="duplicatesEnabled"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="textLabel3"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Project Directory:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLabel" name="projectDirLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>This shows the root directory of the current project.</string> + </property> + <property name="text"> + <string>project directory</string> + </property> + </widget> + </item> + <item row="2" 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> + <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> + <tabstops> + <tabstop>commandCombo</tabstop> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>GitCommandDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>41</x> + <y>103</y> + </hint> + <hint type="destinationlabel"> + <x>49</x> + <y>129</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>GitCommandDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>173</x> + <y>109</y> + </hint> + <hint type="destinationlabel"> + <x>174</x> + <y>128</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitCommitDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,139 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter the commit message. +""" + +from __future__ import unicode_literals + +from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt +from PyQt5.QtWidgets import QWidget, QDialogButtonBox + +from .Ui_GitCommitDialog import Ui_GitCommitDialog + + +class GitCommitDialog(QWidget, Ui_GitCommitDialog): + """ + Class implementing a dialog to enter the commit message. + + @signal accepted() emitted, if the dialog was accepted + @signal rejected() emitted, if the dialog was rejected + """ + accepted = pyqtSignal() + rejected = pyqtSignal() + + def __init__(self, vcs, msg, amend, commitAll, parent=None): + """ + Constructor + + @param vcs reference to the vcs object + @param msg initial message (string) + @param amend flag indicating to amend the HEAD commit (boolean) + @param commitAll flag indicating to commit all local changes (boolean) + @param parent parent widget (QWidget) + """ + super(GitCommitDialog, self).__init__( + parent, Qt.WindowFlags(Qt.Window)) + self.setupUi(self) + + self.__vcs = vcs + + self.logEdit.setPlainText(msg) + self.amendCheckBox.setChecked(amend) + self.stagedCheckBox.setChecked(not commitAll) + + def showEvent(self, evt): + """ + Protected method called when the dialog is about to be shown. + + @param evt the event (QShowEvent) + """ + commitMessages = self.__vcs.getPlugin().getPreferences('Commits') + self.recentComboBox.clear() + self.recentComboBox.addItem("") + for message in commitMessages: + abbrMsg = message[:60] + if len(message) > 60: + abbrMsg += "..." + self.recentComboBox.addItem(abbrMsg, message) + + self.logEdit.setFocus(Qt.OtherFocusReason) + + def logMessage(self): + """ + Public method to retrieve the log message. + + @return the log message (string) + """ + msg = self.logEdit.toPlainText() + if msg: + commitMessages = self.__vcs.getPlugin().getPreferences('Commits') + if msg in commitMessages: + commitMessages.remove(msg) + commitMessages.insert(0, msg) + no = self.__vcs.getPlugin().getPreferences("CommitMessages") + del commitMessages[no:] + self.__vcs.getPlugin().setPreferences( + 'Commits', commitMessages) + + return msg + + def stagedOnly(self): + """ + Public method to retrieve the state of the staged only flag. + + @return state of the staged only flag (boolean) + """ + return self.stagedCheckBox.isChecked() + + def amend(self): + """ + Public method to retrieve the state of the amend flag. + + @return state of the amend flag (boolean) + """ + return self.amendCheckBox.isChecked() + + def resetAuthor(self): + """ + Public method to retrieve the state of the reset author flag. + + @return state of the reset author flag (boolean) + """ + return self.resetAuthorCheckBox.isChecked() + + def on_buttonBox_clicked(self, button): + """ + Private slot called by a button of the button box clicked. + + @param button button that was clicked (QAbstractButton) + """ + if button == self.buttonBox.button(QDialogButtonBox.Cancel): + self.logEdit.clear() + + def on_buttonBox_accepted(self): + """ + Private slot called by the buttonBox accepted signal. + """ + self.close() + self.accepted.emit() + + def on_buttonBox_rejected(self): + """ + Private slot called by the buttonBox rejected signal. + """ + self.close() + self.rejected.emit() + + @pyqtSlot(str) + def on_recentComboBox_activated(self, txt): + """ + Private slot to select a commit message from recent ones. + + @param txt text of the selected entry (string) + """ + if txt: + self.logEdit.setPlainText(self.recentComboBox.currentData())
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,109 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitCommitDialog</class> + <widget class="QWidget" name="GitCommitDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>450</width> + <height>400</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QGroupBox" name="logGroup"> + <property name="title"> + <string>Commit Message</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QTextEdit" name="logEdit"> + <property name="toolTip"> + <string>Enter the log message.</string> + </property> + <property name="whatsThis"> + <string><b>Log Message</b> +<p>Enter the log message for the commit action.</p></string> + </property> + <property name="tabChangesFocus"> + <bool>true</bool> + </property> + <property name="acceptRichText"> + <bool>false</bool> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Recent commit messages</string> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="recentComboBox"> + <property name="toolTip"> + <string>Select a recent commit message to use</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QCheckBox" name="stagedCheckBox"> + <property name="toolTip"> + <string>Select to commit only staged changes</string> + </property> + <property name="text"> + <string>Commit staged changes only</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="amendCheckBox"> + <property name="toolTip"> + <string>Select to amend the last commit (leave message empty to keep it)</string> + </property> + <property name="text"> + <string>Amend the last commit</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="resetAuthorCheckBox"> + <property name="toolTip"> + <string>Select to reset the author information</string> + </property> + <property name="text"> + <string>Reset Author Info</string> + </property> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> + <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> + <tabstops> + <tabstop>logEdit</tabstop> + <tabstop>recentComboBox</tabstop> + <tabstop>stagedCheckBox</tabstop> + <tabstop>amendCheckBox</tabstop> + <tabstop>resetAuthorCheckBox</tabstop> + </tabstops> + <resources/> + <connections/> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitCopyDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,107 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter the data for a copy or rename operation. +""" + +from __future__ import unicode_literals + +import os.path + +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox + +from E5Gui.E5Completers import E5FileCompleter, E5DirCompleter +from E5Gui import E5FileDialog + +from .Ui_GitCopyDialog import Ui_GitCopyDialog + +import Utilities +import UI.PixmapCache + + +class GitCopyDialog(QDialog, Ui_GitCopyDialog): + """ + Class implementing a dialog to enter the data for a copy or rename + operation. + """ + def __init__(self, source, parent=None, move=False): + """ + Constructor + + @param source name of the source file/directory (string) + @param parent parent widget (QWidget) + @param move flag indicating a move operation (boolean) + """ + super(GitCopyDialog, self).__init__(parent) + self.setupUi(self) + + self.dirButton.setIcon(UI.PixmapCache.getIcon("open.png")) + + self.source = source + if os.path.isdir(self.source): + self.targetCompleter = E5DirCompleter(self.targetEdit) + else: + self.targetCompleter = E5FileCompleter(self.targetEdit) + + if move: + self.setWindowTitle(self.tr('Git Move')) + else: + self.forceCheckBox.setEnabled(False) + + self.sourceEdit.setText(source) + + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) + + msh = self.minimumSizeHint() + self.resize(max(self.width(), msh.width()), msh.height()) + + def getData(self): + """ + Public method to retrieve the copy data. + + @return the target name (string) and a flag indicating + the operation should be enforced (boolean) + """ + target = self.targetEdit.text() + if not os.path.isabs(target): + sourceDir = os.path.dirname(self.sourceEdit.text()) + target = os.path.join(sourceDir, target) + return Utilities.toNativeSeparators(target), \ + self.forceCheckBox.isChecked() + + @pyqtSlot() + def on_dirButton_clicked(self): + """ + Private slot to handle the button press for selecting the target via a + selection dialog. + """ + if os.path.isdir(self.source): + target = E5FileDialog.getExistingDirectory( + self, + self.tr("Select target"), + self.targetEdit.text(), + E5FileDialog.Options(E5FileDialog.ShowDirsOnly)) + else: + target = E5FileDialog.getSaveFileName( + self, + self.tr("Select target"), + self.targetEdit.text(), + "", + E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite)) + + if target: + self.targetEdit.setText(Utilities.toNativeSeparators(target)) + + @pyqtSlot(str) + def on_targetEdit_textChanged(self, txt): + """ + Private slot to handle changes of the target. + + @param txt contents of the target edit (string) + """ + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled( + os.path.isabs(txt) or os.path.dirname(txt) == "")
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,139 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitCopyDialog</class> + <widget class="QDialog" name="GitCopyDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>409</width> + <height>138</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git Copy</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout"> + <item> + <layout class="QGridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="textLabel1"> + <property name="text"> + <string>Source:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLineEdit" name="sourceEdit"> + <property name="toolTip"> + <string>Shows the name of the source</string> + </property> + <property name="whatsThis"> + <string><b>Source name</b> +<p>This field shows the name of the source.</p></string> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLineEdit" name="targetEdit"> + <property name="toolTip"> + <string>Enter the target name</string> + </property> + <property name="whatsThis"> + <string><b>Target name</b> +<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="textLabel2"> + <property name="text"> + <string>Target:</string> + </property> + </widget> + </item> + <item row="1" column="2"> + <widget class="QToolButton" name="dirButton"> + <property name="toolTip"> + <string>Press to open a selection dialog</string> + </property> + <property name="whatsThis"> + <string><b>Target directory</b> +<p>Select the target name for the operation via a selection dialog.</p></string> + </property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QCheckBox" name="forceCheckBox"> + <property name="toolTip"> + <string>Select to force the operation</string> + </property> + <property name="text"> + <string>Enforce operation</string> + </property> + </widget> + </item> + <item> + <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> + <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> + <tabstops> + <tabstop>targetEdit</tabstop> + <tabstop>dirButton</tabstop> + <tabstop>forceCheckBox</tabstop> + <tabstop>buttonBox</tabstop> + <tabstop>sourceEdit</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>GitCopyDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>32</x> + <y>79</y> + </hint> + <hint type="destinationlabel"> + <x>32</x> + <y>97</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>GitCopyDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>101</x> + <y>80</y> + </hint> + <hint type="destinationlabel"> + <x>101</x> + <y>97</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,274 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to show the results of the git describe action. +""" + +from __future__ import unicode_literals +try: + str = unicode +except NameError: + pass + +import os + +from PyQt5.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QHeaderView, \ + QTreeWidgetItem, QLineEdit + +from E5Gui import E5MessageBox + +from .Ui_GitDescribeDialog import Ui_GitDescribeDialog + +from .GitUtilities import strToQByteArray + +import Preferences + + +class GitDescribeDialog(QDialog, Ui_GitDescribeDialog): + """ + Class implementing a dialog to show the results of the git describe action. + """ + def __init__(self, vcs, parent=None): + """ + Constructor + + @param vcs reference to the vcs object + @param parent reference to the parent widget (QWidget) + """ + super(GitDescribeDialog, self).__init__(parent) + self.setupUi(self) + self.setWindowFlags(Qt.Window) + + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) + + self.process = QProcess() + self.vcs = vcs + + self.tagList.headerItem().setText(self.tagList.columnCount(), "") + self.tagList.header().setSortIndicator(1, Qt.AscendingOrder) + + self.process.finished.connect(self.__procFinished) + self.process.readyReadStandardOutput.connect(self.__readStdout) + self.process.readyReadStandardError.connect(self.__readStderr) + + self.show() + QCoreApplication.processEvents() + + def closeEvent(self, e): + """ + Protected slot implementing a close event handler. + + @param e close event (QCloseEvent) + """ + if self.process is not None and \ + self.process.state() != QProcess.NotRunning: + self.process.terminate() + QTimer.singleShot(2000, self.process.kill) + self.process.waitForFinished(3000) + + e.accept() + + def start(self, path, commits): + """ + Public slot to start the tag/branch list command. + + @param path name of directory to be listed (string) + @param commits list of commits to be described (list of string) + """ + self.tagList.clear() + self.errorGroup.hide() + + self.intercept = False + self.activateWindow() + + self.__commits = commits[:] + self.__tagInfoLines = [] + + dname, fname = self.vcs.splitPath(path) + + # find the root of the repo + self.repodir = dname + while not os.path.isdir(os.path.join(self.repodir, self.vcs.adminDir)): + self.repodir = os.path.dirname(self.repodir) + if os.path.splitdrive(self.repodir)[1] == os.sep: + return + + args = self.vcs.initCommand("describe") + args.append('--abbrev={0}'.format( + self.vcs.getPlugin().getPreferences("CommitIdLength"))) + if commits: + args.extend(commits) + else: + args.append('--dirty') + + self.process.kill() + self.process.setWorkingDirectory(self.repodir) + + self.process.start('git', args) + procStarted = self.process.waitForStarted(5000) + if not procStarted: + self.inputGroup.setEnabled(False) + self.inputGroup.hide() + E5MessageBox.critical( + self, + self.tr('Process Generation Error'), + self.tr( + 'The process {0} could not be started. ' + 'Ensure, that it is in the search path.' + ).format('git')) + else: + self.inputGroup.setEnabled(True) + self.inputGroup.show() + + def __finish(self): + """ + Private slot called when the process finished or the user pressed + the button. + """ + if self.process is not None and \ + self.process.state() != QProcess.NotRunning: + self.process.terminate() + QTimer.singleShot(2000, self.process.kill) + self.process.waitForFinished(3000) + + self.inputGroup.setEnabled(False) + self.inputGroup.hide() + + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) + self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) + self.buttonBox.button(QDialogButtonBox.Close).setFocus( + Qt.OtherFocusReason) + + self.__resizeColumns() + self.__resort() + + def on_buttonBox_clicked(self, button): + """ + Private slot called by a button of the button box clicked. + + @param button button that was clicked (QAbstractButton) + """ + if button == self.buttonBox.button(QDialogButtonBox.Close): + self.close() + elif button == self.buttonBox.button(QDialogButtonBox.Cancel): + self.__finish() + + def __procFinished(self, exitCode, exitStatus): + """ + Private slot connected to the finished signal. + + @param exitCode exit code of the process (integer) + @param exitStatus exit status of the process (QProcess.ExitStatus) + """ + if self.__tagInfoLines: + if self.__commits: + for commit, tagInfo in zip(self.__commits, + self.__tagInfoLines): + QTreeWidgetItem(self.tagList, [commit, tagInfo]) + else: + for tagInfo in self.__tagInfoLines: + QTreeWidgetItem(self.tagList, ["", tagInfo]) + + self.__finish() + + def __resort(self): + """ + Private method to resort the tree. + """ + self.tagList.sortItems( + self.tagList.sortColumn(), + self.tagList.header().sortIndicatorOrder()) + + def __resizeColumns(self): + """ + Private method to resize the list columns. + """ + self.tagList.header().resizeSections(QHeaderView.ResizeToContents) + self.tagList.header().setStretchLastSection(True) + + def __readStdout(self): + """ + Private slot to handle the readyReadStdout signal. + + It reads the output of the process, formats it and inserts it into + the contents pane. + """ + self.process.setReadChannel(QProcess.StandardOutput) + + while self.process.canReadLine(): + s = str(self.process.readLine(), + Preferences.getSystem("IOEncoding"), + 'replace') + self.__tagInfoLines.append(s.strip()) + + def __readStderr(self): + """ + Private slot to handle the readyReadStderr signal. + + It reads the error output of the process and inserts it into the + error pane. + """ + if self.process is not None: + s = str(self.process.readAllStandardError(), + Preferences.getSystem("IOEncoding"), + 'replace') + self.errorGroup.show() + self.errors.insertPlainText(s) + self.errors.ensureCursorVisible() + + def on_passwordCheckBox_toggled(self, isOn): + """ + Private slot to handle the password checkbox toggled. + + @param isOn flag indicating the status of the check box (boolean) + """ + if isOn: + self.input.setEchoMode(QLineEdit.Password) + else: + self.input.setEchoMode(QLineEdit.Normal) + + @pyqtSlot() + def on_sendButton_clicked(self): + """ + Private slot to send the input to the git process. + """ + inputTxt = self.input.text() + inputTxt += os.linesep + + if self.passwordCheckBox.isChecked(): + self.errors.insertPlainText(os.linesep) + self.errors.ensureCursorVisible() + else: + self.errors.insertPlainText(inputTxt) + self.errors.ensureCursorVisible() + + self.process.write(strToQByteArray(inputTxt)) + + self.passwordCheckBox.setChecked(False) + self.input.clear() + + def on_input_returnPressed(self): + """ + Private slot to handle the press of the return key in the input field. + """ + self.intercept = True + self.on_sendButton_clicked() + + def keyPressEvent(self, evt): + """ + Protected slot to handle a key press event. + + @param evt the key press event (QKeyEvent) + """ + if self.intercept: + self.intercept = False + evt.accept() + return + + super(GitDescribeDialog, self).keyPressEvent(evt)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,158 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitDescribeDialog</class> + <widget class="QDialog" name="GitDescribeDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>634</width> + <height>494</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git Tag List</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout"> + <item> + <widget class="QTreeWidget" name="tagList"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>2</verstretch> + </sizepolicy> + </property> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <property name="itemsExpandable"> + <bool>false</bool> + </property> + <property name="sortingEnabled"> + <bool>true</bool> + </property> + <column> + <property name="text"> + <string>Commit</string> + </property> + </column> + <column> + <property name="text"> + <string>Tag Info</string> + </property> + </column> + </widget> + </item> + <item> + <widget class="QGroupBox" name="errorGroup"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Errors</string> + </property> + <layout class="QVBoxLayout"> + <item> + <widget class="QTextEdit" name="errors"> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="acceptRichText"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="inputGroup"> + <property name="title"> + <string>Input</string> + </property> + <layout class="QGridLayout"> + <item row="1" column="1"> + <spacer> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>327</width> + <height>29</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="2"> + <widget class="QPushButton" name="sendButton"> + <property name="toolTip"> + <string>Press to send the input to the git process</string> + </property> + <property name="text"> + <string>&Send</string> + </property> + <property name="shortcut"> + <string>Alt+S</string> + </property> + </widget> + </item> + <item row="0" column="0" colspan="3"> + <widget class="QLineEdit" name="input"> + <property name="toolTip"> + <string>Enter data to be sent to the git process</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QCheckBox" name="passwordCheckBox"> + <property name="toolTip"> + <string>Select to switch the input field to password mode</string> + </property> + <property name="text"> + <string>&Password Mode</string> + </property> + <property name="shortcut"> + <string>Alt+P</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close</set> + </property> + </widget> + </item> + </layout> + </widget> + <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> + <tabstops> + <tabstop>tagList</tabstop> + <tabstop>errors</tabstop> + <tabstop>input</tabstop> + <tabstop>passwordCheckBox</tabstop> + <tabstop>sendButton</tabstop> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections/> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,311 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog starting a process and showing its output. +""" + +from __future__ import unicode_literals +try: + str = unicode +except NameError: + pass + +import os + +from PyQt5.QtCore import QProcess, QTimer, pyqtSlot, Qt, QCoreApplication, \ + QProcessEnvironment +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QLineEdit + +from E5Gui import E5MessageBox + +from .Ui_GitDialog import Ui_GitDialog + +from .GitUtilities import strToQByteArray + +import Preferences + + +class GitDialog(QDialog, Ui_GitDialog): + """ + Class implementing a dialog starting a process and showing its output. + + It starts a QProcess and displays a dialog that + shows the output of the process. The dialog is modal, + which causes a synchronized execution of the process. + """ + def __init__(self, text, git=None, parent=None): + """ + Constructor + + @param text text to be shown by the label (string) + @param git reference to the Git interface object (Git) + @param parent parent widget (QWidget) + """ + super(GitDialog, self).__init__(parent) + self.setupUi(self) + + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) + + self.process = None + self.username = '' + self.password = '' + self.vcs = git + + self.outputGroup.setTitle(text) + + self.show() + QCoreApplication.processEvents() + + def __finish(self): + """ + Private slot called when the process finished or the user pressed + the button. + """ + if self.process is not None and \ + self.process.state() != QProcess.NotRunning: + self.process.terminate() + QTimer.singleShot(2000, self.process.kill) + self.process.waitForFinished(3000) + + self.inputGroup.setEnabled(False) + self.inputGroup.hide() + + self.process = None + + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) + self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) + self.buttonBox.button(QDialogButtonBox.Close).setFocus( + Qt.OtherFocusReason) + + if self.normal and self.errors.toPlainText(): + self.errorGroup.setTitle(self.tr("Additional Output")) + + if Preferences.getVCS("AutoClose") and \ + self.normal and \ + self.errors.toPlainText() == "": + self.accept() + + def on_buttonBox_clicked(self, button): + """ + Private slot called by a button of the button box clicked. + + @param button button that was clicked (QAbstractButton) + """ + if button == self.buttonBox.button(QDialogButtonBox.Close): + self.close() + elif button == self.buttonBox.button(QDialogButtonBox.Cancel): + self.statusLabel.setText(self.tr("Process canceled.")) + self.__finish() + + def __procFinished(self, exitCode, exitStatus): + """ + Private slot connected to the finished signal. + + @param exitCode exit code of the process (integer) + @param exitStatus exit status of the process (QProcess.ExitStatus) + """ + self.normal = (exitStatus == QProcess.NormalExit) and (exitCode == 0) + if self.normal: + self.statusLabel.setText(self.tr("Process finished successfully.")) + elif exitStatus == QProcess.CrashExit: + self.statusLabel.setText(self.tr("Process crashed.")) + else: + self.statusLabel.setText( + self.tr("Proces finished with exit code {0}").format(exitCode)) + self.__finish() + + def startProcess(self, args, workingDir=None, showArgs=True, + environment=None): + """ + Public slot used to start the process. + + @param args list of arguments for the process (list of strings) + @keyparam workingDir working directory for the process (string) + @keyparam showArgs flag indicating to show the arguments (boolean) + @keyparam environment dictionary of environment settings to add + or change for the git process (dict of string and string) + @return flag indicating a successful start of the process (boolean) + """ + self.errorGroup.hide() + self.normal = False + self.intercept = False + + if environment is None: + environment = {} + + self.__hasAddOrDelete = False + if args[0] in ["checkout", "fetch", "pull", "rebase", "reset", + "merge", "cherry-pick", "stash"]: + self.__updateCommand = True + else: + self.__updateCommand = False + + if showArgs: + self.resultbox.append(' '.join(args)) + self.resultbox.append('') + + self.process = QProcess() + if environment: + env = QProcessEnvironment.systemEnvironment() + for key, value in environment.items(): + env.insert(key, value) + self.process.setProcessEnvironment(env) + + self.process.finished.connect(self.__procFinished) + self.process.readyReadStandardOutput.connect(self.__readStdout) + self.process.readyReadStandardError.connect(self.__readStderr) + + if workingDir: + self.process.setWorkingDirectory(workingDir) + self.process.start('git', args) + procStarted = self.process.waitForStarted(5000) + if not procStarted: + self.buttonBox.setFocus() + self.inputGroup.setEnabled(False) + E5MessageBox.critical( + self, + self.tr('Process Generation Error'), + self.tr( + 'The process {0} could not be started. ' + 'Ensure, that it is in the search path.' + ).format('git')) + else: + self.inputGroup.setEnabled(True) + self.inputGroup.show() + return procStarted + + def normalExit(self): + """ + Public method to check for a normal process termination. + + @return flag indicating normal process termination (boolean) + """ + return self.normal + + def normalExitWithoutErrors(self): + """ + Public method to check for a normal process termination without + error messages. + + @return flag indicating normal process termination (boolean) + """ + return self.normal and self.errors.toPlainText() == "" + + def __readStdout(self): + """ + Private slot to handle the readyReadStandardOutput signal. + + It reads the output of the process, formats it and inserts it into + the contents pane. + """ + if self.process is not None: + s = str(self.process.readAllStandardOutput(), + Preferences.getSystem("IOEncoding"), + 'replace') + self.__showOutput(s) + + def __showOutput(self, out): + """ + Private slot to show some output. + + @param out output to be shown (string) + """ + self.resultbox.insertPlainText(out) + self.resultbox.ensureCursorVisible() + + # check for a changed project file + if self.__updateCommand: + for line in out.splitlines(): + if '.e4p' in line or '.e6p' in line: + self.__hasAddOrDelete = True + break + + QCoreApplication.processEvents() + + def __readStderr(self): + """ + Private slot to handle the readyReadStandardError signal. + + It reads the error output of the process and inserts it into the + error pane. + """ + if self.process is not None: + s = str(self.process.readAllStandardError(), + Preferences.getSystem("IOEncoding"), + 'replace') + self.__showError(s) + + def __showError(self, out): + """ + Private slot to show some error. + + @param out error to be shown (string) + """ + self.errorGroup.show() + self.errors.insertPlainText(out) + self.errors.ensureCursorVisible() + + QCoreApplication.processEvents() + + def on_passwordCheckBox_toggled(self, isOn): + """ + Private slot to handle the password checkbox toggled. + + @param isOn flag indicating the status of the check box (boolean) + """ + if isOn: + self.input.setEchoMode(QLineEdit.Password) + else: + self.input.setEchoMode(QLineEdit.Normal) + + @pyqtSlot() + def on_sendButton_clicked(self): + """ + Private slot to send the input to the git process. + """ + inputTxt = self.input.text() + inputTxt += os.linesep + + if self.passwordCheckBox.isChecked(): + self.errors.insertPlainText(os.linesep) + self.errors.ensureCursorVisible() + else: + self.errors.insertPlainText(inputTxt) + self.errors.ensureCursorVisible() + + self.process.write(strToQByteArray(inputTxt)) + + self.passwordCheckBox.setChecked(False) + self.input.clear() + + def on_input_returnPressed(self): + """ + Private slot to handle the press of the return key in the input field. + """ + self.intercept = True + self.on_sendButton_clicked() + + def keyPressEvent(self, evt): + """ + Protected slot to handle a key press event. + + @param evt the key press event (QKeyEvent) + """ + if self.intercept: + self.intercept = False + evt.accept() + return + super(GitDialog, self).keyPressEvent(evt) + + def hasAddOrDelete(self): + """ + Public method to check, if the last action contained an add or delete. + + @return flag indicating the presence of an add or delete (boolean) + """ + return self.__hasAddOrDelete
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,154 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitDialog</class> + <widget class="QDialog" name="GitDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>593</width> + <height>499</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout"> + <item> + <widget class="QGroupBox" name="outputGroup"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>2</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Output</string> + </property> + <layout class="QVBoxLayout"> + <item> + <widget class="QTextEdit" name="resultbox"> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="acceptRichText"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QLabel" name="statusLabel"/> + </item> + <item> + <widget class="QGroupBox" name="errorGroup"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Errors</string> + </property> + <layout class="QVBoxLayout"> + <item> + <widget class="QTextEdit" name="errors"> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="acceptRichText"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="inputGroup"> + <property name="title"> + <string>Input</string> + </property> + <layout class="QGridLayout"> + <item row="1" column="1"> + <spacer> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>327</width> + <height>29</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="2"> + <widget class="QPushButton" name="sendButton"> + <property name="toolTip"> + <string>Press to send the input to the git process</string> + </property> + <property name="text"> + <string>&Send</string> + </property> + <property name="shortcut"> + <string>Alt+S</string> + </property> + </widget> + </item> + <item row="0" column="0" colspan="3"> + <widget class="QLineEdit" name="input"> + <property name="toolTip"> + <string>Enter data to be sent to the git process</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QCheckBox" name="passwordCheckBox"> + <property name="toolTip"> + <string>Select to switch the input field to password mode</string> + </property> + <property name="text"> + <string>&Password Mode</string> + </property> + <property name="shortcut"> + <string>Alt+P</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close</set> + </property> + </widget> + </item> + </layout> + </widget> + <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> + <tabstops> + <tabstop>resultbox</tabstop> + <tabstop>errors</tabstop> + <tabstop>input</tabstop> + <tabstop>passwordCheckBox</tabstop> + <tabstop>sendButton</tabstop> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections/> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitDiffDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,373 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to show the output of the git diff command +process. +""" + +from __future__ import unicode_literals +try: + str = unicode +except NameError: + pass + +from PyQt5.QtCore import pyqtSlot, QFileInfo, Qt +from PyQt5.QtGui import QTextCursor, QCursor +from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QApplication + +from E5Gui import E5MessageBox, E5FileDialog +from E5Gui.E5Application import e5App + +from .Ui_GitDiffDialog import Ui_GitDiffDialog + +from .GitDiffHighlighter import GitDiffHighlighter +from .GitDiffGenerator import GitDiffGenerator + +import Utilities +import Preferences + + +class GitDiffDialog(QWidget, Ui_GitDiffDialog): + """ + Class implementing a dialog to show the output of the git diff command + process. + """ + def __init__(self, vcs, parent=None): + """ + Constructor + + @param vcs reference to the vcs object + @param parent parent widget (QWidget) + """ + super(GitDiffDialog, self).__init__(parent) + self.setupUi(self) + + self.refreshButton = self.buttonBox.addButton( + self.tr("Refresh"), QDialogButtonBox.ActionRole) + self.refreshButton.setToolTip( + self.tr("Press to refresh the display")) + self.refreshButton.setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Save).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) + + try: + # insert the search widget if it is available + from E5Gui.E5TextEditSearchWidget import E5TextEditSearchWidget + self.searchWidget = E5TextEditSearchWidget(self.contentsGroup) + self.searchWidget.setFocusPolicy(Qt.WheelFocus) + self.searchWidget.setObjectName("searchWidget") + self.contentsGroup.layout().insertWidget(1, self.searchWidget) + self.searchWidget.attachTextEdit(self.contents) + + self.searchWidget2 = E5TextEditSearchWidget(self.contentsGroup) + self.searchWidget2.setFocusPolicy(Qt.WheelFocus) + self.searchWidget2.setObjectName("searchWidget2") + self.contentsGroup.layout().addWidget(self.searchWidget2) + self.searchWidget2.attachTextEdit(self.contents2) + + self.setTabOrder(self.filesCombo, self.searchWidget) + self.setTabOrder(self.searchWidget, self.contents) + self.setTabOrder(self.contents, self.contents2) + self.setTabOrder(self.contents2, self.searchWidget2) + self.setTabOrder(self.searchWidget2, self.errors) + except ImportError: + # eric6 version without search widget + self.searchWidget = None + self.searchWidget2 = None + + self.vcs = vcs + + font = Preferences.getEditorOtherFonts("MonospacedFont") + self.contents.setFontFamily(font.family()) + self.contents.setFontPointSize(font.pointSize()) + self.contents2.setFontFamily(font.family()) + self.contents2.setFontPointSize(font.pointSize()) + + self.highlighter = GitDiffHighlighter(self.contents.document()) + self.highlighter2 = GitDiffHighlighter(self.contents2.document()) + + self.__diffGenerator = GitDiffGenerator(vcs, self) + self.__diffGenerator.finished.connect(self.__generatorFinished) + + self.__modeMessages = { + "work2stage": self.tr("Working Tree to Staging Area"), + "stage2repo": self.tr("Staging Area to HEAD Commit"), + "work2repo": self.tr("Working Tree to HEAD Commit"), + "work2stage2repo": self.tr("Working to Staging (top)" + " and Staging to HEAD (bottom)"), + "stash": self.tr("Stash Contents"), + "stashName": self.tr("Stash Contents of {0}"), + } + + def closeEvent(self, e): + """ + Protected slot implementing a close event handler. + + @param e close event (QCloseEvent) + """ + self.__diffGenerator.stopProcesses() + e.accept() + + def start(self, fn, versions=None, diffMode="work2repo", stashName="", + refreshable=False): + """ + Public slot to start the git diff command. + + @param fn filename to be diffed (string) + @param versions list of versions to be diffed (list of up to 2 strings + or None) + @param diffMode indication for the type of diff to be performed ( + 'work2repo' compares the working tree with the HEAD commit, + 'work2stage' compares the working tree with the staging area, + 'stage2repo' compares the staging area with the HEAD commit, + 'work2stage2repo' compares the working tree with the staging area + and the staging area with the HEAD commit, + 'stash' shows the diff for a stash) + @param stashName name of the stash to show a diff for (string) + @param refreshable flag indicating a refreshable diff (boolean) + """ + assert diffMode in ["work2repo", "work2stage", "stage2repo", + "work2stage2repo", "stash"] + + self.refreshButton.setVisible(refreshable) + + self.__filename = fn + self.__diffMode = diffMode + + self.errorGroup.hide() + + self.contents.clear() + self.contents2.clear() + self.contents2.setVisible(diffMode == "work2stage2repo") + if self.searchWidget2: + self.searchWidget2.setVisible(diffMode == "work2stage2repo") + + self.filesCombo.clear() + + try: + self.highlighter.regenerateRules() + self.highlighter2.regenerateRules() + except AttributeError: + # backward compatibility + pass + + if diffMode in ["work2repo", "work2stage", "stage2repo", + "work2stage2repo"]: + self.contentsGroup.setTitle( + self.tr("Difference ({0})") + .format(self.__modeMessages[diffMode])) + + if versions is not None: + self.raise_() + self.activateWindow() + elif diffMode == "stash": + if stashName: + msg = self.__modeMessages["stashName"].format(stashName) + else: + msg = self.__modeMessages["stash"] + self.contentsGroup.setTitle( + self.tr("Difference ({0})").format(msg)) + + QApplication.setOverrideCursor(QCursor(Qt.WaitCursor)) + procStarted = self.__diffGenerator.start( + fn, versions=versions, diffMode=diffMode, stashName=stashName) + if not procStarted: + QApplication.restoreOverrideCursor() + E5MessageBox.critical( + self, + self.tr('Process Generation Error'), + self.tr( + 'The process {0} could not be started. ' + 'Ensure, that it is in the search path.' + ).format('git')) + return + + def __generatorFinished(self): + """ + Private slot connected to the finished signal. + """ + QApplication.restoreOverrideCursor() + self.refreshButton.setEnabled(True) + + diff1, diff2, errors, fileSeparators = self.__diffGenerator.getResult() + + if diff1: + self.contents.setPlainText("".join(diff1)) + else: + self.contents.setPlainText( + self.tr('There is no difference.')) + + if diff2: + self.contents2.setPlainText("".join(diff2)) + else: + self.contents2.setPlainText( + self.tr('There is no difference.')) + + if errors: + self.errorGroup.show() + self.errors.setPlainText(errors) + self.errors.ensureCursorVisible() + + self.buttonBox.button(QDialogButtonBox.Save).setEnabled(bool(diff2)) + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) + self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) + self.buttonBox.button(QDialogButtonBox.Close).setFocus( + Qt.OtherFocusReason) + + for contents in [self.contents, self.contents2]: + tc = contents.textCursor() + tc.movePosition(QTextCursor.Start) + contents.setTextCursor(tc) + contents.ensureCursorVisible() + + fileSeparators = self.__mergeFileSeparators(fileSeparators) + self.filesCombo.addItem(self.tr("<Start>"), (0, 0)) + self.filesCombo.addItem(self.tr("<End>"), (-1, -1)) + for oldFile, newFile, pos1, pos2 in sorted(fileSeparators): + if oldFile != newFile: + self.filesCombo.addItem( + "{0} -- {1}".format(oldFile, newFile), (pos1, pos2)) + else: + self.filesCombo.addItem(oldFile, (pos1, pos2)) + + def __mergeFileSeparators(self, fileSeparators): + """ + Private method to merge the file separator entries. + + @param fileSeparators list of file separator entries to be merged + @return merged list of file separator entries + """ + separators = {} + for oldFile, newFile, pos1, pos2 in sorted(fileSeparators): + if (oldFile, newFile) not in separators: + separators[(oldFile, newFile)] = [oldFile, newFile, pos1, pos2] + else: + if pos1 != -2: + separators[(oldFile, newFile)][2] = pos1 + if pos2 != -2: + separators[(oldFile, newFile)][3] = pos2 + return list(separators.values()) + + def on_buttonBox_clicked(self, button): + """ + Private slot called by a button of the button box clicked. + + @param button button that was clicked (QAbstractButton) + """ + if button == self.buttonBox.button(QDialogButtonBox.Save): + self.on_saveButton_clicked() + elif button == self.refreshButton: + self.on_refreshButton_clicked() + + @pyqtSlot(int) + def on_filesCombo_activated(self, index): + """ + Private slot to handle the selection of a file. + + @param index activated row (integer) + """ + para1, para2 = self.filesCombo.itemData(index) + + for para, contents in [(para1, self.contents), + (para2, self.contents2)]: + if para == 0: + tc = contents.textCursor() + tc.movePosition(QTextCursor.Start) + contents.setTextCursor(tc) + contents.ensureCursorVisible() + elif para == -1: + tc = contents.textCursor() + tc.movePosition(QTextCursor.End) + contents.setTextCursor(tc) + contents.ensureCursorVisible() + else: + # step 1: move cursor to end + tc = contents.textCursor() + tc.movePosition(QTextCursor.End) + contents.setTextCursor(tc) + contents.ensureCursorVisible() + + # step 2: move cursor to desired line + tc = contents.textCursor() + delta = tc.blockNumber() - para + tc.movePosition(QTextCursor.PreviousBlock, + QTextCursor.MoveAnchor, + delta) + contents.setTextCursor(tc) + contents.ensureCursorVisible() + + @pyqtSlot() + def on_saveButton_clicked(self): + """ + Private slot to handle the Save button press. + + It saves the diff shown in the dialog to a file in the local + filesystem. + """ + if isinstance(self.__filename, list): + if len(self.__filename) > 1: + fname = self.vcs.splitPathList(self.__filename)[0] + else: + dname, fname = self.vcs.splitPath(self.__filename[0]) + if fname != '.': + fname = "{0}.diff".format(self.__filename[0]) + else: + fname = dname + else: + fname = self.vcs.splitPath(self.__filename)[0] + + fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter( + self, + self.tr("Save Diff"), + fname, + self.tr("Patch Files (*.diff)"), + None, + E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite)) + + if not fname: + return # user aborted + + ext = QFileInfo(fname).suffix() + if not ext: + ex = selectedFilter.split("(*")[1].split(")")[0] + if ex: + fname += ex + if QFileInfo(fname).exists(): + res = E5MessageBox.yesNo( + self, + self.tr("Save Diff"), + self.tr("<p>The patch file <b>{0}</b> already exists." + " Overwrite it?</p>").format(fname), + icon=E5MessageBox.Warning) + if not res: + return + fname = Utilities.toNativeSeparators(fname) + + eol = e5App().getObject("Project").getEolString() + try: + f = open(fname, "w", encoding="utf-8", newline="") + f.write(eol.join(self.contents2.toPlainText().splitlines())) + f.write(eol) + f.close() + except IOError as why: + E5MessageBox.critical( + self, self.tr('Save Diff'), + self.tr( + '<p>The patch file <b>{0}</b> could not be saved.' + '<br>Reason: {1}</p>') + .format(fname, str(why))) + + @pyqtSlot() + def on_refreshButton_clicked(self): + """ + Private slot to refresh the display. + """ + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) + + self.buttonBox.button(QDialogButtonBox.Save).setEnabled(False) + self.refreshButton.setEnabled(False) + + self.start(self.__filename, diffMode=self.__diffMode, refreshable=True)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,138 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitDiffDialog</class> + <widget class="QWidget" name="GitDiffDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>749</width> + <height>646</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git Diff</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QGroupBox" name="contentsGroup"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>3</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Difference</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QComboBox" name="filesCombo"/> + </item> + <item> + <widget class="QSplitter" name="splitter"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <widget class="QTextEdit" name="contents"> + <property name="whatsThis"> + <string><b>Git Diff</b><p>This shows the output of the git diff command.</p></string> + </property> + <property name="lineWrapMode"> + <enum>QTextEdit::NoWrap</enum> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="tabStopWidth"> + <number>8</number> + </property> + <property name="acceptRichText"> + <bool>false</bool> + </property> + </widget> + <widget class="QTextEdit" name="contents2"> + <property name="whatsThis"> + <string><b>Git Diff</b><p>This shows the output of the git diff command (stage to repo) if the dialog was asked to show separate diffs.</p></string> + </property> + <property name="lineWrapMode"> + <enum>QTextEdit::NoWrap</enum> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="tabStopWidth"> + <number>8</number> + </property> + <property name="acceptRichText"> + <bool>false</bool> + </property> + </widget> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="errorGroup"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Errors</string> + </property> + <layout class="QVBoxLayout"> + <item> + <widget class="QTextEdit" name="errors"> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="acceptRichText"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Close|QDialogButtonBox::Save</set> + </property> + </widget> + </item> + </layout> + </widget> + <tabstops> + <tabstop>filesCombo</tabstop> + <tabstop>contents</tabstop> + <tabstop>contents2</tabstop> + <tabstop>errors</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>GitDiffDialog</receiver> + <slot>close()</slot> + <hints> + <hint type="sourcelabel"> + <x>197</x> + <y>624</y> + </hint> + <hint type="destinationlabel"> + <x>201</x> + <y>645</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitDiffGenerator.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,238 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a class to generate the output of the git diff command +process. +""" + +from __future__ import unicode_literals +try: + str = unicode +except NameError: + pass + +import os + +from PyQt5.QtCore import pyqtSignal, QProcess, QTimer, QObject + +import Preferences + + +class GitDiffGenerator(QObject): + """ + Class implementing the generation of output of the git diff command. + + @signal finished() emitted when all processes have finished + """ + finished = pyqtSignal() + + def __init__(self, vcs, parent=None): + """ + Constructor + + @param vcs reference to the vcs object + @param parent parent widget (QWidget) + """ + super(GitDiffGenerator, self).__init__(parent) + + self.vcs = vcs + + self.process = QProcess() + self.process.finished.connect(self.__procFinished) + self.process.readyReadStandardOutput.connect(self.__readStdout) + self.process.readyReadStandardError.connect(self.__readStderr) + + self.process2 = QProcess() + self.process2.finished.connect(self.__procFinished) + self.process2.readyReadStandardOutput.connect(self.__readStdout) + self.process2.readyReadStandardError.connect(self.__readStderr) + + def stopProcesses(self): + """ + Public slot to stop the diff processes. + """ + for process in [self.process, self.process2]: + if process is not None and \ + process.state() != QProcess.NotRunning: + process.terminate() + QTimer.singleShot(2000, process.kill) + process.waitForFinished(3000) + + def start(self, fn, versions=None, diffMode="work2repo", stashName=""): + """ + Public slot to start the git diff command. + + @param fn filename to be diffed (string) + @param versions list of versions to be diffed (list of up to 2 strings + or None) + @param diffMode indication for the type of diff to be performed ( + 'work2repo' compares the working tree with the HEAD commit, + 'work2stage' compares the working tree with the staging area, + 'stage2repo' compares the staging area with the HEAD commit, + 'work2stage2repo' compares the working tree with the staging area + and the staging area with the HEAD commit, + 'stash' shows the diff for a stash) + @param stashName name of the stash to show a diff for (string) + @return flag indicating the start status (boolean) + """ + assert diffMode in ["work2repo", "work2stage", "stage2repo", + "work2stage2repo", "stash"] + + self.__output1 = [] + self.__output2 = [] + self.__errors = [] + self.__fileSeparators = [] + args2 = [] + + self.__ioEncoding = Preferences.getSystem("IOEncoding") + + if diffMode in ["work2repo", "work2stage", "stage2repo", + "work2stage2repo"]: + args = self.vcs.initCommand("diff") + args.append("--patch") + args.append("--find-copies-harder") + + if versions is not None: + for version in versions: + if version: + args.append(version) + else: + if diffMode == "work2stage2repo": + args2 = args[:] + args2.append("--cached") + args2.append("--") + elif diffMode == "stage2repo": + args.append("--cached") + elif diffMode == "work2repo": + args.append("HEAD") + + args.append("--") + if isinstance(fn, list): + dname, fnames = self.vcs.splitPathList(fn) + self.vcs.addArguments(args, fn) + if args2: + self.vcs.addArguments(args2, fn) + else: + dname, fname = self.vcs.splitPath(fn) + args.append(fn) + if args2: + args2.append(fn) + elif diffMode == "stash": + dname, fname = self.vcs.splitPath(fn) + args = self.vcs.initCommand("stash") + args.append("show") + args.append("--patch") + if stashName: + args.append(stashName) + + # find the root of the repo + repodir = dname + while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): + repodir = os.path.dirname(repodir) + if os.path.splitdrive(repodir)[1] == os.sep: + return False + + self.process.kill() + self.process.setWorkingDirectory(repodir) + self.process.start('git', args) + procStarted = self.process.waitForStarted(5000) + if not procStarted: + return False + + if diffMode == "work2stage2repo": + self.process2.kill() + self.process2.setWorkingDirectory(repodir) + self.process2.start('git', args2) + procStarted = self.process2.waitForStarted(5000) + if not procStarted: + return False + + return True + + def __procFinished(self, exitCode, exitStatus): + """ + Private slot connected to the finished signal. + + @param exitCode exit code of the process (integer) + @param exitStatus exit status of the process (QProcess.ExitStatus) + """ + if self.process.state() == QProcess.NotRunning and \ + self.process2.state() == QProcess.NotRunning: + self.finished.emit() + + def getResult(self): + """ + Public method to return the result data. + + @return tuple of lists of string containing lines of the diff, the diff + between stage and repo for 'work2stage2repo' mode (empty + otherwise), the list of errors and a list of tuples of filenames + and the line into the diff output. + """ + return (self.__output1, self.__output2, self.__errors, + self.__fileSeparators) + + def __processFileLine(self, line, isTopDiff): + """ + Private slot to process a line giving the old/new file. + + @param line line to be processed (string) + @param isTopDiff flag indicating to show the output in the top + output widget (boolean) + """ + prefix, filenames = line.split(" a/", 1) + oldFile, newFile = filenames.split(" b/", 1) + if isTopDiff: + self.__fileSeparators.append((oldFile.strip(), newFile.strip(), + len(self.__output1), -2)) + else: + self.__fileSeparators.append((oldFile.strip(), newFile.strip(), + -2, len(self.__output2))) + + def __processLine(self, line, isTopDiff): + """ + Private method to process one line of output. + + @param line output line to process (string) + @param isTopDiff flag indicating to show the output in the top + output widget (boolean) + """ + if line.startswith("diff --git"): + self.__processFileLine(line, isTopDiff) + + if isTopDiff: + self.__output1.append(line) + else: + self.__output2.append(line) + + def __readStdout(self): + """ + Private slot to handle the readyReadStandardOutput signal. + + It reads the output of the process, formats it and inserts it into + the contents pane. + """ + process = self.sender() + process.setReadChannel(QProcess.StandardOutput) + + isTopDiff = process == self.process + + while process.canReadLine(): + line = str(process.readLine(), self.__ioEncoding, + 'replace') + self.__processLine(line, isTopDiff) + + def __readStderr(self): + """ + Private slot to handle the readyReadStandardError signal. + + It reads the error output of the process and inserts it into the + error pane. + """ + if self.process is not None: + s = str(self.process.readAllStandardError(), + self.__ioEncoding, 'replace') + self.__errors.append(s)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitDiffHighlighter.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,244 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2015 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a syntax highlighter for diff outputs. +""" + +from __future__ import unicode_literals + +import re + +from PyQt5.QtGui import QSyntaxHighlighter, QColor, QTextCharFormat, QFont + +import Preferences + +try: + from E5Gui.E5GenericDiffHighlighter import TERMINAL, \ + E5GenericDiffHighlighter +except ImportError: + def TERMINAL(pattern): + """ + Function to mark a pattern as the final one to search for. + + @param pattern pattern to be marked (string) + @return marked pattern (string) + """ + return "__TERMINAL__:{0}".format(pattern) + + # Cache the results of re.compile for performance reasons + _REGEX_CACHE = {} + + class E5GenericDiffHighlighter(QSyntaxHighlighter): + """ + Class implementing a generic diff highlighter. + """ + def __init__(self, doc): + """ + Constructor + + @param doc reference to the text document (QTextDocument) + """ + super(E5GenericDiffHighlighter, self).__init__(doc) + + self.textColor = QColor(0, 0, 0) + self.addedColor = QColor(190, 237, 190) + self.removedColor = QColor(237, 190, 190) + self.replacedColor = QColor(190, 190, 237) + self.contextColor = QColor(255, 220, 168) + self.headerColor = QColor(237, 237, 190) + + self.normalFormat = self.makeFormat() + + self._rules = [] + self.generateRules() + + def generateRules(self): + """ + Public method to generate the rule set. + + Note: This method must me implemented by derived syntax + highlighters. + """ + pass + + def createRules(self, *rules): + """ + Public method to create the highlighting rules. + + @param rules set of highlighting rules (list of tuples of rule + pattern (string) and highlighting format (QTextCharFormat)) + """ + for idx, ruleFormat in enumerate(rules): + rule, formats = ruleFormat + terminal = rule.startswith(TERMINAL('')) + if terminal: + rule = rule[len(TERMINAL('')):] + try: + regex = _REGEX_CACHE[rule] + except KeyError: + regex = _REGEX_CACHE[rule] = re.compile(rule) + self._rules.append((regex, formats, terminal)) + + def formats(self, line): + """ + Public method to determine the highlighting formats for a line of + text. + + @param line text line to be highlighted (string) + @return list of matched highlighting rules (list of tuples of match + object and format (QTextCharFormat)) + """ + matched = [] + for rx, formats, terminal in self._rules: + match = rx.match(line) + if not match: + continue + matched.append([match, formats]) + if terminal: + return matched + + return matched + + def makeFormat(self, fg=None, bg=None, bold=False): + """ + Public method to generate a format definition. + + @param fg foreground color (QColor) + @param bg background color (QColor) + @param bold flag indicating bold text (boolean) + @return format definiton (QTextCharFormat) + """ + font = Preferences.getEditorOtherFonts("MonospacedFont") + charFormat = QTextCharFormat() + charFormat.setFontFamily(font.family()) + charFormat.setFontPointSize(font.pointSize()) + + if fg: + charFormat.setForeground(fg) + + if bg: + charFormat.setBackground(bg) + + if bold: + charFormat.setFontWeight(QFont.Bold) + + return charFormat + + def highlightBlock(self, text): + """ + Public method to highlight a block of text. + + @param text text to be highlighted (string) + """ + formats = self.formats(text) + if not formats: + # nothing matched + self.setFormat(0, len(text), self.normalFormat) + return + + for match, charFormat in formats: + start = match.start() + groups = match.groups() + + # No groups in the regex, assume this is a single rule + # that spans the entire line + if not groups: + self.setFormat(0, len(text), charFormat) + continue + + # Groups exist, rule is a tuple corresponding to group + for groupIndex, group in enumerate(groups): + if not group: + # empty match + continue + + # allow None as a no-op format + length = len(group) + if charFormat[groupIndex]: + self.setFormat(start, start + length, + charFormat[groupIndex]) + start += length + + +class GitDiffHighlighter(E5GenericDiffHighlighter): + """ + Class implementing a diff highlighter for Git. + """ + def __init__(self, doc, whitespace=True): + """ + Constructor + + @param doc reference to the text document (QTextDocument) + @param whitespace flag indicating to highlight whitespace + at the end of a line (boolean) + """ + self.whitespace = whitespace + + super(GitDiffHighlighter, self).__init__(doc) + + def generateRules(self): + """ + Public method to generate the rule set. + """ + diffHeader = self.makeFormat(fg=self.textColor, + bg=self.headerColor) + diffHeaderBold = self.makeFormat(fg=self.textColor, + bg=self.headerColor, + bold=True) + diffContext = self.makeFormat(fg=self.textColor, + bg=self.contextColor) + + diffAdded = self.makeFormat(fg=self.textColor, + bg=self.addedColor) + diffRemoved = self.makeFormat(fg=self.textColor, + bg=self.removedColor) + + if self.whitespace: + try: + badWhitespace = self.makeFormat(fg=self.textColor, + bg=self.whitespaceColor) + except AttributeError: + badWhitespace = self.makeFormat(fg=self.textColor, + bg=QColor(255, 0, 0, 192)) + + # We specify the whitespace rule last so that it is + # applied after the diff addition/removal rules. + diffOldRegex = TERMINAL(r'^--- ') + diffNewRegex = TERMINAL(r'^\+\+\+ ') + diffContextRegex = TERMINAL(r'^@@ ') + + diffHeader1Regex = TERMINAL(r'^diff --git a/.*b/.*') + diffHeader2Regex = TERMINAL(r'^index \S+\.\.\S+') + diffHeader3Regex = TERMINAL(r'^new file mode') + diffHeader4Regex = TERMINAL(r'^deleted file mode') + + diffAddedRegex = TERMINAL(r'^\+') + diffRemovedRegex = TERMINAL(r'^-') + diffBarRegex = TERMINAL(r'^([ ]+.*)(\|[ ]+\d+[ ]+[+-]+)$') + diffStsRegex = (r'(.+\|.+?)(\d+)(.+?)([\+]*?)([-]*?)$') + diffSummaryRegex = (r'(\s+\d+ files changed[^\d]*)' + r'(:?\d+ insertions[^\d]*)' + r'(:?\d+ deletions.*)$') + + if self.whitespace: + self.createRules((r'(..*?)(\s+)$', (None, badWhitespace))) + self.createRules((diffOldRegex, diffRemoved), + (diffNewRegex, diffAdded), + (diffContextRegex, diffContext), + (diffBarRegex, (diffHeaderBold, diffHeader)), + (diffHeader1Regex, diffHeader), + (diffHeader2Regex, diffHeader), + (diffHeader3Regex, diffHeader), + (diffHeader4Regex, diffHeader), + (diffAddedRegex, diffAdded), + (diffRemovedRegex, diffRemoved), + (diffStsRegex, (None, diffHeader, + None, diffHeader, + diffHeader)), + (diffSummaryRegex, (diffHeader, + diffHeader, + diffHeader)) + )
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitDiffParser.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,242 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2015 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a class to store and parse diff output. +""" + +from __future__ import unicode_literals + +import re +import os + + +class GitDiffParser(object): + """ + Class implementing a class to store and parse diff output. + """ + HunkHeaderRegexp = re.compile(r'^@@ -([0-9,]+) \+([0-9,]+) @@(.*)', + re.DOTALL) + + def __init__(self, diff): + """ + Constructor + + @param diff output of the diff command (list of string) + """ + self.__diff = diff[:] + + self.__headerLines = [] + self.__hunks = [] + self.__parsed = False + # diff parsing is done on demand + + def __initHunk(self): + """ + Private method to initialize a hunk data structure. + + @return hunk data structure (dictionary) + """ + hunk = { + "start": -1, + "end": -1, + "lines": [], + "oldStart": -1, + "oldCount": -1, + "newStart": -1, + "newCount": -1, + "heading": "", + } + return hunk + + def __parseRange(self, headerRange): + """ + Private method to parse the hunk header range part. + + @param headerRange hunk header range (string) + @return tuple of hunk start and hunk length (integer, integer) + """ + if ',' in headerRange: + begin, end = headerRange.split(',', 1) + return int(begin), int(end) + else: + return int(headerRange), 1 + + def __parseDiff(self): + """ + Private method to parse the diff output. + + @exception AssertionError raised when a malformed hunk header is + encountered + """ + if not self.__parsed: + # step 1: extract the diff header + for line in self.__diff: + if not line.startswith("@@ "): + self.__headerLines.append(line) + else: + break + + # step 2: break the rest into diff hunks + for lineIdx, line in enumerate( + self.__diff[len(self.__headerLines):]): + # disect the hunk header line + m = self.HunkHeaderRegexp.match(line) + if m: + self.__hunks.append(self.__initHunk()) + self.__hunks[-1]["start"] = lineIdx + (self.__hunks[-1]["oldStart"], + self.__hunks[-1]["oldCount"]) = \ + self.__parseRange(m.group(1)) + (self.__hunks[-1]["newStart"], + self.__hunks[-1]["newCount"]) = \ + self.__parseRange(m.group(2)) + self.__hunks[-1]["heading"] = m.group(3) + elif not self.__hunks: + raise AssertionError("Malformed hunk header: '{0}'" + .format(line)) + self.__hunks[-1]["lines"].append(line) + # step 3: calculate hunk end lines + for hunk in self.__hunks: + hunk["end"] = hunk["start"] + len(hunk["lines"]) - 1 + + def __generateRange(self, start, count): + """ + Private method to generate a hunk header range. + + @param start start line (integer) + @param count line count (integer) + @return hunk header range (string) + """ + if count == 1: + return "{0}".format(start) + else: + return "{0},{1}".format(start, count) + + def __generateHunkHeader(self, oldStart, oldCount, newStart, newCount, + heading=os.linesep): + """ + Private method to generate a hunk header line. + + @param oldStart start line of the old part (integer) + @param oldCount line count of the old part (integer) + @param newStart start line of the new part (integer) + @param newCount line count of the new part (integer) + @param heading hunk heading (string) + @return hunk header (string) + """ + return "@@ -{0} +{1} @@{2}".format( + self.__generateRange(oldStart, oldCount), + self.__generateRange(newStart, newCount), + heading) + + def headerLength(self): + """ + Public method to get the header length. + + @return length of the header (integer) + """ + self.__parseDiff() + return len(self.__headerLines) + + def createHunkPatch(self, lineIndex): + """ + Public method to create a hunk based patch. + + @param lineIndex line number of the hunk (integer) + @return diff lines of the patch (string) + """ + self.__parseDiff() + + patch = self.__headerLines[:] + for hunk in self.__hunks: + if hunk["start"] <= lineIndex <= hunk["end"]: + patch.extend(hunk["lines"]) + break + + return "".join(patch) + + def createLinesPatch(self, startIndex, endIndex, reverse=False): + """ + Public method to create a selected lines based patch. + + @param startIndex start line number (integer) + @param endIndex end line number (integer) + @param reverse flag indicating a reverse patch (boolean) + @return diff lines of the patch (string) + """ + self.__parseDiff() + + ADDITION = "+" + DELETION = "-" + CONTEXT = " " + NONEWLINE = "\\" + + patch = [] + startOffset = 0 + + for hunk in self.__hunks: + if hunk["end"] < startIndex: + # skip hunks before the selected lines + continue + + if hunk["start"] > endIndex: + # done, exit the loop + break + + counts = { + ADDITION: 0, + DELETION: 0, + CONTEXT: 0, + } + previousLineSkipped = False + processedLines = [] + + for lineIndex, line in enumerate(hunk["lines"][1:], + start=hunk["start"] + 1): + lineType = line[0] + lineContent = line[1:] + + if not (startIndex <= lineIndex <= endIndex): + if (not reverse and lineType == ADDITION) or \ + (reverse and lineType == DELETION): + previousLineSkipped = True + continue + + elif (not reverse and lineType == DELETION) or \ + (reverse and lineType == ADDITION): + lineType = CONTEXT + + if lineType == NONEWLINE and previousLineSkipped: + continue + + processedLines.append(lineType + lineContent) + counts[lineType] += 1 + previousLineSkipped = False + + # hunks consisting of pure context lines are excluded + if counts[ADDITION] == 0 and counts[DELETION] == 0: + continue + + oldCount = counts[CONTEXT] + counts[DELETION] + newCount = counts[CONTEXT] + counts[ADDITION] + oldStart = hunk["oldStart"] + newStart = oldStart + startOffset + if oldCount == 0: + newStart += 1 + if newCount == 0: + newStart -= 1 + + startOffset += counts[ADDITION] - counts[DELETION] + + patch.append(self.__generateHunkHeader(oldStart, oldCount, + newStart, newCount, + hunk["heading"])) + patch.extend(processedLines) + + if not patch: + return "" + else: + return "".join(self.__headerLines[:] + patch)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitFetchDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,189 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2015 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter data for a Fetch operation. +""" + +from __future__ import unicode_literals + +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox + +from .Ui_GitFetchDialog import Ui_GitFetchDialog + + +class GitFetchDialog(QDialog, Ui_GitFetchDialog): + """ + Class implementing a dialog to enter data for a Fetch operation. + """ + def __init__(self, vcs, repodir, parent=None): + """ + Constructor + + @param vcs reference to the git object + @param repodir directory name of the local repository (string) + @param parent reference to the parent widget (QWidget) + """ + super(GitFetchDialog, self).__init__(parent) + self.setupUi(self) + + self.__vcs = vcs + self.__repodir = repodir + + self.__all = self.tr("<All>") + self.__custom = self.tr("<Custom>") + + remoteUrlsList = self.__vcs.gitGetRemoteUrlsList(self.__repodir) + self.__repos = {name: url for name, url in remoteUrlsList} + + self.__okButton = self.buttonBox.button(QDialogButtonBox.Ok) + + self.remotesComboBox.addItems(sorted(self.__repos.keys())) + self.remotesComboBox.addItem(self.__all) + self.remotesComboBox.addItem(self.__custom) + + index = self.remotesComboBox.findText("origin") + if index == -1: + index = 0 + self.remotesComboBox.setCurrentIndex(index) + + localBranches = self.__vcs.gitGetBranchesList( + self.__repodir, withMaster=True) + self.localBranchComboBox.addItems([""] + sorted(localBranches)) + self.localBranchComboBox.setEnabled(False) + + def __okButtonEnable(self): + """ + Private slot to set the enabled state of the OK button. + """ + self.__okButton.setEnabled( + self.remoteBranchesList.count() > 0 or + self.remotesComboBox.currentText() == self.__all + ) + + def __updateButtonEnable(self): + """ + Private slot to set the enabled state of the update button. + """ + remote = self.remotesComboBox.currentText() + enable = remote != self.__all + if remote == self.__custom: + enable = self.remoteEdit.text() != "" + + self.updateButton.setEnabled(enable) + + @pyqtSlot(str) + def on_remotesComboBox_currentTextChanged(self, txt): + """ + Private slot to handle changes of the selected repository. + + @param txt current text of the combo box (string) + """ + self.remoteEdit.setReadOnly(txt != self.__custom) + self.remoteBranchesList.setEnabled(txt != self.__all) + self.remoteEdit.clear() + self.remoteBranchesList.clear() + self.__updateButtonEnable() + self.__okButtonEnable() + + if txt not in [self.__all, self.__custom]: + remoteBranches = self.__vcs.gitGetRemoteBranchesList( + self.__repodir, txt) + self.remoteBranchesList.addItems(sorted(remoteBranches)) + + if txt in self.__repos: + self.remoteEdit.setText(self.__repos[txt]) + + @pyqtSlot(str) + def on_remoteEdit_textChanged(self, txt): + """ + Private slot to handle changes of the URL edit. + + @param txt current text of the URL edit (string) + """ + self.__updateButtonEnable() + + if self.remotesComboBox.currentText() == self.__custom and \ + txt != "": + remoteBranches = self.__vcs.gitGetRemoteBranchesList( + self.__repodir, txt) + self.remoteBranchesList.clear() + self.remoteBranchesList.addItems(sorted(remoteBranches)) + + self.__okButtonEnable() + + @pyqtSlot() + def on_remoteBranchesList_itemSelectionChanged(self): + """ + Private slot to handle a change of selected remote branches. + """ + singleSelection = len(self.remoteBranchesList.selectedItems()) == 1 + self.localBranchComboBox.setEnabled(singleSelection) + if singleSelection: + txt = self.remoteBranchesList.selectedItems()[0].text() + else: + txt = "" + index = self.localBranchComboBox.findText(txt) + if index == -1: + self.localBranchComboBox.setEditText(txt) + else: + self.localBranchComboBox.setCurrentIndex(index) + + @pyqtSlot() + def on_updateButton_clicked(self): + """ + Private slot to update the list of remote branches. + """ + remote = self.remotesComboBox.currentText() + if remote == self.__all: + # shouldn't happen + return + + if remote == self.__custom: + remote = self.remoteEdit.text() + if remote == "": + # shouldn't happen either + return + + remoteBranches = self.__vcs.gitGetRemoteBranchesList( + self.__repodir, remote) + self.remoteBranchesList.clear() + self.remoteBranchesList.addItems(sorted(remoteBranches)) + + self.__okButtonEnable() + + def getData(self): + """ + Public method to get the entered data. + + @return tuple of remote name, remote url (for custom remotes), + remote branches, local branch, a flag indicating to fetch from + all repositories, a flag indicating to remove obsolete tracking + references and a flag indicating to fetch tags as well + (string, string, list of strings, string, boolean, boolean, + boolean) + """ + remote = "" + url = "" + remoteBranches = [] + allRepos = False + localBranch = "" + + remoteRepo = self.remotesComboBox.currentText() + if remoteRepo == self.__all: + allRepos = True + else: + if remoteRepo == self.__custom: + url = self.remoteEdit.text() + else: + remote = remoteRepo + for itm in self.remoteBranchesList.selectedItems(): + remoteBranches.append(itm.text()) + if len(remoteBranches) == 1: + localBranch = self.localBranchComboBox.currentText() + + return (remote, url, remoteBranches, localBranch, allRepos, + self.pruneCheckBox.isChecked(), self.tagsCheckBox.isChecked())
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,184 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitFetchDialog</class> + <widget class="QDialog" name="GitFetchDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>400</width> + <height>350</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git Fetch</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>Remote Repository:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QComboBox" name="remotesComboBox"> + <property name="toolTip"> + <string>Select the remote repository to fetch from</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLineEdit" name="remoteEdit"> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="2" column="0"> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Remote Branches:</string> + </property> + <property name="alignment"> + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="updateButton"> + <property name="toolTip"> + <string>Press to update the list of remote branches</string> + </property> + <property name="text"> + <string>Update</string> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item row="2" column="1"> + <widget class="QListWidget" name="remoteBranchesList"> + <property name="toolTip"> + <string>Select the remote branches to be fetched</string> + </property> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::ExtendedSelection</enum> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Local Branch:</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QComboBox" name="localBranchComboBox"> + <property name="toolTip"> + <string>Select the local branch to fetch into</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="4" column="0" colspan="2"> + <widget class="QCheckBox" name="pruneCheckBox"> + <property name="toolTip"> + <string>Select to remove non-existing tracking references </string> + </property> + <property name="text"> + <string>Prune obsolete tracking references</string> + </property> + </widget> + </item> + <item row="5" column="0" colspan="2"> + <widget class="QCheckBox" name="tagsCheckBox"> + <property name="toolTip"> + <string>Select to fetch tags as well</string> + </property> + <property name="text"> + <string>Include tags</string> + </property> + </widget> + </item> + <item row="6" 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> + <tabstops> + <tabstop>remotesComboBox</tabstop> + <tabstop>remoteEdit</tabstop> + <tabstop>remoteBranchesList</tabstop> + <tabstop>updateButton</tabstop> + <tabstop>localBranchComboBox</tabstop> + <tabstop>pruneCheckBox</tabstop> + <tabstop>tagsCheckBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>GitFetchDialog</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>GitFetchDialog</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/GitListDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,43 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to select from a list. +""" + +from __future__ import unicode_literals + +from PyQt5.QtWidgets import QDialog + +from .Ui_GitListDialog import Ui_GitListDialog + + +class GitListDialog(QDialog, Ui_GitListDialog): + """ + Class implementing a dialog to select from a list. + """ + def __init__(self, selections, parent=None): + """ + Constructor + + @param selections list of entries to select from (list of string) + @param parent reference to the parent widget (QWidget) + """ + super(GitListDialog, self).__init__(parent) + self.setupUi(self) + + self.selectionList.addItems(selections) + + def getSelection(self): + """ + Public method to return the selected entries. + + @return list of selected entries (list of string) + """ + selection = [] + for itm in self.selectionList.selectedItems(): + selection.append(itm.text()) + + return selection
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitListDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitListDialog</class> + <widget class="QDialog" name="GitListDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>400</width> + <height>300</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git Select</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Select from the list:</string> + </property> + </widget> + </item> + <item> + <widget class="QListWidget" name="selectionList"> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::ExtendedSelection</enum> + </property> + </widget> + </item> + <item> + <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> + <tabstops> + <tabstop>selectionList</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>GitListDialog</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>GitListDialog</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/GitLogBrowserDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,2338 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to browse the log history. +""" + +from __future__ import unicode_literals +try: + str = unicode +except NameError: + pass + +import os +import collections + +from PyQt5.QtCore import pyqtSlot, qVersion, Qt, QDate, QProcess, QTimer, \ + QRegExp, QSize, QPoint, QFileInfo +from PyQt5.QtGui import QCursor, QColor, QPixmap, QPainter, QPen, QIcon, \ + QTextCursor +from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QHeaderView, \ + QTreeWidgetItem, QApplication, QLineEdit, QMenu, QInputDialog, QToolTip + +from E5Gui.E5Application import e5App +from E5Gui import E5MessageBox, E5FileDialog + +from .Ui_GitLogBrowserDialog import Ui_GitLogBrowserDialog + +from .GitDiffHighlighter import GitDiffHighlighter +from .GitDiffGenerator import GitDiffGenerator +from .GitUtilities import strToQByteArray + +import UI.PixmapCache +import Preferences +import Utilities + +COLORNAMES = ["red", "green", "purple", "cyan", "olive", "magenta", + "gray", "yellow", "darkred", "darkgreen", "darkblue", + "darkcyan", "darkmagenta", "blue"] +COLORS = [str(QColor(x).name()) for x in COLORNAMES] + + +class GitLogBrowserDialog(QWidget, Ui_GitLogBrowserDialog): + """ + Class implementing a dialog to browse the log history. + """ + IconColumn = 0 + CommitIdColumn = 1 + AuthorColumn = 2 + DateColumn = 3 + CommitterColumn = 4 + CommitDateColumn = 5 + SubjectColumn = 6 + BranchColumn = 7 + TagsColumn = 8 + + def __init__(self, vcs, parent=None): + """ + Constructor + + @param vcs reference to the vcs object + @param parent parent widget (QWidget) + """ + super(GitLogBrowserDialog, self).__init__(parent) + self.setupUi(self) + + windowFlags = self.windowFlags() + windowFlags |= Qt.WindowContextHelpButtonHint + self.setWindowFlags(windowFlags) + + self.mainSplitter.setSizes([300, 400]) + self.mainSplitter.setStretchFactor(0, 1) + self.mainSplitter.setStretchFactor(1, 2) + self.diffSplitter.setStretchFactor(0, 1) + self.diffSplitter.setStretchFactor(1, 2) + + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) + + self.filesTree.headerItem().setText(self.filesTree.columnCount(), "") + self.filesTree.header().setSortIndicator(1, Qt.AscendingOrder) + + self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png")) + self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png")) + + self.refreshButton = self.buttonBox.addButton( + self.tr("&Refresh"), QDialogButtonBox.ActionRole) + self.refreshButton.setToolTip( + self.tr("Press to refresh the list of commits")) + self.refreshButton.setEnabled(False) + + self.findPrevButton.setIcon(UI.PixmapCache.getIcon("1leftarrow.png")) + self.findNextButton.setIcon(UI.PixmapCache.getIcon("1rightarrow.png")) + self.__findBackwards = False + + self.modeComboBox.addItem(self.tr("Find"), "find") + self.modeComboBox.addItem(self.tr("Filter"), "filter") + + self.fieldCombo.addItem(self.tr("Commit ID"), "commitId") + self.fieldCombo.addItem(self.tr("Author"), "author") + self.fieldCombo.addItem(self.tr("Committer"), "committer") + self.fieldCombo.addItem(self.tr("Subject"), "subject") + self.fieldCombo.addItem(self.tr("File"), "file") + + self.__logTreeNormalFont = self.logTree.font() + self.__logTreeNormalFont.setBold(False) + self.__logTreeBoldFont = self.logTree.font() + self.__logTreeBoldFont.setBold(True) + + font = Preferences.getEditorOtherFonts("MonospacedFont") + self.diffEdit.setFontFamily(font.family()) + self.diffEdit.setFontPointSize(font.pointSize()) + + self.diffHighlighter = GitDiffHighlighter(self.diffEdit.document()) + self.__diffGenerator = GitDiffGenerator(vcs, self) + self.__diffGenerator.finished.connect(self.__generatorFinished) + + self.vcs = vcs + + self.__detailsTemplate = self.tr( + "<table>" + "<tr><td><b>Commit ID</b></td><td>{0}</td></tr>" + "<tr><td><b>Date</b></td><td>{1}</td></tr>" + "<tr><td><b>Author</b></td><td>{2} <{3}></td></tr>" + "<tr><td><b>Commit Date</b></td><td>{4}</td></tr>" + "<tr><td><b>Committer</b></td><td>{5} <{6}></td></tr>" + "{7}" + "<tr><td><b>Subject</b></td><td>{8}</td></tr>" + "{9}" + "</table>" + ) + self.__parentsTemplate = self.tr( + "<tr><td><b>Parents</b></td><td>{0}</td></tr>" + ) + self.__childrenTemplate = self.tr( + "<tr><td><b>Children</b></td><td>{0}</td></tr>" + ) + self.__branchesTemplate = self.tr( + "<tr><td><b>Branches</b></td><td>{0}</td></tr>" + ) + self.__tagsTemplate = self.tr( + "<tr><td><b>Tags</b></td><td>{0}</td></tr>" + ) + self.__mesageTemplate = self.tr( + "<tr><td><b>Message</b></td><td>{0}</td></tr>" + ) + + self.__formatTemplate = ( + 'format:recordstart%n' + 'commit|%h%n' + 'parents|%p%n' + 'author|%an%n' + 'authormail|%ae%n' + 'authordate|%ai%n' + 'committer|%cn%n' + 'committermail|%ce%n' + 'committerdate|%ci%n' + 'refnames|%d%n' + 'subject|%s%n' + 'bodystart%n' + '%b%n' + 'bodyend%n' + ) + + self.__filename = "" + self.__isFile = False + self.__selectedCommitIDs = [] + self.intercept = False + + self.__initData() + + self.fromDate.setDisplayFormat("yyyy-MM-dd") + self.toDate.setDisplayFormat("yyyy-MM-dd") + self.__resetUI() + + # roles used in the log tree + self.__subjectRole = Qt.UserRole + self.__messageRole = Qt.UserRole + 1 + self.__changesRole = Qt.UserRole + 2 + self.__edgesRole = Qt.UserRole + 3 + self.__parentsRole = Qt.UserRole + 4 + self.__branchesRole = Qt.UserRole + 5 + self.__authorMailRole = Qt.UserRole + 6 + self.__committerMailRole = Qt.UserRole + 7 + + # roles used in the file tree + self.__diffFileLineRole = Qt.UserRole + + self.process = QProcess() + self.process.finished.connect(self.__procFinished) + self.process.readyReadStandardOutput.connect(self.__readStdout) + self.process.readyReadStandardError.connect(self.__readStderr) + + self.flags = { + 'A': self.tr('Added'), + 'D': self.tr('Deleted'), + 'M': self.tr('Modified'), + 'C': self.tr('Copied'), + 'R': self.tr('Renamed'), + 'T': self.tr('Type changed'), + 'U': self.tr('Unmerged'), + 'X': self.tr('Unknown'), + } + + self.__dotRadius = 8 + self.__rowHeight = 20 + + self.logTree.setIconSize( + QSize(100 * self.__rowHeight, self.__rowHeight)) + + self.detailsEdit.anchorClicked.connect(self.__commitIdClicked) + + self.__initLogTreeContextMenu() + self.__initActionsMenu() + + self.__finishCallbacks = [] + + def __addFinishCallback(self, callback): + """ + Private method to add a method to be called once the process finished. + + The callback methods are invoke in a FIFO style and are consumed. If + a callback method needs to be called again, it must be added again. + + @param callback callback method + @type function + """ + if callback not in self.__finishCallbacks: + self.__finishCallbacks.append(callback) + + def __initLogTreeContextMenu(self): + """ + Private method to initialize the log tree context menu. + """ + self.__logTreeMenu = QMenu() + + # commit ID column + act = self.__logTreeMenu.addAction( + self.tr("Show Commit ID Column")) + act.setToolTip(self.tr( + "Press to show the commit ID column")) + act.setCheckable(True) + act.setChecked(self.vcs.getPlugin().getPreferences( + "ShowCommitIdColumn")) + act.triggered.connect(self.__showCommitIdColumn) + + # author and date columns + act = self.__logTreeMenu.addAction( + self.tr("Show Author Columns")) + act.setToolTip(self.tr( + "Press to show the author columns")) + act.setCheckable(True) + act.setChecked(self.vcs.getPlugin().getPreferences( + "ShowAuthorColumns")) + act.triggered.connect(self.__showAuthorColumns) + + # committer and commit date columns + act = self.__logTreeMenu.addAction( + self.tr("Show Committer Columns")) + act.setToolTip(self.tr( + "Press to show the committer columns")) + act.setCheckable(True) + act.setChecked(self.vcs.getPlugin().getPreferences( + "ShowCommitterColumns")) + act.triggered.connect(self.__showCommitterColumns) + + # branches column + act = self.__logTreeMenu.addAction( + self.tr("Show Branches Column")) + act.setToolTip(self.tr( + "Press to show the branches column")) + act.setCheckable(True) + act.setChecked(self.vcs.getPlugin().getPreferences( + "ShowBranchesColumn")) + act.triggered.connect(self.__showBranchesColumn) + + # tags column + act = self.__logTreeMenu.addAction( + self.tr("Show Tags Column")) + act.setToolTip(self.tr( + "Press to show the Tags column")) + act.setCheckable(True) + act.setChecked(self.vcs.getPlugin().getPreferences( + "ShowTagsColumn")) + act.triggered.connect(self.__showTagsColumn) + + # set column visibility as configured + self.__showCommitIdColumn(self.vcs.getPlugin().getPreferences( + "ShowCommitIdColumn")) + self.__showAuthorColumns(self.vcs.getPlugin().getPreferences( + "ShowAuthorColumns")) + self.__showCommitterColumns(self.vcs.getPlugin().getPreferences( + "ShowCommitterColumns")) + self.__showBranchesColumn(self.vcs.getPlugin().getPreferences( + "ShowBranchesColumn")) + self.__showTagsColumn(self.vcs.getPlugin().getPreferences( + "ShowTagsColumn")) + + def __initActionsMenu(self): + """ + Private method to initialize the actions menu. + """ + self.__actionsMenu = QMenu() + self.__actionsMenu.setTearOffEnabled(True) + if qVersion() >= "5.1.0": + self.__actionsMenu.setToolTipsVisible(True) + else: + self.__actionsMenu.hovered.connect(self.__actionsMenuHovered) + + self.__cherryAct = self.__actionsMenu.addAction( + self.tr("Copy Commits"), self.__cherryActTriggered) + self.__cherryAct.setToolTip(self.tr( + "Cherry-pick the selected commits to the current branch")) + + self.__actionsMenu.addSeparator() + + self.__tagAct = self.__actionsMenu.addAction( + self.tr("Tag"), self.__tagActTriggered) + self.__tagAct.setToolTip(self.tr("Tag the selected commit")) + + self.__branchAct = self.__actionsMenu.addAction( + self.tr("Branch"), self.__branchActTriggered) + self.__branchAct.setToolTip(self.tr( + "Create a new branch at the selected commit.")) + self.__branchSwitchAct = self.__actionsMenu.addAction( + self.tr("Branch && Switch"), self.__branchSwitchActTriggered) + self.__branchSwitchAct.setToolTip(self.tr( + "Create a new branch at the selected commit and switch" + " the work tree to it.")) + + self.__switchAct = self.__actionsMenu.addAction( + self.tr("Switch"), self.__switchActTriggered) + self.__switchAct.setToolTip(self.tr( + "Switch the working directory to the selected commit")) + self.__actionsMenu.addSeparator() + + self.__shortlogAct = self.__actionsMenu.addAction( + self.tr("Show Short Log"), self.__shortlogActTriggered) + self.__shortlogAct.setToolTip(self.tr( + "Show a dialog with a log output for release notes")) + + self.__describeAct = self.__actionsMenu.addAction( + self.tr("Describe"), self.__describeActTriggered) + self.__describeAct.setToolTip(self.tr( + "Show the most recent tag reachable from a commit")) + + self.actionsButton.setIcon( + UI.PixmapCache.getIcon("actionsToolButton.png")) + self.actionsButton.setMenu(self.__actionsMenu) + + def __actionsMenuHovered(self, action): + """ + Private slot to show the tooltip for an action menu entry. + + @param action action to show tooltip for + @type QAction + """ + QToolTip.showText( + QCursor.pos(), action.toolTip(), + self.__actionsMenu, self.__actionsMenu.actionGeometry(action)) + + def __initData(self): + """ + Private method to (re-)initialize some data. + """ + self.__maxDate = QDate() + self.__minDate = QDate() + self.__filterLogsEnabled = True + + self.buf = [] # buffer for stdout + self.diff = None + self.__started = False + self.__skipEntries = 0 + self.projectMode = False + + # attributes to store log graph data + self.__commitIds = [] + self.__commitColors = {} + self.__commitColor = 0 + + self.__projectRevision = "" + + self.__childrenInfo = collections.defaultdict(list) + + def closeEvent(self, e): + """ + Protected slot implementing a close event handler. + + @param e close event (QCloseEvent) + """ + if self.process is not None and \ + self.process.state() != QProcess.NotRunning: + self.process.terminate() + QTimer.singleShot(2000, self.process.kill) + self.process.waitForFinished(3000) + + self.vcs.getPlugin().setPreferences( + "LogBrowserGeometry", self.saveGeometry()) + self.vcs.getPlugin().setPreferences( + "LogBrowserSplitterStates", [ + self.mainSplitter.saveState(), + self.detailsSplitter.saveState(), + self.diffSplitter.saveState(), + ] + ) + + e.accept() + + def show(self): + """ + Public slot to show the dialog. + """ + self.__reloadGeometry() + self.__restoreSplitterStates() + self.__resetUI() + + super(GitLogBrowserDialog, self).show() + + def __reloadGeometry(self): + """ + Private method to restore the geometry. + """ + geom = self.vcs.getPlugin().getPreferences("LogBrowserGeometry") + if geom.isEmpty(): + s = QSize(1000, 800) + self.resize(s) + else: + self.restoreGeometry(geom) + + def __restoreSplitterStates(self): + """ + Private method to restore the state of the various splitters. + """ + states = self.vcs.getPlugin().getPreferences( + "LogBrowserSplitterStates") + if len(states) == 3: + # we have three splitters + self.mainSplitter.restoreState(states[0]) + self.detailsSplitter.restoreState(states[1]) + self.diffSplitter.restoreState(states[2]) + + def __resetUI(self): + """ + Private method to reset the user interface. + """ + self.fromDate.setDate(QDate.currentDate()) + self.toDate.setDate(QDate.currentDate()) + self.fieldCombo.setCurrentIndex(self.fieldCombo.findData("subject")) + self.limitSpinBox.setValue(self.vcs.getPlugin().getPreferences( + "LogLimit")) + self.stopCheckBox.setChecked(self.vcs.getPlugin().getPreferences( + "StopLogOnCopy")) + + self.logTree.clear() + + def __resizeColumnsLog(self): + """ + Private method to resize the log tree columns. + """ + self.logTree.header().resizeSections(QHeaderView.ResizeToContents) + self.logTree.header().setStretchLastSection(True) + + def __resizeColumnsFiles(self): + """ + Private method to resize the changed files tree columns. + """ + self.filesTree.header().resizeSections(QHeaderView.ResizeToContents) + self.filesTree.header().setStretchLastSection(True) + + def __resortFiles(self): + """ + Private method to resort the changed files tree. + """ + self.filesTree.setSortingEnabled(True) + self.filesTree.sortItems(1, Qt.AscendingOrder) + self.filesTree.setSortingEnabled(False) + + def __getColor(self, n): + """ + Private method to get the (rotating) name of the color given an index. + + @param n color index (integer) + @return color name (string) + """ + return COLORS[n % len(COLORS)] + + def __generateEdges(self, commitId, parents): + """ + Private method to generate edge info for the give data. + + @param commitId commit id to calculate edge info for (string) + @param parents list of parent commits (list of strings) + @return tuple containing the column and color index for + the given node and a list of tuples indicating the edges + between the given node and its parents + (integer, integer, [(integer, integer, integer), ...]) + """ + if commitId not in self.__commitIds: + # new head + self.__commitIds.append(commitId) + self.__commitColors[commitId] = self.__commitColor + self.__commitColor += 1 + + col = self.__commitIds.index(commitId) + color = self.__commitColors.pop(commitId) + nextCommitIds = self.__commitIds[:] + + # add parents to next + addparents = [p for p in parents if p not in nextCommitIds] + nextCommitIds[col:col + 1] = addparents + + # set colors for the parents + for i, p in enumerate(addparents): + if not i: + self.__commitColors[p] = color + else: + self.__commitColors[p] = self.__commitColor + self.__commitColor += 1 + + # add edges to the graph + edges = [] + if parents: + for ecol, ecommitId in enumerate(self.__commitIds): + if ecommitId in nextCommitIds: + edges.append( + (ecol, nextCommitIds.index(ecommitId), + self.__commitColors[ecommitId])) + elif ecommitId == commitId: + for p in parents: + edges.append( + (ecol, nextCommitIds.index(p), + self.__commitColors[p])) + + self.__commitIds = nextCommitIds + return col, color, edges + + def __generateIcon(self, column, color, bottomedges, topedges, dotColor, + currentCommit): + """ + Private method to generate an icon containing the revision tree for the + given data. + + @param column column index of the revision (integer) + @param color color of the node (integer) + @param bottomedges list of edges for the bottom of the node + (list of tuples of three integers) + @param topedges list of edges for the top of the node + (list of tuples of three integers) + @param dotColor color to be used for the dot (QColor) + @param currentCommit flag indicating to draw the icon for the + current commit (boolean) + @return icon for the node (QIcon) + """ + def col2x(col, radius): + """ + Local function to calculate a x-position for a column. + + @param col column number (integer) + @param radius radius of the indicator circle (integer) + """ + return int(1.2 * radius) * col + radius // 2 + 3 + + radius = self.__dotRadius + w = len(bottomedges) * radius + 20 + h = self.__rowHeight + + dot_x = col2x(column, radius) - radius // 2 + dot_y = h // 2 + + pix = QPixmap(w, h) + pix.fill(QColor(0, 0, 0, 0)) + painter = QPainter(pix) + painter.setRenderHint(QPainter.Antialiasing) + + pen = QPen(Qt.blue) + pen.setWidth(2) + painter.setPen(pen) + + lpen = QPen(pen) + lpen.setColor(Qt.black) + painter.setPen(lpen) + + # draw the revision history lines + for y1, y2, lines in ((0, h, bottomedges), + (-h, 0, topedges)): + if lines: + for start, end, ecolor in lines: + lpen = QPen(pen) + lpen.setColor(QColor(self.__getColor(ecolor))) + lpen.setWidth(2) + painter.setPen(lpen) + x1 = col2x(start, radius) + x2 = col2x(end, radius) + painter.drawLine(x1, dot_y + y1, x2, dot_y + y2) + + penradius = 1 + pencolor = Qt.black + + dot_y = (h // 2) - radius // 2 + + # draw a dot for the revision + if currentCommit: + # enlarge dot for the current revision + delta = 2 + radius += 2 * delta + dot_y -= delta + dot_x -= delta + painter.setBrush(dotColor) + pen = QPen(pencolor) + pen.setWidth(penradius) + painter.setPen(pen) + painter.drawEllipse(dot_x, dot_y, radius, radius) + painter.end() + return QIcon(pix) + + def __identifyProject(self): + """ + Private method to determine the revision of the project directory. + """ + errMsg = "" + + args = self.vcs.initCommand("show") + args.append("--abbrev={0}".format( + self.vcs.getPlugin().getPreferences("CommitIdLength"))) + args.append("--format=%h") + args.append("--no-patch") + args.append("HEAD") + + output = "" + process = QProcess() + process.setWorkingDirectory(self.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') + else: + if not finished: + errMsg = self.tr( + "The git process did not finish within 30s.") + else: + errMsg = self.tr("Could not start the git executable.") + + if errMsg: + E5MessageBox.critical( + self, + self.tr("Git Error"), + errMsg) + + if output: + self.__projectRevision = output.strip() + + def __generateLogItem(self, author, date, committer, commitDate, subject, + message, commitId, changedPaths, parents, refnames, + authorMail, committerMail): + """ + Private method to generate a log tree entry. + + @param author author info (string) + @param date date info (string) + @param committer committer info (string) + @param commitDate commit date info (string) + @param subject subject of the log entry (string) + @param message text of the log message (list of strings) + @param commitId commit id info (string) + @param changedPaths list of dictionary objects containing + info about the changed files/directories + @param parents list of parent revisions (list of integers) + @param refnames tags and branches of the commit (string) + @param authorMail author's email address (string) + @param committerMail committer's email address (string) + @return reference to the generated item (QTreeWidgetItem) + """ + branches = [] + allBranches = [] + tags = [] + names = refnames.strip()[1:-1].split(",") + for name in names: + name = name.strip() + if name: + if "HEAD" in name: + tags.append(name) + elif name.startswith("tag: "): + tags.append(name.split()[1]) + else: + if "/" not in name: + branches.append(name) + elif "refs/bisect/" in name: + bname = name.replace("refs/", "").split("-", 1)[0] + branches.append(bname) + else: + branches.append(name) + allBranches.append(name) + + logMessageColumnWidth = self.vcs.getPlugin().getPreferences( + "LogSubjectColumnWidth") + msgtxt = subject + if logMessageColumnWidth and len(msgtxt) > logMessageColumnWidth: + msgtxt = "{0}...".format(msgtxt[:logMessageColumnWidth]) + columnLabels = [ + "", + commitId, + author, + date.rsplit(None, 1)[0].rsplit(":", 1)[0], + committer, + commitDate.rsplit(None, 1)[0].rsplit(":", 1)[0], + msgtxt, + ", ".join(branches), + ", ".join(tags), + ] + itm = QTreeWidgetItem(self.logTree, columnLabels) + + parents = [p.strip() for p in parents.split()] + column, color, edges = self.__generateEdges(commitId, parents) + + itm.setData(0, self.__subjectRole, subject) + itm.setData(0, self.__messageRole, message) + itm.setData(0, self.__changesRole, changedPaths) + itm.setData(0, self.__edgesRole, edges) + itm.setData(0, self.__branchesRole, allBranches) + itm.setData(0, self.__authorMailRole, authorMail) + itm.setData(0, self.__committerMailRole, committerMail) + if not parents: + itm.setData(0, self.__parentsRole, []) + else: + itm.setData(0, self.__parentsRole, parents) + for parent in parents: + self.__childrenInfo[parent].append(commitId) + + if self.logTree.topLevelItemCount() > 1: + topedges = \ + self.logTree.topLevelItem( + self.logTree.indexOfTopLevelItem(itm) - 1)\ + .data(0, self.__edgesRole) + else: + topedges = None + + icon = self.__generateIcon(column, color, edges, topedges, + QColor("blue"), + commitId == self.__projectRevision) + itm.setIcon(0, icon) + + return itm + + def __generateFileItem(self, action, path, copyfrom, additions, deletions): + """ + Private method to generate a changed files tree entry. + + @param action indicator for the change action ("A", "C", "D", "M", + "R", "T", "U", "X") + @param path path of the file in the repository (string) + @param copyfrom path the file was copied from (string) + @param additions number of added lines (int) + @param deletions number of deleted lines (int) + @return reference to the generated item (QTreeWidgetItem) + """ + if len(action) > 1: + # includes confidence level + confidence = int(action[1:]) + actionTxt = self.tr("{0} ({1}%)", "action, confidence").format( + self.flags[action[0]], confidence) + else: + actionTxt = self.flags[action] + itm = QTreeWidgetItem(self.filesTree, [ + actionTxt, + path, + str(additions), + str(deletions), + copyfrom, + ]) + + itm.setTextAlignment(2, Qt.AlignRight) + itm.setTextAlignment(3, Qt.AlignRight) + + return itm + + def __getLogEntries(self, skip=0, noEntries=0): + """ + Private method to retrieve log entries from the repository. + + @param skip number of log entries to skip (integer) + @keyparam noEntries number of entries to get (0 = default) (int) + """ + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True) + self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) + QApplication.processEvents() + + QApplication.setOverrideCursor(QCursor(Qt.WaitCursor)) + QApplication.processEvents() + + self.buf = [] + self.cancelled = False + self.errors.clear() + self.intercept = False + + if noEntries == 0: + noEntries = self.limitSpinBox.value() + + args = self.vcs.initCommand("log") + args.append('--max-count={0}'.format(noEntries)) + args.append('--numstat') + args.append('--abbrev={0}'.format( + self.vcs.getPlugin().getPreferences("CommitIdLength"))) + if self.vcs.getPlugin().getPreferences("FindCopiesHarder"): + args.append('--find-copies-harder') + args.append('--format={0}'.format(self.__formatTemplate)) + args.append('--full-history') + args.append('--all') + args.append('--skip={0}'.format(skip)) + if not self.projectMode: + if not self.stopCheckBox.isChecked(): + args.append('--follow') + args.append('--') + args.append(self.__filename) + + self.process.kill() + + self.process.setWorkingDirectory(self.repodir) + + self.process.start('git', args) + procStarted = self.process.waitForStarted(5000) + if not procStarted: + self.inputGroup.setEnabled(False) + self.inputGroup.hide() + E5MessageBox.critical( + self, + self.tr('Process Generation Error'), + self.tr( + 'The process {0} could not be started. ' + 'Ensure, that it is in the search path.' + ).format('git')) + + def start(self, fn, isFile=False, noEntries=0): + """ + Public slot to start the git log command. + + @param fn filename to show the log for (string) + @keyparam isFile flag indicating log for a file is to be shown + (boolean) + @keyparam noEntries number of entries to get (0 = default) (int) + """ + self.__isFile = isFile + + self.sbsSelectLabel.clear() + + self.errorGroup.hide() + QApplication.processEvents() + + self.__initData() + + self.__filename = fn + self.dname, self.fname = self.vcs.splitPath(fn) + + # find the root of the repo + self.repodir = self.dname + while not os.path.isdir(os.path.join(self.repodir, self.vcs.adminDir)): + self.repodir = os.path.dirname(self.repodir) + if os.path.splitdrive(self.repodir)[1] == os.sep: + return + + self.projectMode = (self.fname == "." and self.dname == self.repodir) + self.stopCheckBox.setDisabled(self.projectMode or self.fname == ".") + self.activateWindow() + self.raise_() + + self.logTree.clear() + self.__started = True + self.__identifyProject() + self.__getLogEntries(noEntries=noEntries) + + def __procFinished(self, exitCode, exitStatus): + """ + Private slot connected to the finished signal. + + @param exitCode exit code of the process (integer) + @param exitStatus exit status of the process (QProcess.ExitStatus) + """ + self.__processBuffer() + self.__finish() + + def __finish(self): + """ + Private slot called when the process finished or the user pressed + the button. + """ + if self.process is not None and \ + self.process.state() != QProcess.NotRunning: + self.process.terminate() + QTimer.singleShot(2000, self.process.kill) + self.process.waitForFinished(3000) + + QApplication.restoreOverrideCursor() + + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) + self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) + + self.inputGroup.setEnabled(False) + self.inputGroup.hide() + self.refreshButton.setEnabled(True) + + while self.__finishCallbacks: + self.__finishCallbacks.pop(0)() + + def __processBufferItem(self, logEntry): + """ + Private method to process a log entry. + + @param logEntry dictionary as generated by __processBuffer + """ + self.__generateLogItem( + logEntry["author"], logEntry["authordate"], + logEntry["committer"], logEntry["committerdate"], + logEntry["subject"], logEntry["body"], + logEntry["commit"], logEntry["changed_files"], + logEntry["parents"], logEntry["refnames"], + logEntry["authormail"], logEntry["committermail"] + ) + for date in [logEntry["authordate"], logEntry["committerdate"]]: + dt = QDate.fromString(date, Qt.ISODate) + if not self.__maxDate.isValid() and \ + not self.__minDate.isValid(): + self.__maxDate = dt + self.__minDate = dt + else: + if self.__maxDate < dt: + self.__maxDate = dt + if self.__minDate > dt: + self.__minDate = dt + + def __processBuffer(self): + """ + Private method to process the buffered output of the git log command. + """ + noEntries = 0 + logEntry = {"changed_files": []} + descriptionBody = False + + for line in self.buf: + line = line.rstrip() + if line == "recordstart": + if len(logEntry) > 1: + self.__processBufferItem(logEntry) + noEntries += 1 + logEntry = {"changed_files": []} + descriptionBody = False + fileChanges = False + body = [] + elif line == "bodystart": + descriptionBody = True + elif line == "bodyend": + if bool(body) and not bool(body[-1]): + body.pop() + logEntry["body"] = body + descriptionBody = False + fileChanges = True + elif descriptionBody: + body.append(line) + elif fileChanges: + if line: + if "changed_files" not in logEntry: + logEntry["changed_files"] = [] + changeInfo = line.strip().split("\t") + if "=>" in changeInfo[2]: + # copy/move + if "{" in changeInfo[2] and "}" in changeInfo[2]: + # change info of the form + # test/{pack1 => pack2}/file1.py + head, tail = changeInfo[2].split("{", 1) + middle, tail = tail.split("}", 1) + middleSrc, middleDst = middle.split("=>") + src = head + middleSrc.strip() + tail + dst = head + middleDst.strip() + tail + else: + src, dst = changeInfo[2].split("=>") + logEntry["changed_files"].append({ + "action": "C", + "added": changeInfo[0].strip(), + "deleted": changeInfo[1].strip(), + "path": dst.strip(), + "copyfrom": src.strip(), + }) + else: + logEntry["changed_files"].append({ + "action": "M", + "added": changeInfo[0].strip(), + "deleted": changeInfo[1].strip(), + "path": changeInfo[2].strip(), + "copyfrom": "", + }) + else: + try: + key, value = line.split("|", 1) + except ValueError: + key = "" + value = line + if key in ("commit", "parents", "author", "authormail", + "authordate", "committer", "committermail", + "committerdate", "refnames", "subject"): + logEntry[key] = value.strip() + if len(logEntry) > 1: + self.__processBufferItem(logEntry) + noEntries += 1 + + self.__resizeColumnsLog() + + if self.__started: + if self.__selectedCommitIDs: + self.logTree.setCurrentItem(self.logTree.findItems( + self.__selectedCommitIDs[0], Qt.MatchExactly, + self.CommitIdColumn)[0]) + else: + self.logTree.setCurrentItem(self.logTree.topLevelItem(0)) + self.__started = False + + self.__skipEntries += noEntries + if noEntries < self.limitSpinBox.value() and not self.cancelled: + self.nextButton.setEnabled(False) + self.limitSpinBox.setEnabled(False) + else: + self.nextButton.setEnabled(True) + self.limitSpinBox.setEnabled(True) + + # update the log filters + self.__filterLogsEnabled = False + self.fromDate.setMinimumDate(self.__minDate) + self.fromDate.setMaximumDate(self.__maxDate) + self.fromDate.setDate(self.__minDate) + self.toDate.setMinimumDate(self.__minDate) + self.toDate.setMaximumDate(self.__maxDate) + self.toDate.setDate(self.__maxDate) + + self.__filterLogsEnabled = True + if self.__actionMode() == "filter": + self.__filterLogs() + + self.__updateToolMenuActions() + + # restore selected items + if self.__selectedCommitIDs: + for commitID in self.__selectedCommitIDs: + items = self.logTree.findItems( + commitID, Qt.MatchExactly, self.CommitIdColumn) + if items: + items[0].setSelected(True) + self.__selectedCommitIDs = [] + + def __readStdout(self): + """ + Private slot to handle the readyReadStandardOutput signal. + + It reads the output of the process and inserts it into a buffer. + """ + self.process.setReadChannel(QProcess.StandardOutput) + + while self.process.canReadLine(): + line = str(self.process.readLine(), + Preferences.getSystem("IOEncoding"), + 'replace') + self.buf.append(line) + + def __readStderr(self): + """ + Private slot to handle the readyReadStandardError signal. + + It reads the error output of the process and inserts it into the + error pane. + """ + if self.process is not None: + s = str(self.process.readAllStandardError(), + Preferences.getSystem("IOEncoding"), + 'replace') + self.__showError(s) + + def __showError(self, out): + """ + Private slot to show some error. + + @param out error to be shown (string) + """ + self.errorGroup.show() + self.errors.insertPlainText(out) + self.errors.ensureCursorVisible() + + # show input in case the process asked for some input + self.inputGroup.setEnabled(True) + self.inputGroup.show() + + def on_buttonBox_clicked(self, button): + """ + Private slot called by a button of the button box clicked. + + @param button button that was clicked (QAbstractButton) + """ + if button == self.buttonBox.button(QDialogButtonBox.Close): + self.close() + elif button == self.buttonBox.button(QDialogButtonBox.Cancel): + self.cancelled = True + self.__finish() + elif button == self.refreshButton: + self.on_refreshButton_clicked() + + @pyqtSlot() + def on_refreshButton_clicked(self): + """ + Private slot to refresh the log. + """ + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True) + self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) + + self.refreshButton.setEnabled(False) + + # save the selected items commit IDs + self.__selectedCommitIDs = [] + for item in self.logTree.selectedItems(): + self.__selectedCommitIDs.append(item.text(self.CommitIdColumn)) + + self.start(self.__filename, isFile=self.__isFile, + noEntries=self.logTree.topLevelItemCount()) + + def on_passwordCheckBox_toggled(self, isOn): + """ + Private slot to handle the password checkbox toggled. + + @param isOn flag indicating the status of the check box (boolean) + """ + if isOn: + self.input.setEchoMode(QLineEdit.Password) + else: + self.input.setEchoMode(QLineEdit.Normal) + + @pyqtSlot() + def on_sendButton_clicked(self): + """ + Private slot to send the input to the git process. + """ + inputTxt = self.input.text() + inputTxt += os.linesep + + if self.passwordCheckBox.isChecked(): + self.errors.insertPlainText(os.linesep) + self.errors.ensureCursorVisible() + else: + self.errors.insertPlainText(inputTxt) + self.errors.ensureCursorVisible() + self.errorGroup.show() + + self.process.write(strToQByteArray(inputTxt)) + + self.passwordCheckBox.setChecked(False) + self.input.clear() + + def on_input_returnPressed(self): + """ + Private slot to handle the press of the return key in the input field. + """ + self.intercept = True + self.on_sendButton_clicked() + + def keyPressEvent(self, evt): + """ + Protected slot to handle a key press event. + + @param evt the key press event (QKeyEvent) + """ + if self.intercept: + self.intercept = False + evt.accept() + return + super(GitLogBrowserDialog, self).keyPressEvent(evt) + + def __prepareFieldSearch(self): + """ + Private slot to prepare the filed search data. + + @return tuple of field index, search expression and flag indicating + that the field index is a data role (integer, string, boolean) + """ + indexIsRole = False + txt = self.fieldCombo.itemData(self.fieldCombo.currentIndex()) + if txt == "author": + fieldIndex = self.AuthorColumn + searchRx = QRegExp(self.rxEdit.text(), Qt.CaseInsensitive) + elif txt == "committer": + fieldIndex = self.CommitterColumn + searchRx = QRegExp(self.rxEdit.text(), Qt.CaseInsensitive) + elif txt == "commitId": + fieldIndex = self.CommitIdColumn + txt = self.rxEdit.text() + if txt.startswith("^"): + searchRx = QRegExp("^\s*{0}".format(txt[1:]), + Qt.CaseInsensitive) + else: + searchRx = QRegExp(txt, Qt.CaseInsensitive) + elif txt == "file": + fieldIndex = self.__changesRole + searchRx = QRegExp(self.rxEdit.text(), Qt.CaseInsensitive) + indexIsRole = True + else: + fieldIndex = self.__subjectRole + searchRx = QRegExp(self.rxEdit.text(), Qt.CaseInsensitive) + indexIsRole = True + + return fieldIndex, searchRx, indexIsRole + + def __filterLogs(self): + """ + Private method to filter the log entries. + """ + if self.__filterLogsEnabled: + from_ = self.fromDate.date().toString("yyyy-MM-dd") + to_ = self.toDate.date().addDays(1).toString("yyyy-MM-dd") + fieldIndex, searchRx, indexIsRole = self.__prepareFieldSearch() + + visibleItemCount = self.logTree.topLevelItemCount() + currentItem = self.logTree.currentItem() + for topIndex in range(self.logTree.topLevelItemCount()): + topItem = self.logTree.topLevelItem(topIndex) + if indexIsRole: + if fieldIndex == self.__changesRole: + changes = topItem.data(0, self.__changesRole) + txt = "\n".join( + [c["path"] for c in changes] + + [c["copyfrom"] for c in changes] + ) + else: + # Filter based on complete subject text + txt = topItem.data(0, self.__subjectRole) + else: + txt = topItem.text(fieldIndex) + if topItem.text(self.DateColumn) <= to_ and \ + topItem.text(self.DateColumn) >= from_ and \ + searchRx.indexIn(txt) > -1: + topItem.setHidden(False) + if topItem is currentItem: + self.on_logTree_currentItemChanged(topItem, None) + else: + topItem.setHidden(True) + if topItem is currentItem: + self.filesTree.clear() + visibleItemCount -= 1 + self.logTree.header().setSectionHidden( + self.IconColumn, + visibleItemCount != self.logTree.topLevelItemCount()) + + def __updateSbsSelectLabel(self): + """ + Private slot to update the enabled status of the diff buttons. + """ + self.sbsSelectLabel.clear() + if self.__isFile: + selectedItems = self.logTree.selectedItems() + if len(selectedItems) == 1: + currentItem = selectedItems[0] + commit2 = currentItem.text(self.CommitIdColumn).strip() + parents = currentItem.data(0, self.__parentsRole) + if parents: + parentLinks = [] + for index in range(len(parents)): + parentLinks.append( + '<a href="sbsdiff:{0}_{1}"> {2} </a>' + .format(parents[index], commit2, index + 1)) + self.sbsSelectLabel.setText( + self.tr('Side-by-Side Diff to Parent {0}').format( + " ".join(parentLinks))) + elif len(selectedItems) == 2: + commit2 = selectedItems[0].text(self.CommitIdColumn) + commit1 = selectedItems[1].text(self.CommitIdColumn) + index2 = self.logTree.indexOfTopLevelItem(selectedItems[0]) + index1 = self.logTree.indexOfTopLevelItem(selectedItems[1]) + + if index2 < index1: + # swap to always compare old to new + commit1, commit2 = commit2, commit1 + self.sbsSelectLabel.setText(self.tr( + '<a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a>') + .format(commit1, commit2)) + + def __updateToolMenuActions(self): + """ + Private slot to update the status of the tool menu actions and + the tool menu button. + """ + if self.projectMode: + selectCount = len(self.logTree.selectedItems()) + self.__cherryAct.setEnabled(selectCount > 0) + self.__describeAct.setEnabled(selectCount > 0) + self.__tagAct.setEnabled(selectCount == 1) + self.__switchAct.setEnabled(selectCount == 1) + self.__branchAct.setEnabled(selectCount == 1) + self.__branchSwitchAct.setEnabled(selectCount == 1) + self.__shortlogAct.setEnabled(selectCount == 1) + + self.actionsButton.setEnabled(True) + else: + self.actionsButton.setEnabled(False) + + def __updateDetailsAndFiles(self): + """ + Private slot to update the details and file changes panes. + """ + self.detailsEdit.clear() + self.filesTree.clear() + self.__diffUpdatesFiles = False + + selectedItems = self.logTree.selectedItems() + if len(selectedItems) == 1: + self.detailsEdit.setHtml( + self.__generateDetailsTableText(selectedItems[0])) + self.__updateFilesTree(self.filesTree, selectedItems[0]) + self.__resizeColumnsFiles() + self.__resortFiles() + if self.filesTree.topLevelItemCount() == 0: + self.__diffUpdatesFiles = True + # give diff a chance to update the files list + elif len(selectedItems) == 2: + self.__diffUpdatesFiles = True + index1 = self.logTree.indexOfTopLevelItem(selectedItems[0]) + index2 = self.logTree.indexOfTopLevelItem(selectedItems[1]) + if index1 > index2: + # Swap the entries + selectedItems[0], selectedItems[1] = \ + selectedItems[1], selectedItems[0] + html = "{0}<hr/>{1}".format( + self.__generateDetailsTableText(selectedItems[0]), + self.__generateDetailsTableText(selectedItems[1]), + ) + self.detailsEdit.setHtml(html) + # self.filesTree is updated by the diff + + def __generateDetailsTableText(self, itm): + """ + Private method to generate an HTML table with the details of the given + changeset. + + @param itm reference to the item the table should be based on + @type QTreeWidgetItem + @return HTML table containing details + @rtype str + """ + if itm is not None: + commitId = itm.text(self.CommitIdColumn) + + parentLinks = [] + for parent in [str(x) for x in itm.data(0, self.__parentsRole)]: + parentLinks.append('<a href="rev:{0}">{0}</a>'.format(parent)) + if parentLinks: + parentsStr = self.__parentsTemplate.format( + ", ".join(parentLinks)) + else: + parentsStr = "" + + childLinks = [] + for child in [str(x) for x in self.__childrenInfo[commitId]]: + childLinks.append('<a href="rev:{0}">{0}</a>'.format(child)) + if childLinks: + childrenStr = self.__childrenTemplate.format( + ", ".join(childLinks)) + else: + childrenStr = "" + + branchLinks = [] + for branch, branchHead in self.__getBranchesForCommit(commitId): + branchLinks.append('<a href="rev:{0}">{1}</a>'.format( + branchHead, branch)) + if branchLinks: + branchesStr = self.__branchesTemplate.format( + ", ".join(branchLinks)) + else: + branchesStr = "" + + tagLinks = [] + for tag, tagCommit in self.__getTagsForCommit(commitId): + if tagCommit: + tagLinks.append('<a href="rev:{0}">{1}</a>'.format( + tagCommit, tag)) + else: + tagLinks.append(tag) + if tagLinks: + tagsStr = self.__tagsTemplate.format( + ", ".join(tagLinks)) + else: + tagsStr = "" + + if itm.data(0, self.__messageRole): + messageStr = self.__mesageTemplate.format( + "<br/>".join(itm.data(0, self.__messageRole))) + else: + messageStr = "" + + html = self.__detailsTemplate.format( + commitId, + itm.text(self.DateColumn), + itm.text(self.AuthorColumn), + itm.data(0, self.__authorMailRole).strip(), + itm.text(self.CommitDateColumn), + itm.text(self.CommitterColumn), + itm.data(0, self.__committerMailRole).strip(), + parentsStr + childrenStr + branchesStr + tagsStr, + itm.data(0, self.__subjectRole), + messageStr, + ) + else: + html = "" + + return html + + def __updateFilesTree(self, parent, itm): + """ + Private method to update the files tree with changes of the given item. + + @param parent parent for the items to be added + @type QTreeWidget or QTreeWidgetItem + @param itm reference to the item the update should be based on + @type QTreeWidgetItem + """ + if itm is not None: + changes = itm.data(0, self.__changesRole) + if len(changes) > 0: + for change in changes: + self.__generateFileItem( + change["action"], change["path"], change["copyfrom"], + change["added"], change["deleted"]) + self.__resizeColumnsFiles() + self.__resortFiles() + + def __getBranchesForCommit(self, commitId): + """ + Private method to get all branches reachable from a commit ID. + + @param commitId commit ID to get the branches for + @type str + @return list of tuples containing the branch name and the associated + commit ID of its branch head + @rtype tuple of (str, str) + """ + branches = [] + + args = self.vcs.initCommand("branch") + args.append("--list") + args.append("--verbose") + args.append("--contains") + args.append(commitId) + + output = "" + process = QProcess() + process.setWorkingDirectory(self.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') + + if output: + for line in output.splitlines(): + name, commitId = line[2:].split(None, 2)[:2] + branches.append((name, commitId)) + + return branches + + def __getTagsForCommit(self, commitId): + """ + Private method to get all tags reachable from a commit ID. + + @param commitId commit ID to get the tags for + @type str + @return list of tuples containing the tag name and the associated + commit ID + @rtype tuple of (str, str) + """ + tags = [] + + args = self.vcs.initCommand("tag") + args.append("--list") + args.append("--contains") + args.append(commitId) + + output = "" + process = QProcess() + process.setWorkingDirectory(self.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') + + if output: + tagNames = [] + for line in output.splitlines(): + tagNames.append(line.strip()) + + # determine the commit IDs for the tags + for tagName in tagNames: + commitId = self.__getCommitForTag(tagName) + tags.append((tagName, commitId)) + + return tags + + def __getCommitForTag(self, tag): + """ + Private method to get the commit id for a tag. + + @param tag tag name (string) + @return commit id shortened to 10 characters (string) + """ + args = self.vcs.initCommand("show") + args.append("--abbrev-commit") + args.append("--abbrev={0}".format( + self.vcs.getPlugin().getPreferences("CommitIdLength"))) + args.append("--no-patch") + args.append(tag) + + output = "" + process = QProcess() + process.setWorkingDirectory(self.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') + + if output: + for line in output.splitlines(): + if line.startswith("commit "): + commitId = line.split()[1].strip() + return commitId + + return "" + + @pyqtSlot(QPoint) + def on_logTree_customContextMenuRequested(self, pos): + """ + Private slot to show the context menu of the log tree. + + @param pos position of the mouse pointer (QPoint) + """ + self.__logTreeMenu.popup(self.logTree.mapToGlobal(pos)) + + @pyqtSlot(QTreeWidgetItem, QTreeWidgetItem) + def on_logTree_currentItemChanged(self, current, previous): + """ + Private slot called, when the current item of the log tree changes. + + @param current reference to the new current item (QTreeWidgetItem) + @param previous reference to the old current item (QTreeWidgetItem) + """ + self.__updateToolMenuActions() + + # Highlight the current entry using a bold font + for col in range(self.logTree.columnCount()): + current and current.setFont(col, self.__logTreeBoldFont) + previous and previous.setFont(col, self.__logTreeNormalFont) + + # set the state of the up and down buttons + self.upButton.setEnabled( + current is not None and + self.logTree.indexOfTopLevelItem(current) > 0) + self.downButton.setEnabled( + current is not None and + len(current.data(0, self.__parentsRole)) > 0 and + (self.logTree.indexOfTopLevelItem(current) < + self.logTree.topLevelItemCount() - 1 or + self.nextButton.isEnabled())) + + @pyqtSlot() + def on_logTree_itemSelectionChanged(self): + """ + Private slot called, when the selection has changed. + """ + self.__updateDetailsAndFiles() + self.__updateSbsSelectLabel() + self.__updateToolMenuActions() + self.__generateDiffs() + + @pyqtSlot() + def on_upButton_clicked(self): + """ + Private slot to move the current item up one entry. + """ + itm = self.logTree.itemAbove(self.logTree.currentItem()) + if itm: + self.logTree.setCurrentItem(itm) + + @pyqtSlot() + def on_downButton_clicked(self): + """ + Private slot to move the current item down one entry. + """ + itm = self.logTree.itemBelow(self.logTree.currentItem()) + if itm: + self.logTree.setCurrentItem(itm) + else: + # load the next bunch and try again + if self.nextButton.isEnabled(): + self.__addFinishCallback(self.on_downButton_clicked) + self.on_nextButton_clicked() + + @pyqtSlot() + def on_nextButton_clicked(self): + """ + Private slot to handle the Next button. + """ + if self.__skipEntries > 0 and self.nextButton.isEnabled(): + self.__getLogEntries(skip=self.__skipEntries) + + @pyqtSlot(QDate) + def on_fromDate_dateChanged(self, date): + """ + Private slot called, when the from date changes. + + @param date new date (QDate) + """ + if self.__actionMode() == "filter": + self.__filterLogs() + + @pyqtSlot(QDate) + def on_toDate_dateChanged(self, date): + """ + Private slot called, when the from date changes. + + @param date new date (QDate) + """ + if self.__actionMode() == "filter": + self.__filterLogs() + + @pyqtSlot(str) + def on_fieldCombo_activated(self, txt): + """ + Private slot called, when a new filter field is selected. + + @param txt text of the selected field (string) + """ + if self.__actionMode() == "filter": + self.__filterLogs() + + @pyqtSlot(str) + def on_rxEdit_textChanged(self, txt): + """ + Private slot called, when a filter expression is entered. + + @param txt filter expression (string) + """ + if self.__actionMode() == "filter": + self.__filterLogs() + elif self.__actionMode() == "find": + self.__findItem(self.__findBackwards, interactive=True) + + @pyqtSlot() + def on_rxEdit_returnPressed(self): + """ + Private slot handling a press of the Return key in the rxEdit input. + """ + if self.__actionMode() == "find": + self.__findItem(self.__findBackwards, interactive=True) + + @pyqtSlot(bool) + def on_stopCheckBox_clicked(self, checked): + """ + Private slot called, when the stop on copy/move checkbox is clicked. + + @param checked flag indicating the state of the check box (boolean) + """ + self.vcs.getPlugin().setPreferences("StopLogOnCopy", + self.stopCheckBox.isChecked()) + self.nextButton.setEnabled(True) + self.limitSpinBox.setEnabled(True) + + ################################################################## + ## Tool button menu action methods below + ################################################################## + + @pyqtSlot() + def __cherryActTriggered(self): + """ + Private slot to handle the Copy Commits action. + """ + commits = {} + + for itm in self.logTree.selectedItems(): + index = self.logTree.indexOfTopLevelItem(itm) + commits[index] = itm.text(self.CommitIdColumn) + + if commits: + pfile = e5App().getObject("Project").getProjectFile() + lastModified = QFileInfo(pfile).lastModified().toString() + shouldReopen = ( + self.vcs.gitCherryPick( + self.repodir, + [commits[i] for i in sorted(commits.keys(), reverse=True)] + ) or + QFileInfo(pfile).lastModified().toString() != lastModified + ) + if shouldReopen: + res = E5MessageBox.yesNo( + None, + self.tr("Copy Changesets"), + self.tr( + """The project should be reread. Do this now?"""), + yesDefault=True) + if res: + e5App().getObject("Project").reopenProject() + return + + self.on_refreshButton_clicked() + + @pyqtSlot() + def __tagActTriggered(self): + """ + Private slot to tag the selected commit. + """ + if len(self.logTree.selectedItems()) == 1: + itm = self.logTree.selectedItems()[0] + commit = itm.text(self.CommitIdColumn) + tag = itm.text(self.TagsColumn).strip().split(", ", 1)[0] + res = self.vcs.vcsTag(self.repodir, revision=commit, tagName=tag) + if res: + self.on_refreshButton_clicked() + + @pyqtSlot() + def __switchActTriggered(self): + """ + Private slot to switch the working directory to the + selected commit. + """ + if len(self.logTree.selectedItems()) == 1: + itm = self.logTree.selectedItems()[0] + commit = itm.text(self.CommitIdColumn) + branches = [b for b in itm.text(self.BranchColumn).split(", ") + if "/" not in b] + if len(branches) == 1: + branch = branches[0] + elif len(branches) > 1: + branch, ok = QInputDialog.getItem( + self, + self.tr("Switch"), + self.tr("Select a branch"), + [""] + branches, + 0, False) + if not ok: + return + else: + branch = "" + if branch: + rev = branch + else: + rev = commit + pfile = e5App().getObject("Project").getProjectFile() + lastModified = QFileInfo(pfile).lastModified().toString() + shouldReopen = ( + self.vcs.vcsUpdate(self.repodir, revision=rev) or + QFileInfo(pfile).lastModified().toString() != lastModified + ) + if shouldReopen: + res = E5MessageBox.yesNo( + None, + self.tr("Switch"), + self.tr( + """The project should be reread. Do this now?"""), + yesDefault=True) + if res: + e5App().getObject("Project").reopenProject() + return + + self.on_refreshButton_clicked() + + @pyqtSlot() + def __branchActTriggered(self): + """ + Private slot to create a new branch starting at the selected commit. + """ + if len(self.logTree.selectedItems()) == 1: + from .GitBranchDialog import GitBranchDialog + itm = self.logTree.selectedItems()[0] + commit = itm.text(self.CommitIdColumn) + branches = [b for b in itm.text(self.BranchColumn).split(", ") + if "/" not in b] + if len(branches) == 1: + branch = branches[0] + elif len(branches) > 1: + branch, ok = QInputDialog.getItem( + self, + self.tr("Branch"), + self.tr("Select a default branch"), + [""] + branches, + 0, False) + if not ok: + return + else: + branch = "" + res = self.vcs.gitBranch( + self.repodir, revision=commit, branchName=branch, + branchOp=GitBranchDialog.CreateBranch) + if res: + self.on_refreshButton_clicked() + + @pyqtSlot() + def __branchSwitchActTriggered(self): + """ + Private slot to create a new branch starting at the selected commit + and switch the work tree to it. + """ + if len(self.logTree.selectedItems()) == 1: + from .GitBranchDialog import GitBranchDialog + itm = self.logTree.selectedItems()[0] + commit = itm.text(self.CommitIdColumn) + branches = [b for b in itm.text(self.BranchColumn).split(", ") + if "/" not in b] + if len(branches) == 1: + branch = branches[0] + elif len(branches) > 1: + branch, ok = QInputDialog.getItem( + self, + self.tr("Branch & Switch"), + self.tr("Select a default branch"), + [""] + branches, + 0, False) + if not ok: + return + else: + branch = "" + pfile = e5App().getObject("Project").getProjectFile() + lastModified = QFileInfo(pfile).lastModified().toString() + res, shouldReopen = self.vcs.gitBranch( + self.repodir, revision=commit, branchName=branch, + branchOp=GitBranchDialog.CreateSwitchBranch) + shouldReopen = shouldReopen or \ + QFileInfo(pfile).lastModified().toString() != lastModified + if res: + if shouldReopen: + res = E5MessageBox.yesNo( + None, + self.tr("Switch"), + self.tr( + """The project should be reread. Do this now?"""), + yesDefault=True) + if res: + e5App().getObject("Project").reopenProject() + return + + self.on_refreshButton_clicked() + + @pyqtSlot() + def __shortlogActTriggered(self): + """ + Private slot to show a short log suitable for release announcements. + """ + if len(self.logTree.selectedItems()) == 1: + itm = self.logTree.selectedItems()[0] + commit = itm.text(self.CommitIdColumn) + branch = itm.text(self.BranchColumn).split(", ", 1)[0] + branches = [b for b in itm.text(self.BranchColumn).split(", ") + if "/" not in b] + if len(branches) == 1: + branch = branches[0] + elif len(branches) > 1: + branch, ok = QInputDialog.getItem( + self, + self.tr("Show Short Log"), + self.tr("Select a branch"), + [""] + branches, + 0, False) + if not ok: + return + else: + branch = "" + if branch: + rev = branch + else: + rev = commit + self.vcs.gitShortlog(self.repodir, commit=rev) + + @pyqtSlot() + def __describeActTriggered(self): + """ + Private slot to show the most recent tag reachable from a commit. + """ + commits = [] + + for itm in self.logTree.selectedItems(): + commits.append(itm.text(self.CommitIdColumn)) + + if commits: + self.vcs.gitDescribe(self.repodir, commits) + + ################################################################## + ## Log context menu action methods below + ################################################################## + + @pyqtSlot(bool) + def __showCommitterColumns(self, on): + """ + Private slot to show/hide the committer columns. + + @param on flag indicating the selection state (boolean) + """ + self.logTree.setColumnHidden(self.CommitterColumn, not on) + self.logTree.setColumnHidden(self.CommitDateColumn, not on) + self.vcs.getPlugin().setPreferences("ShowCommitterColumns", on) + self.__resizeColumnsLog() + + @pyqtSlot(bool) + def __showAuthorColumns(self, on): + """ + Private slot to show/hide the committer columns. + + @param on flag indicating the selection state (boolean) + """ + self.logTree.setColumnHidden(self.AuthorColumn, not on) + self.logTree.setColumnHidden(self.DateColumn, not on) + self.vcs.getPlugin().setPreferences("ShowAuthorColumns", on) + self.__resizeColumnsLog() + + @pyqtSlot(bool) + def __showCommitIdColumn(self, on): + """ + Private slot to show/hide the commit ID column. + + @param on flag indicating the selection state (boolean) + """ + self.logTree.setColumnHidden(self.CommitIdColumn, not on) + self.vcs.getPlugin().setPreferences("ShowCommitIdColumn", on) + self.__resizeColumnsLog() + + @pyqtSlot(bool) + def __showBranchesColumn(self, on): + """ + Private slot to show/hide the branches column. + + @param on flag indicating the selection state (boolean) + """ + self.logTree.setColumnHidden(self.BranchColumn, not on) + self.vcs.getPlugin().setPreferences("ShowBranchesColumn", on) + self.__resizeColumnsLog() + + @pyqtSlot(bool) + def __showTagsColumn(self, on): + """ + Private slot to show/hide the tags column. + + @param on flag indicating the selection state (boolean) + """ + self.logTree.setColumnHidden(self.TagsColumn, not on) + self.vcs.getPlugin().setPreferences("ShowTagsColumn", on) + self.__resizeColumnsLog() + + ################################################################## + ## Search and filter methods below + ################################################################## + + def __actionMode(self): + """ + Private method to get the selected action mode. + + @return selected action mode (string, one of filter or find) + """ + return self.modeComboBox.itemData( + self.modeComboBox.currentIndex()) + + @pyqtSlot(int) + def on_modeComboBox_currentIndexChanged(self, index): + """ + Private slot to react on mode changes. + + @param index index of the selected entry (integer) + """ + mode = self.modeComboBox.itemData(index) + findMode = mode == "find" + filterMode = mode == "filter" + + self.fromDate.setEnabled(filterMode) + self.toDate.setEnabled(filterMode) + self.findPrevButton.setVisible(findMode) + self.findNextButton.setVisible(findMode) + + if findMode: + for topIndex in range(self.logTree.topLevelItemCount()): + self.logTree.topLevelItem(topIndex).setHidden(False) + self.logTree.header().setSectionHidden(self.IconColumn, False) + elif filterMode: + self.__filterLogs() + + @pyqtSlot() + def on_findPrevButton_clicked(self): + """ + Private slot to find the previous item matching the entered criteria. + """ + self.__findItem(True) + + @pyqtSlot() + def on_findNextButton_clicked(self): + """ + Private slot to find the next item matching the entered criteria. + """ + self.__findItem(False) + + def __findItem(self, backwards=False, interactive=False): + """ + Private slot to find an item matching the entered criteria. + + @param backwards flag indicating to search backwards (boolean) + @param interactive flag indicating an interactive search (boolean) + """ + self.__findBackwards = backwards + + fieldIndex, searchRx, indexIsRole = self.__prepareFieldSearch() + currentIndex = self.logTree.indexOfTopLevelItem( + self.logTree.currentItem()) + if backwards: + if interactive: + indexes = range(currentIndex, -1, -1) + else: + indexes = range(currentIndex - 1, -1, -1) + else: + if interactive: + indexes = range(currentIndex, self.logTree.topLevelItemCount()) + else: + indexes = range(currentIndex + 1, + self.logTree.topLevelItemCount()) + + for index in indexes: + topItem = self.logTree.topLevelItem(index) + if indexIsRole: + if fieldIndex == self.__changesRole: + changes = topItem.data(0, self.__changesRole) + txt = "\n".join( + [c["path"] for c in changes] + + [c["copyfrom"] for c in changes] + ) + else: + # Filter based on complete subject text + txt = topItem.data(0, self.__subjectRole) + else: + txt = topItem.text(fieldIndex) + if searchRx.indexIn(txt) > -1: + self.logTree.setCurrentItem(self.logTree.topLevelItem(index)) + break + else: + E5MessageBox.information( + self, + self.tr("Find Commit"), + self.tr("""'{0}' was not found.""").format(self.rxEdit.text())) + + ################################################################## + ## Commit navigation methods below + ################################################################## + + def __commitIdClicked(self, url): + """ + Private slot to handle the anchorClicked signal of the changeset + details pane. + + @param url URL that was clicked + @type QUrl + """ + if url.scheme() == "rev": + # a commit ID was clicked, show the respective item + commitId = url.path() + items = self.logTree.findItems(commitId, Qt.MatchStartsWith, + self.CommitIdColumn) + if items: + itm = items[0] + if itm.isHidden(): + itm.setHidden(False) + self.logTree.setCurrentItem(itm) + else: + # load the next batch and try again + if self.nextButton.isEnabled(): + self.__addFinishCallback( + lambda: self.__commitIdClicked(url)) + self.on_nextButton_clicked() + + ########################################################################### + ## Diff handling methods below + ########################################################################### + + def __generateDiffs(self, parent=1): + """ + Private slot to generate diff outputs for the selected item. + + @param parent number of parent to diff against + @type int + """ + self.diffEdit.clear() + self.diffLabel.setText(self.tr("Differences")) + self.diffSelectLabel.clear() + try: + self.diffHighlighter.regenerateRules() + except AttributeError: + # backward compatibility + pass + + selectedItems = self.logTree.selectedItems() + if len(selectedItems) == 1: + currentItem = selectedItems[0] + commit2 = currentItem.text(self.CommitIdColumn) + parents = currentItem.data(0, self.__parentsRole) + if len(parents) >= parent: + self.diffLabel.setText( + self.tr("Differences to Parent {0}").format(parent)) + commit1 = parents[parent - 1] + + self.__diffGenerator.start(self.__filename, [commit1, commit2]) + + if len(parents) > 1: + parentLinks = [] + for index in range(1, len(parents) + 1): + if parent == index: + parentLinks.append(" {0} ".format(index)) + else: + parentLinks.append( + '<a href="diff:{0}"> {0} </a>' + .format(index)) + self.diffSelectLabel.setText( + self.tr('Diff to Parent {0}') + .format(" ".join(parentLinks))) + elif len(selectedItems) == 2: + commit2 = selectedItems[0].text(self.CommitIdColumn) + commit1 = selectedItems[1].text(self.CommitIdColumn) + index2 = self.logTree.indexOfTopLevelItem(selectedItems[0]) + index1 = self.logTree.indexOfTopLevelItem(selectedItems[1]) + + if index2 < index1: + # swap to always compare old to new + commit1, commit2 = commit2, commit1 + + self.__diffGenerator.start(self.__filename, [commit1, commit2]) + + def __generatorFinished(self): + """ + Private slot connected to the finished signal of the diff generator. + """ + diff, _, errors, fileSeparators = self.__diffGenerator.getResult() + + if diff: + self.diffEdit.setPlainText("".join(diff)) + elif errors: + self.diffEdit.setPlainText("".join(errors)) + else: + self.diffEdit.setPlainText(self.tr('There is no difference.')) + + self.saveLabel.setVisible(bool(diff)) + + fileSeparators = self.__mergeFileSeparators(fileSeparators) + if self.__diffUpdatesFiles: + for oldFileName, newFileName, lineNumber, _ in fileSeparators: + if oldFileName == newFileName: + item = QTreeWidgetItem(self.filesTree, ["", oldFileName]) + elif oldFileName == "/dev/null": + item = QTreeWidgetItem(self.filesTree, ["", newFileName]) + else: + item = QTreeWidgetItem( + self.filesTree, ["", newFileName, "", "", oldFileName]) + item.setData(0, self.__diffFileLineRole, lineNumber) + self.__resizeColumnsFiles() + self.__resortFiles() + else: + for oldFileName, newFileName, lineNumber, _ in fileSeparators: + for fileName in (oldFileName, newFileName): + if fileName != "/dev/null": + items = self.filesTree.findItems( + fileName, Qt.MatchExactly, 1) + for item in items: + item.setData(0, self.__diffFileLineRole, + lineNumber) + + tc = self.diffEdit.textCursor() + tc.movePosition(QTextCursor.Start) + self.diffEdit.setTextCursor(tc) + self.diffEdit.ensureCursorVisible() + + def __mergeFileSeparators(self, fileSeparators): + """ + Private method to merge the file separator entries. + + @param fileSeparators list of file separator entries to be merged + @return merged list of file separator entries + """ + separators = {} + for oldFile, newFile, pos1, pos2 in sorted(fileSeparators): + if (oldFile, newFile) not in separators: + separators[(oldFile, newFile)] = [oldFile, newFile, pos1, pos2] + else: + if pos1 != -2: + separators[(oldFile, newFile)][2] = pos1 + if pos2 != -2: + separators[(oldFile, newFile)][3] = pos2 + return list(separators.values()) + + @pyqtSlot(QTreeWidgetItem, QTreeWidgetItem) + def on_filesTree_currentItemChanged(self, current, previous): + """ + Private slot called, when the current item of the files tree changes. + + @param current reference to the new current item (QTreeWidgetItem) + @param previous reference to the old current item (QTreeWidgetItem) + """ + if current: + para = current.data(0, self.__diffFileLineRole) + if para is not None: + if para == 0: + tc = self.diffEdit.textCursor() + tc.movePosition(QTextCursor.Start) + self.diffEdit.setTextCursor(tc) + self.diffEdit.ensureCursorVisible() + elif para == -1: + tc = self.diffEdit.textCursor() + tc.movePosition(QTextCursor.End) + self.diffEdit.setTextCursor(tc) + self.diffEdit.ensureCursorVisible() + else: + # step 1: move cursor to end + tc = self.diffEdit.textCursor() + tc.movePosition(QTextCursor.End) + self.diffEdit.setTextCursor(tc) + self.diffEdit.ensureCursorVisible() + + # step 2: move cursor to desired line + tc = self.diffEdit.textCursor() + delta = tc.blockNumber() - para + tc.movePosition(QTextCursor.PreviousBlock, + QTextCursor.MoveAnchor, delta) + self.diffEdit.setTextCursor(tc) + self.diffEdit.ensureCursorVisible() + + @pyqtSlot(str) + def on_diffSelectLabel_linkActivated(self, link): + """ + Private slot to handle the selection of a diff target. + + @param link activated link + @type str + """ + if ":" in link: + scheme, parent = link.split(":", 1) + if scheme == "diff": + try: + parent = int(parent) + self.__generateDiffs(parent) + except ValueError: + # ignore silently + pass + + @pyqtSlot(str) + def on_saveLabel_linkActivated(self, link): + """ + Private slot to handle the selection of the save link. + + @param link activated link + @type str + """ + if ":" not in link: + return + + scheme, rest = link.split(":", 1) + if scheme != "save" or rest != "me": + return + + if self.projectMode: + fname = self.vcs.splitPath(self.__filename)[0] + fname += "/{0}.diff".format(os.path.split(fname)[-1]) + else: + dname, fname = self.vcs.splitPath(self.__filename) + if fname != '.': + fname = "{0}.diff".format(self.__filename) + else: + fname = dname + + fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter( + self, + self.tr("Save Diff"), + fname, + self.tr("Patch Files (*.diff)"), + None, + E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite)) + + if not fname: + return # user aborted + + ext = QFileInfo(fname).suffix() + if not ext: + ex = selectedFilter.split("(*")[1].split(")")[0] + if ex: + fname += ex + if QFileInfo(fname).exists(): + res = E5MessageBox.yesNo( + self, + self.tr("Save Diff"), + self.tr("<p>The patch file <b>{0}</b> already exists." + " Overwrite it?</p>").format(fname), + icon=E5MessageBox.Warning) + if not res: + return + fname = Utilities.toNativeSeparators(fname) + + eol = e5App().getObject("Project").getEolString() + try: + f = open(fname, "w", encoding="utf-8", newline="") + f.write(eol.join(self.diffEdit.toPlainText().splitlines())) + f.write(eol) + f.close() + except IOError as why: + E5MessageBox.critical( + self, self.tr('Save Diff'), + self.tr( + '<p>The patch file <b>{0}</b> could not be saved.' + '<br>Reason: {1}</p>') + .format(fname, str(why))) + + @pyqtSlot(str) + def on_sbsSelectLabel_linkActivated(self, link): + """ + Private slot to handle selection of a side-by-side link. + + @param link text of the selected link + @type str + """ + if ":" in link: + scheme, path = link.split(":", 1) + if scheme == "sbsdiff" and "_" in path: + commit1, commit2 = path.split("_", 1) + self.vcs.gitSbsDiff(self.__filename, + revisions=(commit1, commit2))
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,615 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitLogBrowserDialog</class> + <widget class="QWidget" name="GitLogBrowserDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>1000</width> + <height>800</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git Log</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout_3"> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QToolButton" name="actionsButton"> + <property name="toolTip"> + <string>Select action from menu</string> + </property> + <property name="popupMode"> + <enum>QToolButton::InstantPopup</enum> + </property> + </widget> + </item> + <item> + <widget class="Line" name="line_4"> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + <property name="lineWidth"> + <number>2</number> + </property> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="modeComboBox"> + <property name="toolTip"> + <string>Select the mode (find or filter)</string> + </property> + </widget> + </item> + <item> + <widget class="Line" name="line_3"> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + <property name="lineWidth"> + <number>2</number> + </property> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>From:</string> + </property> + </widget> + </item> + <item> + <widget class="QDateEdit" name="fromDate"> + <property name="toolTip"> + <string>Enter the start date</string> + </property> + <property name="calendarPopup"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>To:</string> + </property> + </widget> + </item> + <item> + <widget class="QDateEdit" name="toDate"> + <property name="toolTip"> + <string>Enter the end date</string> + </property> + <property name="calendarPopup"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="Line" name="line_2"> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + <property name="lineWidth"> + <number>2</number> + </property> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="fieldCombo"> + <property name="toolTip"> + <string>Select the field to filter on</string> + </property> + </widget> + </item> + <item> + <widget class="E5ClearableLineEdit" name="rxEdit"> + <property name="toolTip"> + <string>Enter the regular expression to filter on or search for</string> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="findPrevButton"> + <property name="toolTip"> + <string>Press to find the previous occurrence</string> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="findNextButton"> + <property name="toolTip"> + <string>Press to find the next occurrence</string> + </property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QSplitter" name="mainSplitter"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <widget class="QWidget" name="layoutWidget"> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QTreeWidget" name="logTree"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="contextMenuPolicy"> + <enum>Qt::CustomContextMenu</enum> + </property> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::ExtendedSelection</enum> + </property> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <property name="itemsExpandable"> + <bool>false</bool> + </property> + <property name="allColumnsShowFocus"> + <bool>true</bool> + </property> + <column> + <property name="text"> + <string>Graph</string> + </property> + </column> + <column> + <property name="text"> + <string>Commit ID</string> + </property> + </column> + <column> + <property name="text"> + <string>Author</string> + </property> + </column> + <column> + <property name="text"> + <string>Date</string> + </property> + </column> + <column> + <property name="text"> + <string>Committer</string> + </property> + </column> + <column> + <property name="text"> + <string>Commit Date</string> + </property> + </column> + <column> + <property name="text"> + <string>Subject</string> + </property> + </column> + <column> + <property name="text"> + <string>Branches</string> + </property> + </column> + <column> + <property name="text"> + <string>Tags</string> + </property> + </column> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QToolButton" name="upButton"> + <property name="toolTip"> + <string>Press to move up in the log list</string> + </property> + <property name="autoRepeat"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="downButton"> + <property name="toolTip"> + <string>Press to move down in the log list</string> + </property> + <property name="autoRepeat"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="Line" name="line_5"> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + <property name="lineWidth"> + <number>2</number> + </property> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="nextButton"> + <property name="toolTip"> + <string>Press to get the next bunch of log entries</string> + </property> + <property name="text"> + <string>&Next</string> + </property> + </widget> + </item> + <item> + <widget class="QSpinBox" name="limitSpinBox"> + <property name="toolTip"> + <string>Enter the limit of entries to fetch</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>10000</number> + </property> + <property name="value"> + <number>20</number> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="stopCheckBox"> + <property name="toolTip"> + <string>Select to stop listing log messages at a copy or move</string> + </property> + <property name="text"> + <string>Stop on Copy/Move</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <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="QLabel" name="sbsSelectLabel"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <property name="text"> + <string/> + </property> + <property name="textInteractionFlags"> + <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse</set> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + <widget class="QSplitter" name="detailsSplitter"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>2</verstretch> + </sizepolicy> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <widget class="QTextBrowser" name="detailsEdit"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>3</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="openLinks"> + <bool>false</bool> + </property> + </widget> + <widget class="QSplitter" name="diffSplitter"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> + <horstretch>7</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <widget class="QTreeWidget" name="filesTree"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>7</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <property name="itemsExpandable"> + <bool>false</bool> + </property> + <property name="allColumnsShowFocus"> + <bool>true</bool> + </property> + <column> + <property name="text"> + <string>Action</string> + </property> + </column> + <column> + <property name="text"> + <string>Path</string> + </property> + </column> + <column> + <property name="text"> + <string>Additions</string> + </property> + </column> + <column> + <property name="text"> + <string>Deletions</string> + </property> + </column> + <column> + <property name="text"> + <string>Copy from</string> + </property> + </column> + </widget> + <widget class="QWidget" name="layoutWidget_2"> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <item> + <widget class="QLabel" name="diffLabel"> + <property name="text"> + <string>Differences</string> + </property> + </widget> + </item> + <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="QLabel" name="diffSelectLabel"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <property name="text"> + <string/> + </property> + <property name="textInteractionFlags"> + <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse</set> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="saveLabel"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <property name="text"> + <string><a href="save:me">Save</a></string> + </property> + <property name="textInteractionFlags"> + <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse</set> + </property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QTextEdit" name="diffEdit"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>7</horstretch> + <verstretch>2</verstretch> + </sizepolicy> + </property> + <property name="tabChangesFocus"> + <bool>true</bool> + </property> + <property name="lineWrapMode"> + <enum>QTextEdit::NoWrap</enum> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="acceptRichText"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </widget> + </widget> + </widget> + </widget> + </item> + <item> + <widget class="QGroupBox" name="errorGroup"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Errors</string> + </property> + <layout class="QVBoxLayout"> + <item> + <widget class="QTextEdit" name="errors"> + <property name="whatsThis"> + <string><b>Git log errors</b><p>This shows possible error messages of the git log command.</p></string> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="acceptRichText"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="inputGroup"> + <property name="title"> + <string>Input</string> + </property> + <layout class="QGridLayout"> + <item row="1" column="1"> + <spacer> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>327</width> + <height>29</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="2"> + <widget class="QPushButton" name="sendButton"> + <property name="toolTip"> + <string>Press to send the input to the git process</string> + </property> + <property name="text"> + <string>&Send</string> + </property> + <property name="shortcut"> + <string>Alt+S</string> + </property> + </widget> + </item> + <item row="0" column="0" colspan="3"> + <widget class="QLineEdit" name="input"> + <property name="toolTip"> + <string>Enter data to be sent to the git process</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QCheckBox" name="passwordCheckBox"> + <property name="toolTip"> + <string>Select to switch the input field to password mode</string> + </property> + <property name="text"> + <string>&Password Mode</string> + </property> + <property name="shortcut"> + <string>Alt+P</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close</set> + </property> + </widget> + </item> + </layout> + </widget> + <customwidgets> + <customwidget> + <class>E5ClearableLineEdit</class> + <extends>QLineEdit</extends> + <header>E5Gui/E5LineEdit.h</header> + </customwidget> + </customwidgets> + <tabstops> + <tabstop>actionsButton</tabstop> + <tabstop>modeComboBox</tabstop> + <tabstop>fromDate</tabstop> + <tabstop>toDate</tabstop> + <tabstop>fieldCombo</tabstop> + <tabstop>rxEdit</tabstop> + <tabstop>findPrevButton</tabstop> + <tabstop>findNextButton</tabstop> + <tabstop>logTree</tabstop> + <tabstop>upButton</tabstop> + <tabstop>downButton</tabstop> + <tabstop>nextButton</tabstop> + <tabstop>limitSpinBox</tabstop> + <tabstop>stopCheckBox</tabstop> + <tabstop>sbsSelectLabel</tabstop> + <tabstop>detailsEdit</tabstop> + <tabstop>filesTree</tabstop> + <tabstop>diffSelectLabel</tabstop> + <tabstop>saveLabel</tabstop> + <tabstop>diffEdit</tabstop> + <tabstop>errors</tabstop> + <tabstop>input</tabstop> + <tabstop>passwordCheckBox</tabstop> + <tabstop>sendButton</tabstop> + </tabstops> + <resources/> + <connections/> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitMergeDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,225 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter the merge data. +""" + +from __future__ import unicode_literals + +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox + +from .Ui_GitMergeDialog import Ui_GitMergeDialog + + +class GitMergeDialog(QDialog, Ui_GitMergeDialog): + """ + Class implementing a dialog to enter the merge data. + """ + def __init__(self, tagsList, branchesList, currentBranch, + remoteBranchesList, parent=None): + """ + Constructor + + @param tagsList list of tags (list of strings) + @param branchesList list of branches (list of strings) + @param currentBranch name of the current branch (string) + @param remoteBranchesList list of remote branches (list of strings) + @param parent reference to the parent widget (QWidget) + """ + super(GitMergeDialog, self).__init__(parent) + self.setupUi(self) + + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) + + self.__currentBranch = currentBranch + + self.tagCombo.addItems(sorted(tagsList)) + if currentBranch in branchesList: + branchesList.remove(currentBranch) + self.branchCombo.addItems(sorted(branchesList)) + self.remoteBranchCombo.addItems(sorted(remoteBranchesList)) + + msh = self.minimumSizeHint() + self.resize(max(self.width(), msh.width()), msh.height()) + + def __updateOK(self): + """ + Private slot to update the OK button. + """ + enabled = True + if self.idButton.isChecked(): + enabled = self.idEdit.text() != "" + elif self.tagButton.isChecked(): + enabled = self.tagCombo.currentText() != "" + elif self.branchButton.isChecked(): + enabled = self.branchCombo.currentText() != "" + elif self.remoteBranchButton.isChecked(): + enabled = self.remoteBranchCombo.currentText() != "" + + enabled &= (self.commitGroupBox.isChecked() and + self.commitMessageEdit.toPlainText() != "") + + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enabled) + + def __generateDefaultCommitMessage(self): + """ + Private slot to generate a default commit message based on the + data entered. + """ + if self.commitGroupBox.isChecked(): + if self.idButton.isChecked(): + msg = "Merged commit {0} into {1}.".format( + self.idEdit.text(), self.__currentBranch) + elif self.tagButton.isChecked(): + msg = "Merged tag {0} into {1}.".format( + self.tagCombo.currentText(), self.__currentBranch) + elif self.branchButton.isChecked(): + msg = "Merged branch {0} into {1}.".format( + self.branchCombo.currentText(), self.__currentBranch) + elif self.remoteBranchButton.isChecked(): + msg = "Merged remote branch {0} into {1}.".format( + self.remoteBranchCombo.currentText(), self.__currentBranch) + else: + msg = "Merged into {0}.".format(self.__currentBranch) + self.commitMessageEdit.setPlainText(msg) + else: + self.commitMessageEdit.clear() + + @pyqtSlot(bool) + def on_idButton_toggled(self, checked): + """ + Private slot to handle changes of the ID select button. + + @param checked state of the button (boolean) + """ + self.__generateDefaultCommitMessage() + self.__updateOK() + + @pyqtSlot(bool) + def on_tagButton_toggled(self, checked): + """ + Private slot to handle changes of the Tag select button. + + @param checked state of the button (boolean) + """ + self.__generateDefaultCommitMessage() + self.__updateOK() + + @pyqtSlot(bool) + def on_branchButton_toggled(self, checked): + """ + Private slot to handle changes of the Branch select button. + + @param checked state of the button (boolean) + """ + self.__generateDefaultCommitMessage() + self.__updateOK() + + @pyqtSlot(bool) + def on_remoteBranchButton_toggled(self, checked): + """ + Private slot to handle changes of the Remote Branch select button. + + @param checked state of the button (boolean) + """ + self.__generateDefaultCommitMessage() + self.__updateOK() + + @pyqtSlot(bool) + def on_noneButton_toggled(self, checked): + """ + Private slot to handle changes of the None select button. + + @param checked state of the button (boolean) + """ + self.__generateDefaultCommitMessage() + + @pyqtSlot(str) + def on_idEdit_textChanged(self, txt): + """ + Private slot to handle changes of the Commit edit. + + @param txt text of the edit (string) + """ + self.__generateDefaultCommitMessage() + self.__updateOK() + + @pyqtSlot(str) + def on_tagCombo_editTextChanged(self, txt): + """ + Private slot to handle changes of the Tag combo. + + @param txt text of the combo (string) + """ + self.__generateDefaultCommitMessage() + self.__updateOK() + + @pyqtSlot(str) + def on_branchCombo_editTextChanged(self, txt): + """ + Private slot to handle changes of the Branch combo. + + @param txt text of the combo (string) + """ + self.__generateDefaultCommitMessage() + self.__updateOK() + + @pyqtSlot(str) + def on_remoteBranchCombo_editTextChanged(self, txt): + """ + Private slot to handle changes of the Remote Branch combo. + + @param txt text of the combo (string) + """ + self.__generateDefaultCommitMessage() + self.__updateOK() + + @pyqtSlot(bool) + def on_commitGroupBox_toggled(self, checked): + """ + Private slot to handle changes of the Commit select group. + + @param checked state of the group (boolean) + """ + self.__generateDefaultCommitMessage() + self.__updateOK() + + @pyqtSlot() + def on_commitMessageEdit_textChanged(self): + """ + Private slot to handle changes of the commit message edit. + """ + self.__updateOK() + + def getParameters(self): + """ + Public method to retrieve the merge data. + + @return tuple naming the revision, a flag indicating that the merge + shall be committed, the commit message, a flag indicating that a + log summary shall be appended and a flag indicating to show diff + statistics at the end of the merge (string, boolean, string, + boolean, boolean) + """ + if self.idButton.isChecked(): + rev = self.idEdit.text() + elif self.tagButton.isChecked(): + rev = self.tagCombo.currentText() + elif self.branchButton.isChecked(): + rev = self.branchCombo.currentText() + elif self.remoteBranchButton.isChecked(): + rev = self.remoteBranchCombo.currentText() + else: + rev = "" + + return ( + rev, + self.commitGroupBox.isChecked(), + self.commitMessageEdit.toPlainText(), + self.addLogCheckBox.isChecked(), + self.diffstatCheckBox.isChecked(), + )
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,309 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitMergeDialog</class> + <widget class="QDialog" name="GitMergeDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>451</width> + <height>491</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git Merge</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Revision</string> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QRadioButton" name="idButton"> + <property name="toolTip"> + <string>Select to specify a revision by changeset id</string> + </property> + <property name="text"> + <string>Commit:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLineEdit" name="idEdit"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter a commit id</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QRadioButton" name="tagButton"> + <property name="toolTip"> + <string>Select to specify a revision by a tag</string> + </property> + <property name="text"> + <string>Tag:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QComboBox" name="tagCombo"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter a tag name</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QRadioButton" name="branchButton"> + <property name="toolTip"> + <string>Select to specify a revision by a local branch</string> + </property> + <property name="text"> + <string>Local Branch:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QComboBox" name="branchCombo"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter a local branch name</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QRadioButton" name="remoteBranchButton"> + <property name="toolTip"> + <string>Select to specify a revision by a remote branch</string> + </property> + <property name="text"> + <string>Remote Branch:</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QComboBox" name="remoteBranchCombo"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter a remote branch name</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="4" column="0" colspan="2"> + <widget class="QRadioButton" name="noneButton"> + <property name="toolTip"> + <string>Select to not specify a specific revision</string> + </property> + <property name="text"> + <string>No commit selected</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="commitGroupBox"> + <property name="toolTip"> + <string>Select to commit the merge</string> + </property> + <property name="title"> + <string>Commit Merge</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Commit Message:</string> + </property> + </widget> + </item> + <item> + <widget class="QPlainTextEdit" name="commitMessageEdit"> + <property name="toolTip"> + <string>Enter a message for the merge commit</string> + </property> + <property name="tabChangesFocus"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="addLogCheckBox"> + <property name="toolTip"> + <string>Select to append the log summaries of merged commits</string> + </property> + <property name="text"> + <string>Add Log Message Summary</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QCheckBox" name="diffstatCheckBox"> + <property name="toolTip"> + <string>Select to show diff statistics at the end of the merge</string> + </property> + <property name="text"> + <string>Show diff statistics</string> + </property> + </widget> + </item> + <item> + <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> + <tabstops> + <tabstop>idButton</tabstop> + <tabstop>idEdit</tabstop> + <tabstop>tagButton</tabstop> + <tabstop>tagCombo</tabstop> + <tabstop>branchButton</tabstop> + <tabstop>branchCombo</tabstop> + <tabstop>remoteBranchButton</tabstop> + <tabstop>remoteBranchCombo</tabstop> + <tabstop>noneButton</tabstop> + <tabstop>commitGroupBox</tabstop> + <tabstop>commitMessageEdit</tabstop> + <tabstop>addLogCheckBox</tabstop> + <tabstop>diffstatCheckBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>GitMergeDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>238</x> + <y>480</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>GitMergeDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>306</x> + <y>480</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>idButton</sender> + <signal>toggled(bool)</signal> + <receiver>idEdit</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>80</x> + <y>58</y> + </hint> + <hint type="destinationlabel"> + <x>285</x> + <y>63</y> + </hint> + </hints> + </connection> + <connection> + <sender>tagButton</sender> + <signal>toggled(bool)</signal> + <receiver>tagCombo</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>49</x> + <y>89</y> + </hint> + <hint type="destinationlabel"> + <x>281</x> + <y>92</y> + </hint> + </hints> + </connection> + <connection> + <sender>branchButton</sender> + <signal>toggled(bool)</signal> + <receiver>branchCombo</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>101</x> + <y>120</y> + </hint> + <hint type="destinationlabel"> + <x>278</x> + <y>121</y> + </hint> + </hints> + </connection> + <connection> + <sender>remoteBranchButton</sender> + <signal>toggled(bool)</signal> + <receiver>remoteBranchCombo</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>87</x> + <y>138</y> + </hint> + <hint type="destinationlabel"> + <x>174</x> + <y>139</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,170 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the Git Options Dialog for a new project from the +repository. +""" + +from __future__ import unicode_literals + +from PyQt5.QtCore import pyqtSlot, QUrl +from PyQt5.QtWidgets import QDialog, QDialogButtonBox + +from E5Gui.E5Completers import E5DirCompleter +from E5Gui import E5FileDialog + +from .Ui_GitNewProjectOptionsDialog import Ui_GitNewProjectOptionsDialog +from .Config import ConfigGitSchemes + +import Utilities +import Preferences +import UI.PixmapCache + + +class GitNewProjectOptionsDialog(QDialog, Ui_GitNewProjectOptionsDialog): + """ + Class implementing the Options Dialog for a new project from the + repository. + """ + def __init__(self, vcs, parent=None): + """ + Constructor + + @param vcs reference to the version control object + @param parent parent widget (QWidget) + """ + super(GitNewProjectOptionsDialog, self).__init__(parent) + self.setupUi(self) + + self.__vcs = vcs + + self.projectDirButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.vcsUrlButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.vcsUrlClearHistoryButton.setIcon( + UI.PixmapCache.getIcon("editDelete.png")) + + vcsUrlHistory = self.__vcs.getPlugin().getPreferences( + "RepositoryUrlHistory") + self.vcsUrlCombo.addItems(vcsUrlHistory) + self.vcsUrlCombo.setEditText("") + + self.vcsDirectoryCompleter = E5DirCompleter(self.vcsUrlCombo) + self.vcsProjectDirCompleter = E5DirCompleter(self.vcsProjectDirEdit) + + ipath = Preferences.getMultiProject("Workspace") or \ + Utilities.getHomeDir() + self.__initPaths = [ + Utilities.fromNativeSeparators(ipath), + Utilities.fromNativeSeparators(ipath) + "/", + ] + self.vcsProjectDirEdit.setText( + Utilities.toNativeSeparators(self.__initPaths[0])) + + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) + + msh = self.minimumSizeHint() + self.resize(max(self.width(), msh.width()), msh.height()) + + @pyqtSlot(str) + def on_vcsProjectDirEdit_textChanged(self, txt): + """ + Private slot to handle a change of the project directory. + + @param txt name of the project directory (string) + """ + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled( + bool(txt) and + Utilities.fromNativeSeparators(txt) not in self.__initPaths) + + @pyqtSlot() + def on_vcsUrlButton_clicked(self): + """ + Private slot to display a selection dialog. + """ + directory = E5FileDialog.getExistingDirectory( + self, + self.tr("Select Repository-Directory"), + self.vcsUrlCombo.currentText(), + E5FileDialog.Options(E5FileDialog.ShowDirsOnly)) + + if directory: + self.vcsUrlCombo.setEditText( + Utilities.toNativeSeparators(directory)) + + @pyqtSlot() + def on_projectDirButton_clicked(self): + """ + Private slot to display a directory selection dialog. + """ + directory = E5FileDialog.getExistingDirectory( + self, + self.tr("Select Project Directory"), + self.vcsProjectDirEdit.text(), + E5FileDialog.Options(E5FileDialog.ShowDirsOnly)) + + if directory: + self.vcsProjectDirEdit.setText( + Utilities.toNativeSeparators(directory)) + + @pyqtSlot(str) + def on_vcsUrlCombo_editTextChanged(self, txt): + """ + Private slot to handle changes of the URL. + + @param txt current text of the combo box + @type str + """ + url = QUrl.fromUserInput(txt) + enable = url.isValid() and url.scheme() in ConfigGitSchemes + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enable) + + self.vcsUrlButton.setEnabled(url.scheme() == "file" or len(txt) == 0) + + @pyqtSlot() + def on_vcsUrlClearHistoryButton_clicked(self): + """ + Private slot to clear the history of entered repository URLs. + """ + currentVcsUrl = self.vcsUrlCombo.currentText() + self.vcsUrlCombo.clear() + self.vcsUrlCombo.setEditText(currentVcsUrl) + + self.__saveHistory() + + def getData(self): + """ + Public slot to retrieve the data entered into the dialog. + + @return a tuple of a string (project directory) and a dictionary + containing the data entered. + """ + self.__saveHistory() + + url = QUrl.fromUserInput( + self.vcsUrlCombo.currentText().replace("\\", "/")) + vcsdatadict = { + "url": url.toString(QUrl.None_), + } + return (self.vcsProjectDirEdit.text(), vcsdatadict) + + def __saveHistory(self): + """ + Private method to save the repository URL history. + """ + url = self.vcsUrlCombo.currentText() + vcsUrlHistory = [] + for index in range(self.vcsUrlCombo.count()): + vcsUrlHistory.append(self.vcsUrlCombo.itemText(index)) + if url not in vcsUrlHistory: + vcsUrlHistory.insert(0, url) + + # max. list sizes is hard coded to 20 entries + newVcsUrlHistory = [url for url in vcsUrlHistory if url] + if len(newVcsUrlHistory) > 20: + newVcsUrlHistory = newVcsUrlHistory[:20] + + self.__vcs.getPlugin().setPreferences( + "RepositoryUrlHistory", newVcsUrlHistory)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,150 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitNewProjectOptionsDialog</class> + <widget class="QDialog" name="GitNewProjectOptionsDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>562</width> + <height>110</height> + </rect> + </property> + <property name="windowTitle"> + <string>New Project from Repository</string> + </property> + <property name="whatsThis"> + <string><b>New Project from Repository Dialog</b> +<p>Enter the various repository infos into the entry fields. These values are used, when the new project is retrieved from the repository.</p> +<p>For remote repositories the URL must contain the hostname.</p></string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="TextLabel2"> + <property name="text"> + <string>&URL:</string> + </property> + <property name="buddy"> + <cstring>vcsUrlCombo</cstring> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QComboBox" name="vcsUrlCombo"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Enter the URL of the repository</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + <property name="insertPolicy"> + <enum>QComboBox::InsertAtTop</enum> + </property> + <property name="sizeAdjustPolicy"> + <enum>QComboBox::AdjustToMinimumContentsLength</enum> + </property> + </widget> + </item> + <item row="0" column="2"> + <widget class="QToolButton" name="vcsUrlButton"> + <property name="toolTip"> + <string>Select the repository url via a directory selection dialog</string> + </property> + </widget> + </item> + <item row="0" column="3"> + <widget class="QToolButton" name="vcsUrlClearHistoryButton"> + <property name="toolTip"> + <string>Press to clear the history of entered repository URLs</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="TextLabel4"> + <property name="text"> + <string>Project &Directory:</string> + </property> + <property name="buddy"> + <cstring>vcsProjectDirEdit</cstring> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLineEdit" name="vcsProjectDirEdit"> + <property name="toolTip"> + <string>Enter the directory of the new project.</string> + </property> + <property name="whatsThis"> + <string><b>Project Directory</b> +<p>Enter the directory of the new project. It will be retrieved from +the repository and be placed in this directory.</p></string> + </property> + </widget> + </item> + <item row="1" column="2"> + <widget class="QToolButton" name="projectDirButton"/> + </item> + <item row="2" column="0" colspan="4"> + <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> + <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> + <tabstops> + <tabstop>vcsUrlCombo</tabstop> + <tabstop>vcsUrlButton</tabstop> + <tabstop>vcsProjectDirEdit</tabstop> + <tabstop>projectDirButton</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>GitNewProjectOptionsDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>37</x> + <y>176</y> + </hint> + <hint type="destinationlabel"> + <x>38</x> + <y>198</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>GitNewProjectOptionsDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>147</x> + <y>177</y> + </hint> + <hint type="destinationlabel"> + <x>153</x> + <y>197</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitOptionsDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,46 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter options used to start a project in +the VCS. +""" + +from __future__ import unicode_literals + +from PyQt5.QtWidgets import QDialog + +from .Ui_GitOptionsDialog import Ui_GitOptionsDialog + + +class GitOptionsDialog(QDialog, Ui_GitOptionsDialog): + """ + Class implementing a dialog to enter options used to start a project in the + repository. + """ + def __init__(self, vcs, project, parent=None): + """ + Constructor + + @param vcs reference to the version control object + @param project reference to the project object + @param parent parent widget (QWidget) + """ + super(GitOptionsDialog, self).__init__(parent) + self.setupUi(self) + + msh = self.minimumSizeHint() + self.resize(max(self.width(), msh.width()), msh.height()) + + def getData(self): + """ + Public slot to retrieve the data entered into the dialog. + + @return a dictionary containing the data entered + """ + vcsdatadict = { + "message": self.vcsLogEdit.text(), + } + return vcsdatadict
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,103 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitOptionsDialog</class> + <widget class="QDialog" name="GitOptionsDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>565</width> + <height>78</height> + </rect> + </property> + <property name="windowTitle"> + <string>Initial Commit</string> + </property> + <property name="whatsThis"> + <string><b>Initial Commit Dialog</b> +<p>Enter the message for the initial commit.</p></string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLabel" name="TextLabel5"> + <property name="text"> + <string>Commit &Message:</string> + </property> + <property name="buddy"> + <cstring>vcsLogEdit</cstring> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="vcsLogEdit"> + <property name="toolTip"> + <string>Enter the log message for the new project.</string> + </property> + <property name="whatsThis"> + <string><b>Log Message</b> +<p>Enter the log message to be used for the new project.</p></string> + </property> + <property name="text"> + <string>new project started</string> + </property> + </widget> + </item> + </layout> + </item> + <item> + <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> + <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> + <tabstops> + <tabstop>vcsLogEdit</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>GitOptionsDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>56</x> + <y>68</y> + </hint> + <hint type="destinationlabel"> + <x>51</x> + <y>77</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>GitOptionsDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>213</x> + <y>68</y> + </hint> + <hint type="destinationlabel"> + <x>205</x> + <y>77</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,155 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2015 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to select a list of patch files. +""" + +from __future__ import unicode_literals + +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox + +from E5Gui import E5FileDialog + +from .Ui_GitPatchFilesDialog import Ui_GitPatchFilesDialog + +import UI.PixmapCache +import Utilities + + +class GitPatchFilesDialog(QDialog, Ui_GitPatchFilesDialog): + """ + Class implementing a dialog to select a list of patch files. + """ + def __init__(self, rootDir, patchCheckData, parent=None): + """ + Constructor + + @param rootDir root of the directory tree (string) + @param patchCheckData tuple of data as returned by the + getData() method + @param parent reference to the parent widget (QWidget) + """ + super(GitPatchFilesDialog, self).__init__(parent) + self.setupUi(self) + + self.__rootDir = rootDir + if patchCheckData is not None: + self.patchFilesList.addItems(patchCheckData[0]) + self.stripSpinBox.setValue(patchCheckData[1]) + self.eofCheckBox.setChecked(patchCheckData[2]) + self.lineCountsCheckBox.setChecked(patchCheckData[3]) + + self.addButton.setIcon(UI.PixmapCache.getIcon("plus.png")) + self.deleteButton.setIcon(UI.PixmapCache.getIcon("minus.png")) + self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png")) + self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png")) + + self.__okButton = self.buttonBox.button(QDialogButtonBox.Ok) + self.__okButton.setEnabled(len(self.__getPatchFilesList()) > 0) + + self.deleteButton.setEnabled(False) + self.upButton.setEnabled(False) + self.downButton.setEnabled(False) + + @pyqtSlot() + def on_patchFilesList_itemSelectionChanged(self): + """ + Private slot to enable button states depending on selection. + """ + selectedItems = self.patchFilesList.selectedItems() + count = len(selectedItems) + isFirst = ( + count == 1 and + self.patchFilesList.row(selectedItems[0]) == 0 + ) + isLast = ( + count == 1 and + self.patchFilesList.row(selectedItems[0]) == + self.patchFilesList.count() - 1 + ) + self.deleteButton.setEnabled(count > 0) + self.upButton.setEnabled(count == 1 and not isFirst) + self.downButton.setEnabled(count == 1 and not isLast) + + @pyqtSlot() + def on_addButton_clicked(self): + """ + Private slot to add patch files to the list. + """ + patchFiles = E5FileDialog.getOpenFileNames( + self, + self.tr("Patch Files"), + self.__rootDir, + self.tr("Patch Files (*.diff *.patch);;All Files (*)")) + if patchFiles: + currentPatchFiles = self.__getPatchFilesList() + for patchFile in patchFiles: + patchFile = Utilities.toNativeSeparators(patchFile) + if patchFile not in currentPatchFiles: + self.patchFilesList.addItem(patchFile) + + self.__okButton.setEnabled(len(self.__getPatchFilesList()) > 0) + self.on_patchFilesList_itemSelectionChanged() + + @pyqtSlot() + def on_deleteButton_clicked(self): + """ + Private slot to delete the selected patch files. + """ + for itm in self.patchFilesList.selectedItems(): + row = self.patchFilesList.row(itm) + self.patchFilesList.takeItem(row) + del itm + + self.__okButton.setEnabled(len(self.__getPatchFilesList()) > 0) + self.on_patchFilesList_itemSelectionChanged() + + @pyqtSlot() + def on_upButton_clicked(self): + """ + Private slot to move an entry up in the list. + """ + row = self.patchFilesList.row(self.patchFilesList.selectedItems()[0]) + itm = self.patchFilesList.takeItem(row) + self.patchFilesList.insertItem(row - 1, itm) + itm.setSelected(True) + + @pyqtSlot() + def on_downButton_clicked(self): + """ + Private slot to move an entry down in the list. + """ + row = self.patchFilesList.row(self.patchFilesList.selectedItems()[0]) + itm = self.patchFilesList.takeItem(row) + self.patchFilesList.insertItem(row + 1, itm) + itm.setSelected(True) + + def __getPatchFilesList(self): + """ + Private method to get the list of patch files. + + @return list of patch files (list of string) + """ + patchFiles = [] + for row in range(self.patchFilesList.count()): + itm = self.patchFilesList.item(row) + patchFiles.append(itm.text()) + + return patchFiles + + def getData(self): + """ + Public slot to get the entered data. + + @return tuple of list of patch files, strip count, flag indicating + that the patch has inaccurate end-of-file marker and a flag + indicating to not trust the line count information + (list of string, integer, boolean, boolean) + """ + return (self.__getPatchFilesList(), self.stripSpinBox.value(), + self.eofCheckBox.isChecked(), + self.lineCountsCheckBox.isChecked())
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,203 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitPatchFilesDialog</class> + <widget class="QDialog" name="GitPatchFilesDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>498</width> + <height>411</height> + </rect> + </property> + <property name="windowTitle"> + <string>Patch Files</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QListWidget" name="patchFilesList"> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::ExtendedSelection</enum> + </property> + </widget> + </item> + <item> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QToolButton" name="addButton"> + <property name="toolTip"> + <string>Press to add patch files to the list</string> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="deleteButton"> + <property name="toolTip"> + <string>Press to delete the selected patch files from the list</string> + </property> + </widget> + </item> + <item> + <widget class="Line" name="line"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="upButton"> + <property name="toolTip"> + <string>Press to move the selected file up</string> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="downButton"> + <property name="toolTip"> + <string>Press to move the selected file down</string> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>Strip Count:</string> + </property> + </widget> + </item> + <item> + <widget class="QSpinBox" name="stripSpinBox"> + <property name="toolTip"> + <string>Enter number of leading directories to strip off (default 1)</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="maximum"> + <number>9</number> + </property> + <property name="value"> + <number>1</number> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>118</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <widget class="QCheckBox" name="eofCheckBox"> + <property name="toolTip"> + <string>Select, if the patch has inaccurate end-of-file markers</string> + </property> + <property name="text"> + <string>Patch has inaccurate end-of-file</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="lineCountsCheckBox"> + <property name="toolTip"> + <string>Select, if the line counts of the patch header may be wrong</string> + </property> + <property name="text"> + <string>Don't trust line counts</string> + </property> + </widget> + </item> + <item> + <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> + <tabstops> + <tabstop>patchFilesList</tabstop> + <tabstop>addButton</tabstop> + <tabstop>deleteButton</tabstop> + <tabstop>upButton</tabstop> + <tabstop>downButton</tabstop> + <tabstop>stripSpinBox</tabstop> + <tabstop>eofCheckBox</tabstop> + <tabstop>lineCountsCheckBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>GitPatchFilesDialog</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>GitPatchFilesDialog</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/GitPatchStatisticsDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,168 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2015 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to show some patch file statistics. +""" + +from __future__ import unicode_literals +try: + str = unicode +except NameError: + pass + +import os + +from PyQt5.QtCore import Qt, QProcess +from PyQt5.QtWidgets import QDialog, QTreeWidgetItem, QHeaderView + +from E5Gui import E5MessageBox + +from .Ui_GitPatchStatisticsDialog import Ui_GitPatchStatisticsDialog + +import Preferences + + +class GitPatchStatisticsDialog(QDialog, Ui_GitPatchStatisticsDialog): + """ + Class implementing a dialog to show some patch file statistics. + """ + def __init__(self, vcs, parent=None): + """ + Constructor + + @param vcs reference to the VCS object (Git) + @param parent reference to the parent widget (QWidget) + """ + super(GitPatchStatisticsDialog, self).__init__(parent) + self.setupUi(self) + self.setWindowFlags(Qt.Window) + + self.__vcs = vcs + + self.changesTreeWidget.headerItem().setText( + self.changesTreeWidget.columnCount(), "") + self.changesTreeWidget.header().setSortIndicator(2, Qt.AscendingOrder) + + def start(self, projectDir, patchCheckData): + """ + Public method to start the statistics process. + + @param projectDir directory name of the project (string) + @param patchCheckData tuple of data as returned by the + GitPatchFilesDialog.getData() method + """ + self.__patchCheckData = patchCheckData + + self.changesTreeWidget.clear() + self.summaryEdit.clear() + + # find the root of the repo + repodir = projectDir + while not os.path.isdir(os.path.join(repodir, self.__vcs.adminDir)): + repodir = os.path.dirname(repodir) + if os.path.splitdrive(repodir)[1] == os.sep: + return + + from .GitPatchFilesDialog import GitPatchFilesDialog + dlg = GitPatchFilesDialog(repodir, patchCheckData) + if dlg.exec_() == QDialog.Accepted: + patchFilesList, stripCount, inaccurateEof, recount = dlg.getData() + self.__patchCheckData = (patchFilesList, stripCount, + inaccurateEof, recount) + if patchFilesList: + process = QProcess() + process.setWorkingDirectory(repodir) + + # step 1: get the statistics + args = self.__vcs.initCommand("apply") + args.append("--numstat") + if inaccurateEof: + args.append("--inaccurate-eof") + if recount: + args.append("--recount") + args.append("-p{0}".format(stripCount)) + args.extend(patchFilesList) + + process.start('git', args) + procStarted = process.waitForStarted(5000) + if not procStarted: + E5MessageBox.critical( + self, + self.tr('Process Generation Error'), + self.tr( + 'The process {0} could not be started. ' + 'Ensure, that it is in the search path.' + ).format('git')) + return + else: + finished = process.waitForFinished(30000) + if finished and process.exitCode() == 0: + output = str(process.readAllStandardOutput(), + Preferences.getSystem("IOEncoding"), + 'replace') + for line in output.splitlines(): + self.__createStatisticsItem(line) + + # step 2: get the summary + args = self.__vcs.initCommand("apply") + args.append("--summary") + if inaccurateEof: + args.append("--inaccurate-eof") + if recount: + args.append("--recount") + args.append("-p{0}".format(stripCount)) + args.extend(patchFilesList) + + process.start('git', args) + procStarted = process.waitForStarted(5000) + if not procStarted: + E5MessageBox.critical( + self, + self.tr('Process Generation Error'), + self.tr( + 'The process {0} could not be started. ' + 'Ensure, that it is in the search path.' + ).format('git')) + return + else: + finished = process.waitForFinished(30000) + if finished and process.exitCode() == 0: + output = str(process.readAllStandardOutput(), + Preferences.getSystem("IOEncoding"), + 'replace') + for line in output.splitlines(): + self.summaryEdit.appendPlainText(line.strip()) + + def __createStatisticsItem(self, line): + """ + Private method to create a file statistics entry. + + @param line string with file statistics data (string) + """ + insertions, deletions, filename = line.strip().split(None, 2) + itm = QTreeWidgetItem(self.changesTreeWidget, + [insertions, deletions, filename]) + itm.setTextAlignment(0, Qt.AlignRight) + itm.setTextAlignment(1, Qt.AlignRight) + + def __resizeColumns(self): + """ + Private method to resize the list columns. + """ + self.changesTreeWidget.header().resizeSections( + QHeaderView.ResizeToContents) + self.changesTreeWidget.header().setStretchLastSection(True) + + def getData(self): + """ + Public method to get the data used to generate the statistics. + + @return tuple of list of patch files, strip count, flag indicating + that the patch has inaccurate end-of-file marker and a flag + indicating to not trust the line count information + (list of string, integer, boolean, boolean) + """ + return self.__patchCheckData
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,140 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitPatchStatisticsDialog</class> + <widget class="QDialog" name="GitPatchStatisticsDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>550</width> + <height>450</height> + </rect> + </property> + <property name="windowTitle"> + <string>Patch Statistics</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Insertions and Deletions:</string> + </property> + </widget> + </item> + <item> + <widget class="QTreeWidget" name="changesTreeWidget"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>4</verstretch> + </sizepolicy> + </property> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::NoSelection</enum> + </property> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <property name="itemsExpandable"> + <bool>false</bool> + </property> + <property name="sortingEnabled"> + <bool>true</bool> + </property> + <column> + <property name="text"> + <string># Insertions</string> + </property> + </column> + <column> + <property name="text"> + <string># Deletions</string> + </property> + </column> + <column> + <property name="text"> + <string>File</string> + </property> + </column> + </widget> + </item> + <item> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Summary Information:</string> + </property> + </widget> + </item> + <item> + <widget class="QPlainTextEdit" name="summaryEdit"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>2</verstretch> + </sizepolicy> + </property> + <property name="tabChangesFocus"> + <bool>true</bool> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="textInteractionFlags"> + <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set> + </property> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>GitPatchStatisticsDialog</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>GitPatchStatisticsDialog</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/GitPullDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,161 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2015 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter data for a Pull operation. +""" + +from __future__ import unicode_literals + +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox + +from .Ui_GitPullDialog import Ui_GitPullDialog + + +class GitPullDialog(QDialog, Ui_GitPullDialog): + """ + Class implementing a dialog to enter data for a Pull operation. + """ + def __init__(self, vcs, repodir, parent=None): + """ + Constructor + + @param vcs reference to the git object + @param repodir directory name of the local repository (string) + @param parent reference to the parent widget (QWidget) + """ + super(GitPullDialog, self).__init__(parent) + self.setupUi(self) + + self.__vcs = vcs + self.__repodir = repodir + + self.__all = self.tr("<All>") + self.__custom = self.tr("<Custom>") + + remoteUrlsList = self.__vcs.gitGetRemoteUrlsList(self.__repodir) + self.__repos = {name: url for name, url in remoteUrlsList} + + self.__okButton = self.buttonBox.button(QDialogButtonBox.Ok) + + self.remotesComboBox.addItems(sorted(self.__repos.keys())) + self.remotesComboBox.addItem(self.__all) + self.remotesComboBox.addItem(self.__custom) + + index = self.remotesComboBox.findText("origin") + if index == -1: + index = 0 + self.remotesComboBox.setCurrentIndex(index) + + def __okButtonEnable(self): + """ + Private slot to set the enabled state of the OK button. + """ + self.__okButton.setEnabled( + self.remoteBranchesList.count() > 0 or + self.remotesComboBox.currentText() == self.__all + ) + + def __updateButtonEnable(self): + """ + Private slot to set the enabled state of the update button. + """ + remote = self.remotesComboBox.currentText() + enable = remote != self.__all + if remote == self.__custom: + enable = self.remoteEdit.text() != "" + + self.updateButton.setEnabled(enable) + + @pyqtSlot(str) + def on_remotesComboBox_currentTextChanged(self, txt): + """ + Private slot to handle changes of the selected repository. + + @param txt current text of the combo box (string) + """ + self.remoteEdit.setReadOnly(txt != self.__custom) + self.remoteBranchesList.setEnabled(txt != self.__all) + self.remoteEdit.clear() + self.remoteBranchesList.clear() + self.__updateButtonEnable() + self.__okButtonEnable() + + if txt not in [self.__all, self.__custom]: + remoteBranches = self.__vcs.gitGetRemoteBranchesList( + self.__repodir, txt) + self.remoteBranchesList.addItems(sorted(remoteBranches)) + + if txt in self.__repos: + self.remoteEdit.setText(self.__repos[txt]) + + @pyqtSlot(str) + def on_remoteEdit_textChanged(self, txt): + """ + Private slot to handle changes of the URL edit. + + @param txt current text of the URL edit (string) + """ + self.__updateButtonEnable() + + if self.remotesComboBox.currentText() == self.__custom and \ + txt != "": + remoteBranches = self.__vcs.gitGetRemoteBranchesList( + self.__repodir, txt) + self.remoteBranchesList.clear() + self.remoteBranchesList.addItems(sorted(remoteBranches)) + + self.__okButtonEnable() + + @pyqtSlot() + def on_updateButton_clicked(self): + """ + Private slot to update the list of remote branches. + """ + remote = self.remotesComboBox.currentText() + if remote == self.__all: + # shouldn't happen + return + + if remote == self.__custom: + remote = self.remoteEdit.text() + if remote == "": + # shouldn't happen either + return + + remoteBranches = self.__vcs.gitGetRemoteBranchesList( + self.__repodir, remote) + self.remoteBranchesList.clear() + self.remoteBranchesList.addItems(sorted(remoteBranches)) + + self.__okButtonEnable() + + def getData(self): + """ + Public method to get the entered data. + + @return tuple of remote name, remote url (for custom remotes), + remote branches, a flag indicating to pull from all repositories + and a flag indicating to remove obsolete tracking references + (string, string, list of strings, boolean, boolean) + """ + remote = "" + url = "" + branches = [] + allRepos = False + + remoteRepo = self.remotesComboBox.currentText() + if remoteRepo == self.__all: + allRepos = True + else: + if remoteRepo == self.__custom: + url = self.remoteEdit.text() + else: + remote = remoteRepo + for itm in self.remoteBranchesList.selectedItems(): + branches.append(itm.text()) + + return remote, url, branches, allRepos, self.pruneCheckBox.isChecked()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitPullDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,155 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitPullDialog</class> + <widget class="QDialog" name="GitPullDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>400</width> + <height>344</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git Pull</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>Remote Repository:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QComboBox" name="remotesComboBox"> + <property name="toolTip"> + <string>Select the remote repository to pull from</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLineEdit" name="remoteEdit"> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="2" column="0"> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Remote Branches:</string> + </property> + <property name="alignment"> + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="updateButton"> + <property name="toolTip"> + <string>Press to update the list of remote branches</string> + </property> + <property name="text"> + <string>Update</string> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item row="2" column="1"> + <widget class="QListWidget" name="remoteBranchesList"> + <property name="toolTip"> + <string>Select the remote branches to be pulled</string> + </property> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::ExtendedSelection</enum> + </property> + </widget> + </item> + <item row="3" column="0" colspan="2"> + <widget class="QCheckBox" name="pruneCheckBox"> + <property name="toolTip"> + <string>Select to remove non-existing tracking references </string> + </property> + <property name="text"> + <string>Prune obsolete tracking references</string> + </property> + </widget> + </item> + <item row="4" 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> + <tabstops> + <tabstop>remotesComboBox</tabstop> + <tabstop>remoteEdit</tabstop> + <tabstop>remoteBranchesList</tabstop> + <tabstop>updateButton</tabstop> + <tabstop>pruneCheckBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>GitPullDialog</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>GitPullDialog</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/GitPushDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,200 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2015 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter data for a Push operation. +""" + +from __future__ import unicode_literals + +from PyQt5.QtCore import pyqtSlot, Qt +from PyQt5.QtWidgets import QDialog, QTreeWidgetItem, QComboBox + +from .Ui_GitPushDialog import Ui_GitPushDialog + + +class GitPushDialog(QDialog, Ui_GitPushDialog): + """ + Class implementing a dialog to enter data for a Push operation. + """ + PushColumn = 0 + LocalBranchColumn = 1 + RemoteBranchColumn = 2 + ForceColumn = 3 + + def __init__(self, vcs, repodir, parent=None): + """ + Constructor + + @param vcs reference to the git object + @param repodir directory name of the local repository (string) + @param parent reference to the parent widget (QWidget) + """ + super(GitPushDialog, self).__init__(parent) + self.setupUi(self) + + self.__vcs = vcs + self.__repodir = repodir + + remoteUrlsList = self.__vcs.gitGetRemoteUrlsList(self.__repodir) + self.__repos = {name: url for name, url in remoteUrlsList} + + remoteBranches = self.__vcs.gitGetBranchesList(self.__repodir, + remotes=True) + self.__remotes = {} + for remoteBranch in remoteBranches: + repo, branch = remoteBranch.rsplit("/", 2)[-2:] + if repo not in self.__remotes: + self.__remotes[repo] = [] + self.__remotes[repo].append(branch) + + self.__localBranches = self.__vcs.gitGetBranchesList(self.__repodir, + withMaster=True) + + self.remotesComboBox.addItems(sorted(self.__repos.keys())) + + for localBranch in self.__localBranches: + itm = QTreeWidgetItem(self.branchesTree, ["", localBranch, "", ""]) + combo = QComboBox() + combo.setEditable(True) + combo.setSizeAdjustPolicy(QComboBox.AdjustToContents) + self.branchesTree.setItemWidget( + itm, GitPushDialog.RemoteBranchColumn, combo) + + self.__resizeColumns() + + self.branchesTree.header().setSortIndicator( + GitPushDialog.LocalBranchColumn, Qt.AscendingOrder) + + self.forceWarningLabel.setVisible(False) + + index = self.remotesComboBox.findText("origin") + if index == -1: + index = 0 + self.remotesComboBox.setCurrentIndex(index) + + def __resizeColumns(self): + """ + Private slot to adjust the column sizes. + """ + for col in range(self.branchesTree.columnCount()): + self.branchesTree.resizeColumnToContents(col) + + @pyqtSlot(str) + def on_remotesComboBox_currentTextChanged(self, txt): + """ + Private slot to handle changes of the selected repository. + + @param txt current text of the combo box (string) + """ + self.remoteEdit.setText(self.__repos[txt]) + + for row in range(self.branchesTree.topLevelItemCount()): + itm = self.branchesTree.topLevelItem(row) + localBranch = itm.text(GitPushDialog.LocalBranchColumn) + combo = self.branchesTree.itemWidget( + itm, GitPushDialog.RemoteBranchColumn) + combo.clear() + combo.addItems([""] + sorted(self.__remotes[txt])) + index = combo.findText(localBranch) + if index != -1: + combo.setCurrentIndex(index) + itm.setCheckState(GitPushDialog.PushColumn, Qt.Checked) + else: + itm.setCheckState(GitPushDialog.PushColumn, Qt.Unchecked) + itm.setCheckState(GitPushDialog.ForceColumn, Qt.Unchecked) + + self.__resizeColumns() + + @pyqtSlot(QTreeWidgetItem, int) + def on_branchesTree_itemChanged(self, item, column): + """ + Private slot handling changes of a branch item. + + @param item reference to the changed item (QTreeWidgetItem) + @param column changed column (integer) + """ + if column == GitPushDialog.PushColumn: + # step 1: set the item's remote branch, if it is empty + if item.checkState(GitPushDialog.PushColumn) == Qt.Checked and \ + (self.branchesTree.itemWidget( + item, + GitPushDialog.RemoteBranchColumn) + .currentText() == ""): + self.branchesTree.itemWidget( + item, GitPushDialog.RemoteBranchColumn).setEditText( + item.text(GitPushDialog.LocalBranchColumn)) + + # step 2: count checked items + checkedItemsCount = 0 + for row in range(self.branchesTree.topLevelItemCount()): + itm = self.branchesTree.topLevelItem(row) + if itm.checkState(GitPushDialog.PushColumn) == Qt.Checked: + checkedItemsCount += 1 + if checkedItemsCount == len(self.__localBranches): + self.selectAllCheckBox.setCheckState(Qt.Checked) + elif checkedItemsCount == 0: + self.selectAllCheckBox.setCheckState(Qt.Unchecked) + else: + self.selectAllCheckBox.setCheckState(Qt.PartiallyChecked) + + elif column == GitPushDialog.ForceColumn: + forceItemsCount = 0 + for row in range(self.branchesTree.topLevelItemCount()): + itm = self.branchesTree.topLevelItem(row) + if itm.checkState(GitPushDialog.ForceColumn) == Qt.Checked: + forceItemsCount += 1 + self.forceWarningLabel.setVisible(forceItemsCount > 0) + + @pyqtSlot(int) + def on_selectAllCheckBox_stateChanged(self, state): + """ + Private slot to select/deselect all branch items. + + @param state check state of the check box (Qt.CheckState) + """ + if state != Qt.PartiallyChecked: + for row in range(self.branchesTree.topLevelItemCount()): + itm = self.branchesTree.topLevelItem(row) + if itm.checkState(GitPushDialog.PushColumn) != state: + itm.setCheckState(GitPushDialog.PushColumn, state) + + def getData(self): + """ + Public method to get the entered data. + + @return remote name, list of branches to be pushed, + a flag indicating to push tags as well, a flag indicating + to set tracking information and the push method for submodules + @rtype tuple of (str, list of str, bool, bool, str) + """ + refspecs = [] + for row in range(self.branchesTree.topLevelItemCount()): + itm = self.branchesTree.topLevelItem(row) + force = itm.checkState(GitPushDialog.ForceColumn) == Qt.Checked + if itm.checkState(GitPushDialog.PushColumn) == Qt.Checked: + localBranch = itm.text(GitPushDialog.LocalBranchColumn) + remoteBranch = self.branchesTree.itemWidget( + itm, GitPushDialog.RemoteBranchColumn).currentText() + refspecs.append("{0}{1}:{2}".format( + "+" if force else "", localBranch, remoteBranch)) + + # submodule stuff (--recurse-submodules=) + if self.submodulesOnDemandButton.isChecked(): + submodulesPush = "on-demand" + elif self.submodulesCheckButton.isChecked(): + submodulesPush = "check" + elif self.submodulesOnlyButton.isChecked(): + submodulesPush = "only" + else: + submodulesPush = "no" + + return ( + self.remotesComboBox.currentText(), + refspecs, + self.tagsCheckBox.isChecked(), + self.trackingCheckBox.isChecked(), + submodulesPush, + )
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitPushDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,243 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitPushDialog</class> + <widget class="QDialog" name="GitPushDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>600</width> + <height>400</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git Push</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Remote Repository:</string> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="remotesComboBox"> + <property name="toolTip"> + <string>Select the remote repository to push to</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="remoteEdit"> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Branches to be pushed</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QTreeWidget" name="branchesTree"> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <property name="itemsExpandable"> + <bool>false</bool> + </property> + <property name="sortingEnabled"> + <bool>true</bool> + </property> + <property name="expandsOnDoubleClick"> + <bool>false</bool> + </property> + <column> + <property name="text"> + <string>Push?</string> + </property> + </column> + <column> + <property name="text"> + <string>Local</string> + </property> + </column> + <column> + <property name="text"> + <string>Remote</string> + </property> + </column> + <column> + <property name="text"> + <string>Force?</string> + </property> + </column> + </widget> + </item> + <item> + <widget class="QCheckBox" name="selectAllCheckBox"> + <property name="toolTip"> + <string>Press to select all branches</string> + </property> + <property name="text"> + <string>Select All</string> + </property> + <property name="tristate"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="forceWarningLabel"> + <property name="text"> + <string><b>WARNING: The "Force" option can result in dangling branches in the remote repository.</b></string> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QCheckBox" name="tagsCheckBox"> + <property name="toolTip"> + <string>Select to push tags as well</string> + </property> + <property name="text"> + <string>Include tags</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="trackingCheckBox"> + <property name="toolTip"> + <string>Select this to associate a remote tracking branch</string> + </property> + <property name="text"> + <string>Set tracking information</string> + </property> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox_2"> + <property name="title"> + <string>Push Submodules</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QRadioButton" name="submodulesOnDemandButton"> + <property name="toolTip"> + <string>Select to push submodules automatically</string> + </property> + <property name="text"> + <string>on-demand</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QRadioButton" name="submodulesCheckButton"> + <property name="toolTip"> + <string>Select to check, if submodules were pushed already</string> + </property> + <property name="text"> + <string>check</string> + </property> + </widget> + </item> + <item> + <widget class="QRadioButton" name="submodulesOnlyButton"> + <property name="toolTip"> + <string>Select to push submodules only</string> + </property> + <property name="text"> + <string>only</string> + </property> + </widget> + </item> + <item> + <widget class="QRadioButton" name="submodulesNoButton"> + <property name="toolTip"> + <string>Select to not push any submodule</string> + </property> + <property name="text"> + <string>no</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <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> + <tabstops> + <tabstop>remotesComboBox</tabstop> + <tabstop>remoteEdit</tabstop> + <tabstop>branchesTree</tabstop> + <tabstop>selectAllCheckBox</tabstop> + <tabstop>tagsCheckBox</tabstop> + <tabstop>trackingCheckBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>GitPushDialog</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>GitPushDialog</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/GitReflogBrowserDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,432 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to browse the reflog history. +""" + +from __future__ import unicode_literals +try: + str = unicode +except NameError: + pass + +import os + +from PyQt5.QtCore import pyqtSlot, Qt, QProcess, QTimer, QPoint +from PyQt5.QtGui import QCursor +from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QHeaderView, \ + QTreeWidgetItem, QApplication, QLineEdit + +from E5Gui import E5MessageBox + +from .Ui_GitReflogBrowserDialog import Ui_GitReflogBrowserDialog + +from .GitUtilities import strToQByteArray + +import Preferences + + +class GitReflogBrowserDialog(QWidget, Ui_GitReflogBrowserDialog): + """ + Class implementing a dialog to browse the reflog history. + """ + CommitIdColumn = 0 + SelectorColumn = 1 + NameColumn = 2 + OperationColumn = 3 + SubjectColumn = 4 + + def __init__(self, vcs, parent=None): + """ + Constructor + + @param vcs reference to the vcs object + @param parent reference to the parent widget (QWidget) + """ + super(GitReflogBrowserDialog, self).__init__(parent) + self.setupUi(self) + + self.__position = QPoint() + + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) + + self.logTree.headerItem().setText(self.logTree.columnCount(), "") + + self.refreshButton = self.buttonBox.addButton( + self.tr("&Refresh"), QDialogButtonBox.ActionRole) + self.refreshButton.setToolTip( + self.tr("Press to refresh the list of commits")) + self.refreshButton.setEnabled(False) + + self.vcs = vcs + + self.__formatTemplate = ( + 'format:recordstart%n' + 'commit|%h%n' + 'selector|%gd%n' + 'name|%gn%n' + 'subject|%gs%n' + 'recordend%n' + ) + + self.repodir = "" + self.__currentCommitId = "" + + self.__initData() + self.__resetUI() + + self.process = QProcess() + self.process.finished.connect(self.__procFinished) + self.process.readyReadStandardOutput.connect(self.__readStdout) + self.process.readyReadStandardError.connect(self.__readStderr) + + def __initData(self): + """ + Private method to (re-)initialize some data. + """ + self.buf = [] # buffer for stdout + self.__started = False + self.__skipEntries = 0 + + def closeEvent(self, e): + """ + Protected slot implementing a close event handler. + + @param e close event (QCloseEvent) + """ + if self.process is not None and \ + self.process.state() != QProcess.NotRunning: + self.process.terminate() + QTimer.singleShot(2000, self.process.kill) + self.process.waitForFinished(3000) + + self.__position = self.pos() + + e.accept() + + def show(self): + """ + Public slot to show the dialog. + """ + if not self.__position.isNull(): + self.move(self.__position) + self.__resetUI() + + super(GitReflogBrowserDialog, self).show() + + def __resetUI(self): + """ + Private method to reset the user interface. + """ + self.limitSpinBox.setValue(self.vcs.getPlugin().getPreferences( + "LogLimit")) + + self.logTree.clear() + + def __resizeColumnsLog(self): + """ + Private method to resize the log tree columns. + """ + self.logTree.header().resizeSections(QHeaderView.ResizeToContents) + self.logTree.header().setStretchLastSection(True) + + def __generateReflogItem(self, commitId, selector, name, subject): + """ + Private method to generate a reflog tree entry. + + @param commitId commit id info (string) + @param selector selector info (string) + @param name name info (string) + @param subject subject of the reflog entry (string) + @return reference to the generated item (QTreeWidgetItem) + """ + operation, subject = subject.strip().split(": ", 1) + columnLabels = [ + commitId, + selector, + name, + operation, + subject, + ] + itm = QTreeWidgetItem(self.logTree, columnLabels) + return itm + + def __getReflogEntries(self, skip=0): + """ + Private method to retrieve reflog entries from the repository. + + @param skip number of reflog entries to skip (integer) + """ + self.refreshButton.setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True) + self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) + QApplication.processEvents() + + QApplication.setOverrideCursor(QCursor(Qt.WaitCursor)) + QApplication.processEvents() + + self.buf = [] + self.cancelled = False + self.errors.clear() + self.intercept = False + + args = self.vcs.initCommand("log") + args.append("--walk-reflogs") + args.append('--max-count={0}'.format(self.limitSpinBox.value())) + args.append('--abbrev={0}'.format( + self.vcs.getPlugin().getPreferences("CommitIdLength"))) + args.append('--format={0}'.format(self.__formatTemplate)) + args.append('--skip={0}'.format(skip)) + + self.process.kill() + + self.process.setWorkingDirectory(self.repodir) + + self.inputGroup.setEnabled(True) + self.inputGroup.show() + + self.process.start('git', args) + procStarted = self.process.waitForStarted(5000) + if not procStarted: + self.inputGroup.setEnabled(False) + self.inputGroup.hide() + E5MessageBox.critical( + self, + self.tr('Process Generation Error'), + self.tr( + 'The process {0} could not be started. ' + 'Ensure, that it is in the search path.' + ).format('git')) + + def start(self, projectdir): + """ + Public slot to start the git log command. + + @param projectdir directory name of the project (string) + """ + self.errorGroup.hide() + QApplication.processEvents() + + self.__initData() + + # find the root of the repo + self.repodir = projectdir + while not os.path.isdir(os.path.join(self.repodir, self.vcs.adminDir)): + self.repodir = os.path.dirname(self.repodir) + if os.path.splitdrive(self.repodir)[1] == os.sep: + return + + self.activateWindow() + self.raise_() + + self.logTree.clear() + self.__started = True + self.__getReflogEntries() + + def __procFinished(self, exitCode, exitStatus): + """ + Private slot connected to the finished signal. + + @param exitCode exit code of the process (integer) + @param exitStatus exit status of the process (QProcess.ExitStatus) + """ + self.__processBuffer() + self.__finish() + + def __finish(self): + """ + Private slot called when the process finished or the user pressed + the button. + """ + if self.process is not None and \ + self.process.state() != QProcess.NotRunning: + self.process.terminate() + QTimer.singleShot(2000, self.process.kill) + self.process.waitForFinished(3000) + + QApplication.restoreOverrideCursor() + + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) + self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) + + self.inputGroup.setEnabled(False) + self.inputGroup.hide() + self.refreshButton.setEnabled(True) + + def __processBuffer(self): + """ + Private method to process the buffered output of the git log command. + """ + noEntries = 0 + + for line in self.buf: + line = line.rstrip() + if line == "recordstart": + logEntry = {} + elif line == "recordend": + if len(logEntry) > 1: + self.__generateReflogItem( + logEntry["commit"], logEntry["selector"], + logEntry["name"], logEntry["subject"], + ) + noEntries += 1 + else: + try: + key, value = line.split("|", 1) + except ValueError: + key = "" + value = line + if key in ("commit", "selector", "name", "subject"): + logEntry[key] = value.strip() + + self.__resizeColumnsLog() + + if self.__started: + self.logTree.setCurrentItem(self.logTree.topLevelItem(0)) + self.__started = False + + self.__skipEntries += noEntries + if noEntries < self.limitSpinBox.value() and not self.cancelled: + self.nextButton.setEnabled(False) + self.limitSpinBox.setEnabled(False) + else: + self.nextButton.setEnabled(True) + self.limitSpinBox.setEnabled(True) + + # restore current item + if self.__currentCommitId: + items = self.logTree.findItems( + self.__currentCommitId, Qt.MatchExactly, self.CommitIdColumn) + if items: + self.logTree.setCurrentItem(items[0]) + self.__currentCommitId = "" + + def __readStdout(self): + """ + Private slot to handle the readyReadStandardOutput signal. + + It reads the output of the process and inserts it into a buffer. + """ + self.process.setReadChannel(QProcess.StandardOutput) + + while self.process.canReadLine(): + line = str(self.process.readLine(), + Preferences.getSystem("IOEncoding"), + 'replace') + self.buf.append(line) + + def __readStderr(self): + """ + Private slot to handle the readyReadStandardError signal. + + It reads the error output of the process and inserts it into the + error pane. + """ + if self.process is not None: + s = str(self.process.readAllStandardError(), + Preferences.getSystem("IOEncoding"), + 'replace') + self.__showError(s) + + def __showError(self, out): + """ + Private slot to show some error. + + @param out error to be shown (string) + """ + self.errorGroup.show() + self.errors.insertPlainText(out) + self.errors.ensureCursorVisible() + + def on_buttonBox_clicked(self, button): + """ + Private slot called by a button of the button box clicked. + + @param button button that was clicked (QAbstractButton) + """ + if button == self.buttonBox.button(QDialogButtonBox.Close): + self.close() + elif button == self.buttonBox.button(QDialogButtonBox.Cancel): + self.cancelled = True + self.__finish() + elif button == self.refreshButton: + self.on_refreshButton_clicked() + + @pyqtSlot() + def on_refreshButton_clicked(self): + """ + Private slot to refresh the log. + """ + # save the current item's commit ID + itm = self.logTree.currentItem() + if itm is not None: + self.__currentCommitId = itm.text(self.CommitIdColumn) + else: + self.__currentCommitId = "" + + self.start(self.repodir) + + def on_passwordCheckBox_toggled(self, isOn): + """ + Private slot to handle the password checkbox toggled. + + @param isOn flag indicating the status of the check box (boolean) + """ + if isOn: + self.input.setEchoMode(QLineEdit.Password) + else: + self.input.setEchoMode(QLineEdit.Normal) + + @pyqtSlot() + def on_sendButton_clicked(self): + """ + Private slot to send the input to the git process. + """ + inputTxt = self.input.text() + inputTxt += os.linesep + + if self.passwordCheckBox.isChecked(): + self.errors.insertPlainText(os.linesep) + self.errors.ensureCursorVisible() + else: + self.errors.insertPlainText(inputTxt) + self.errors.ensureCursorVisible() + self.errorGroup.show() + + self.process.write(strToQByteArray(inputTxt)) + + self.passwordCheckBox.setChecked(False) + self.input.clear() + + def on_input_returnPressed(self): + """ + Private slot to handle the press of the return key in the input field. + """ + self.intercept = True + self.on_sendButton_clicked() + + def keyPressEvent(self, evt): + """ + Protected slot to handle a key press event. + + @param evt the key press event (QKeyEvent) + """ + if self.intercept: + self.intercept = False + evt.accept() + return + super(GitReflogBrowserDialog, self).keyPressEvent(evt) + + @pyqtSlot() + def on_nextButton_clicked(self): + """ + Private slot to handle the Next button. + """ + if self.__skipEntries > 0: + self.__getReflogEntries(self.__skipEntries)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,222 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitReflogBrowserDialog</class> + <widget class="QWidget" name="GitReflogBrowserDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>800</width> + <height>600</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git Reflog</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QTreeWidget" name="logTree"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>7</verstretch> + </sizepolicy> + </property> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::ExtendedSelection</enum> + </property> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <property name="itemsExpandable"> + <bool>false</bool> + </property> + <property name="allColumnsShowFocus"> + <bool>true</bool> + </property> + <column> + <property name="text"> + <string>Commit</string> + </property> + </column> + <column> + <property name="text"> + <string>Selector</string> + </property> + </column> + <column> + <property name="text"> + <string>Name</string> + </property> + </column> + <column> + <property name="text"> + <string>Operation</string> + </property> + </column> + <column> + <property name="text"> + <string>Subject</string> + </property> + </column> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QPushButton" name="nextButton"> + <property name="toolTip"> + <string>Press to get the next bunch of log entries</string> + </property> + <property name="text"> + <string>&Next</string> + </property> + </widget> + </item> + <item> + <widget class="QSpinBox" name="limitSpinBox"> + <property name="toolTip"> + <string>Enter the limit of entries to fetch</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>10000</number> + </property> + <property name="value"> + <number>20</number> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <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"> + <horstretch>0</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Errors</string> + </property> + <layout class="QVBoxLayout"> + <item> + <widget class="QTextEdit" name="errors"> + <property name="whatsThis"> + <string><b>Git log errors</b><p>This shows possible error messages of the git log command.</p></string> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="acceptRichText"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="inputGroup"> + <property name="title"> + <string>Input</string> + </property> + <layout class="QGridLayout"> + <item row="1" column="1"> + <spacer> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>327</width> + <height>29</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="2"> + <widget class="QPushButton" name="sendButton"> + <property name="toolTip"> + <string>Press to send the input to the git process</string> + </property> + <property name="text"> + <string>&Send</string> + </property> + <property name="shortcut"> + <string>Alt+S</string> + </property> + </widget> + </item> + <item row="0" column="0" colspan="3"> + <widget class="QLineEdit" name="input"> + <property name="toolTip"> + <string>Enter data to be sent to the git process</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QCheckBox" name="passwordCheckBox"> + <property name="toolTip"> + <string>Select to switch the input field to password mode</string> + </property> + <property name="text"> + <string>&Password Mode</string> + </property> + <property name="shortcut"> + <string>Alt+P</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close</set> + </property> + </widget> + </item> + </layout> + </widget> + <tabstops> + <tabstop>logTree</tabstop> + <tabstop>nextButton</tabstop> + <tabstop>limitSpinBox</tabstop> + <tabstop>errors</tabstop> + <tabstop>input</tabstop> + <tabstop>passwordCheckBox</tabstop> + <tabstop>sendButton</tabstop> + </tabstops> + <resources/> + <connections/> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,360 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to show available remote repositories. +""" + +from __future__ import unicode_literals +try: + str = unicode +except NameError: + pass + +import os + +from PyQt5.QtCore import pyqtSlot, Qt, QProcess, QTimer +from PyQt5.QtWidgets import QWidget, QHeaderView, QTreeWidgetItem, \ + QDialogButtonBox, QLineEdit + +from E5Gui import E5MessageBox + +from .Ui_GitRemoteRepositoriesDialog import Ui_GitRemoteRepositoriesDialog + +from .GitUtilities import strToQByteArray + +import Preferences + + +class GitRemoteRepositoriesDialog(QWidget, Ui_GitRemoteRepositoriesDialog): + """ + Class implementing a dialog to show available remote repositories. + """ + def __init__(self, vcs, parent=None): + """ + Constructor + + @param vcs reference to the vcs object + @param parent parent widget (QWidget) + """ + super(GitRemoteRepositoriesDialog, self).__init__(parent) + self.setupUi(self) + + self.vcs = vcs + self.process = QProcess() + self.process.finished.connect(self.__procFinished) + self.process.readyReadStandardOutput.connect(self.__readStdout) + self.process.readyReadStandardError.connect(self.__readStderr) + + self.refreshButton = self.buttonBox.addButton( + self.tr("Refresh"), QDialogButtonBox.ActionRole) + self.refreshButton.setToolTip( + self.tr("Press to refresh the repositories display")) + self.refreshButton.setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) + + self.__lastColumn = self.repolist.columnCount() + + self.repolist.headerItem().setText(self.__lastColumn, "") + self.repolist.header().setSortIndicator(0, Qt.AscendingOrder) + + self.__ioEncoding = Preferences.getSystem("IOEncoding") + + def __resort(self): + """ + Private method to resort the list. + """ + self.repolist.sortItems( + self.repolist.sortColumn(), + self.repolist.header().sortIndicatorOrder()) + + def __resizeColumns(self): + """ + Private method to resize the list columns. + """ + self.repolist.header().resizeSections(QHeaderView.ResizeToContents) + self.repolist.header().setStretchLastSection(True) + + def __generateItem(self, name, url, oper): + """ + Private method to generate a status item in the status list. + + @param name name of the remote repository (string) + @param url URL of the remote repository (string) + @param oper operation the remote repository may be used for (string) + """ + foundItems = self.repolist.findItems(name, Qt.MatchExactly, 0) + if foundItems: + # modify the operations column only + foundItems[0].setText( + 2, "{0} + {1}".format(foundItems[0].text(2), oper)) + else: + QTreeWidgetItem(self.repolist, [name, url, oper]) + + def closeEvent(self, e): + """ + Protected slot implementing a close event handler. + + @param e close event (QCloseEvent) + """ + if self.process is not None and \ + self.process.state() != QProcess.NotRunning: + self.process.terminate() + QTimer.singleShot(2000, self.process.kill) + self.process.waitForFinished(3000) + + e.accept() + + def start(self, projectDir): + """ + Public slot to start the git remote command. + + @param projectDir name of the project directory (string) + """ + self.repolist.clear() + + self.errorGroup.hide() + self.intercept = False + self.projectDir = projectDir + + self.__ioEncoding = Preferences.getSystem("IOEncoding") + + self.removeButton.setEnabled(False) + self.renameButton.setEnabled(False) + self.pruneButton.setEnabled(False) + self.showInfoButton.setEnabled(False) + + args = self.vcs.initCommand("remote") + args.append('--verbose') + + # find the root of the repo + repodir = self.projectDir + while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): + repodir = os.path.dirname(repodir) + if os.path.splitdrive(repodir)[1] == os.sep: + return + + self.process.kill() + self.process.setWorkingDirectory(repodir) + + self.process.start('git', args) + procStarted = self.process.waitForStarted(5000) + if not procStarted: + self.inputGroup.setEnabled(False) + self.inputGroup.hide() + E5MessageBox.critical( + self, + self.tr('Process Generation Error'), + self.tr( + 'The process {0} could not be started. ' + 'Ensure, that it is in the search path.' + ).format('git')) + else: + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True) + self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) + + self.inputGroup.setEnabled(True) + self.inputGroup.show() + self.refreshButton.setEnabled(False) + + def __finish(self): + """ + Private slot called when the process finished or the user pressed + the button. + """ + if self.process is not None and \ + self.process.state() != QProcess.NotRunning: + self.process.terminate() + QTimer.singleShot(2000, self.process.kill) + self.process.waitForFinished(3000) + + self.inputGroup.setEnabled(False) + self.inputGroup.hide() + self.refreshButton.setEnabled(True) + + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) + self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) + self.buttonBox.button(QDialogButtonBox.Close).setFocus( + Qt.OtherFocusReason) + + self.__resort() + self.__resizeColumns() + + self.__updateButtons() + + def on_buttonBox_clicked(self, button): + """ + Private slot called by a button of the button box clicked. + + @param button button that was clicked (QAbstractButton) + """ + if button == self.buttonBox.button(QDialogButtonBox.Close): + self.close() + elif button == self.buttonBox.button(QDialogButtonBox.Cancel): + self.__finish() + elif button == self.refreshButton: + self.on_refreshButton_clicked() + + def __procFinished(self, exitCode, exitStatus): + """ + Private slot connected to the finished signal. + + @param exitCode exit code of the process (integer) + @param exitStatus exit status of the process (QProcess.ExitStatus) + """ + self.__finish() + + def __readStdout(self): + """ + Private slot to handle the readyReadStandardOutput signal. + + It reads the output of the process, formats it and inserts it into + the contents pane. + """ + if self.process is not None: + self.process.setReadChannel(QProcess.StandardOutput) + + while self.process.canReadLine(): + line = str(self.process.readLine(), self.__ioEncoding, + 'replace').strip() + + name, line = line.split(None, 1) + url, oper = line.rsplit(None, 1) + oper = oper[1:-1] # it is enclosed in () + self.__generateItem(name, url, oper) + + def __readStderr(self): + """ + Private slot to handle the readyReadStandardError signal. + + It reads the error output of the process and inserts it into the + error pane. + """ + if self.process is not None: + s = str(self.process.readAllStandardError(), + self.__ioEncoding, 'replace') + self.errorGroup.show() + self.errors.insertPlainText(s) + self.errors.ensureCursorVisible() + + def on_passwordCheckBox_toggled(self, isOn): + """ + Private slot to handle the password checkbox toggled. + + @param isOn flag indicating the status of the check box (boolean) + """ + if isOn: + self.input.setEchoMode(QLineEdit.Password) + else: + self.input.setEchoMode(QLineEdit.Normal) + + @pyqtSlot() + def on_sendButton_clicked(self): + """ + Private slot to send the input to the git process. + """ + inputTxt = self.input.text() + inputTxt += os.linesep + + if self.passwordCheckBox.isChecked(): + self.errors.insertPlainText(os.linesep) + self.errors.ensureCursorVisible() + else: + self.errors.insertPlainText(inputTxt) + self.errors.ensureCursorVisible() + + self.process.write(strToQByteArray(inputTxt)) + + self.passwordCheckBox.setChecked(False) + self.input.clear() + + def on_input_returnPressed(self): + """ + Private slot to handle the press of the return key in the input field. + """ + self.intercept = True + self.on_sendButton_clicked() + + def keyPressEvent(self, evt): + """ + Protected slot to handle a key press event. + + @param evt the key press event (QKeyEvent) + """ + if self.intercept: + self.intercept = False + evt.accept() + return + super(GitRemoteRepositoriesDialog, self).keyPressEvent(evt) + + @pyqtSlot() + def on_refreshButton_clicked(self): + """ + Private slot to refresh the status display. + """ + self.start(self.projectDir) + + def __updateButtons(self): + """ + Private method to update the buttons status. + """ + enable = len(self.repolist.selectedItems()) == 1 + + self.removeButton.setEnabled(enable) + self.renameButton.setEnabled(enable) + self.pruneButton.setEnabled(enable) + self.showInfoButton.setEnabled(enable) + + @pyqtSlot() + def on_repolist_itemSelectionChanged(self): + """ + Private slot to act upon changes of selected items. + """ + self.__updateButtons() + + @pyqtSlot() + def on_addButton_clicked(self): + """ + Private slot to add a remote repository. + """ + self.vcs.gitAddRemote(self.projectDir) + 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. + """ + remoteName = self.repolist.selectedItems()[0].text(0) + self.vcs.gitRemoveRemote(self.projectDir, remoteName) + self.on_refreshButton_clicked() + + @pyqtSlot() + def on_showInfoButton_clicked(self): + """ + Private slot to show information about a remote repository. + """ + remoteName = self.repolist.selectedItems()[0].text(0) + self.vcs.gitShowRemote(self.projectDir, remoteName) + + @pyqtSlot() + def on_pruneButton_clicked(self): + """ + Private slot to prune all stale remote-tracking branches. + """ + remoteName = self.repolist.selectedItems()[0].text(0) + self.vcs.gitPruneRemote(self.projectDir, remoteName)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,263 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitRemoteRepositoriesDialog</class> + <widget class="QWidget" name="GitRemoteRepositoriesDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>600</width> + <height>450</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git Remote Repositories</string> + </property> + <property name="whatsThis"> + <string><b>Git Remote Repositories</b> +<p>This dialog shows the available remote repositories.</p></string> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>3</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Remote Repositories</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QTreeWidget" name="repolist"> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <property name="itemsExpandable"> + <bool>false</bool> + </property> + <column> + <property name="text"> + <string>Name</string> + </property> + </column> + <column> + <property name="text"> + <string>URL</string> + </property> + </column> + <column> + <property name="text"> + <string>Operation</string> + </property> + </column> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <spacer name="horizontalSpacer"> + <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="addButton"> + <property name="toolTip"> + <string>Press to add a remote repository</string> + </property> + <property name="text"> + <string>&Add</string> + </property> + </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> + </property> + <property name="text"> + <string>Re&move</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="pruneButton"> + <property name="toolTip"> + <string>Press to delete stale tracking branches under the selected repository </string> + </property> + <property name="text"> + <string>&Prune</string> + </property> + </widget> + </item> + <item> + <widget class="Line" name="line"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="showInfoButton"> + <property name="toolTip"> + <string>Press to show information about the selected repository</string> + </property> + <property name="text"> + <string>Show &Info...</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_2"> + <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"> + <horstretch>0</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Errors</string> + </property> + <layout class="QVBoxLayout"> + <item> + <widget class="QTextEdit" name="errors"> + <property name="whatsThis"> + <string><b>Git log errors</b><p>This shows possible error messages of the git log command.</p></string> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="acceptRichText"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="inputGroup"> + <property name="title"> + <string>Input</string> + </property> + <layout class="QGridLayout" name="_2"> + <item row="1" column="1"> + <spacer> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>327</width> + <height>29</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="2"> + <widget class="QPushButton" name="sendButton"> + <property name="toolTip"> + <string>Press to send the input to the git process</string> + </property> + <property name="text"> + <string>&Send</string> + </property> + <property name="shortcut"> + <string>Alt+S</string> + </property> + </widget> + </item> + <item row="0" column="0" colspan="3"> + <widget class="QLineEdit" name="input"> + <property name="toolTip"> + <string>Enter data to be sent to the git process</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QCheckBox" name="passwordCheckBox"> + <property name="toolTip"> + <string>Select to switch the input field to password mode</string> + </property> + <property name="text"> + <string>&Password Mode</string> + </property> + <property name="shortcut"> + <string>Alt+P</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close</set> + </property> + </widget> + </item> + </layout> + </widget> + <tabstops> + <tabstop>repolist</tabstop> + <tabstop>addButton</tabstop> + <tabstop>renameButton</tabstop> + <tabstop>removeButton</tabstop> + <tabstop>pruneButton</tabstop> + <tabstop>showInfoButton</tabstop> + <tabstop>errors</tabstop> + <tabstop>input</tabstop> + <tabstop>passwordCheckBox</tabstop> + <tabstop>sendButton</tabstop> + </tabstops> + <resources/> + <connections/> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,167 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to select a revision. +""" + +from __future__ import unicode_literals + +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox + +from .Ui_GitRevisionSelectionDialog import Ui_GitRevisionSelectionDialog + + +class GitRevisionSelectionDialog(QDialog, Ui_GitRevisionSelectionDialog): + """ + Class implementing a dialog to select a revision. + """ + def __init__(self, tagsList, branchesList, trackingBranchesList=None, + noneLabel="", showBranches=True, showHead=True, parent=None): + """ + Constructor + + @param tagsList list of tags (list of strings) + @param branchesList list of branches (list of strings) + @param trackingBranchesList list of remote branches (list of strings) + @param noneLabel label text for "no revision selected" (string) + @param showBranches flag indicating to show the branch selection + (boolean) + @param showHead flag indicating to show the head selection (boolean) + @param parent parent widget (QWidget) + """ + super(GitRevisionSelectionDialog, self).__init__(parent) + self.setupUi(self) + + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) + + self.tagCombo.addItems(sorted(tagsList)) + self.branchCombo.addItems(["master"] + sorted(branchesList)) + + self.tipButton.setVisible(showHead) + self.branchButton.setVisible(showBranches) + self.branchCombo.setVisible(showBranches) + + if noneLabel: + self.noneButton.setText(noneLabel) + + if trackingBranchesList is not None: + self.remoteBranchCombo.addItems(sorted(trackingBranchesList)) + else: + self.remoteBranchButton.setVisible(False) + self.remoteBranchCombo.setVisible(False) + + msh = self.minimumSizeHint() + self.resize(max(self.width(), msh.width()), msh.height()) + + def __updateOK(self): + """ + Private slot to update the OK button. + """ + enabled = True + if self.revButton.isChecked(): + enabled = self.revEdit.text() != "" + elif self.tagButton.isChecked(): + enabled = self.tagCombo.currentText() != "" + elif self.branchButton.isChecked(): + enabled = self.branchCombo.currentText() != "" + elif self.remoteBranchButton.isChecked(): + enabled = self.remoteBranchCombo.currentText() != "" + + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enabled) + + @pyqtSlot(bool) + def on_revButton_toggled(self, checked): + """ + Private slot to handle changes of the rev select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_tagButton_toggled(self, checked): + """ + Private slot to handle changes of the Tag select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_branchButton_toggled(self, checked): + """ + Private slot to handle changes of the Branch select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_remoteBranchButton_toggled(self, checked): + """ + Private slot to handle changes of the Remote Branch select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(str) + def on_revEdit_textChanged(self, txt): + """ + Private slot to handle changes of the rev edit. + + @param txt text of the edit (string) + """ + self.__updateOK() + + @pyqtSlot(str) + def on_tagCombo_editTextChanged(self, txt): + """ + Private slot to handle changes of the Tag combo. + + @param txt text of the combo (string) + """ + self.__updateOK() + + @pyqtSlot(str) + def on_branchCombo_editTextChanged(self, txt): + """ + Private slot to handle changes of the Branch combo. + + @param txt text of the combo (string) + """ + self.__updateOK() + + @pyqtSlot(str) + def on_remoteBranchCombo_editTextChanged(self, txt): + """ + Private slot to handle changes of the Remote Branch combo. + + @param txt text of the combo (string) + """ + self.__updateOK() + + def getRevision(self): + """ + Public method to retrieve the selected revision. + + @return selected revision (string) + """ + if self.revButton.isChecked(): + rev = self.revEdit.text() + elif self.tagButton.isChecked(): + rev = self.tagCombo.currentText() + elif self.branchButton.isChecked(): + rev = self.branchCombo.currentText() + elif self.remoteBranchButton.isChecked(): + rev = self.remoteBranchCombo.currentText() + elif self.tipButton.isChecked(): + rev = "HEAD" + else: + rev = "" + + return rev
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,279 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitRevisionSelectionDialog</class> + <widget class="QDialog" name="GitRevisionSelectionDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>450</width> + <height>224</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git Revision</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Revision</string> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QRadioButton" name="revButton"> + <property name="toolTip"> + <string>Select to specify a revision by a revision expression</string> + </property> + <property name="text"> + <string>Commit:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLineEdit" name="revEdit"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter a commit id</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QRadioButton" name="tagButton"> + <property name="toolTip"> + <string>Select to specify a revision by a tag</string> + </property> + <property name="text"> + <string>Tag:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QComboBox" name="tagCombo"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Enter a tag name</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QRadioButton" name="branchButton"> + <property name="toolTip"> + <string>Select to specify a revision by a branch</string> + </property> + <property name="text"> + <string>Branch:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QComboBox" name="branchCombo"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Enter a branch name</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QRadioButton" name="remoteBranchButton"> + <property name="toolTip"> + <string>Select to specify a revision by a remote branch</string> + </property> + <property name="text"> + <string>Remote Branch:</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QComboBox" name="remoteBranchCombo"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Enter a remote branch name</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="4" column="0" colspan="2"> + <widget class="QRadioButton" name="tipButton"> + <property name="toolTip"> + <string>Select HEAD revision</string> + </property> + <property name="text"> + <string>HEAD</string> + </property> + </widget> + </item> + <item row="5" column="0" colspan="2"> + <widget class="QRadioButton" name="noneButton"> + <property name="text"> + <string>No revision selected</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <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> + <tabstops> + <tabstop>revButton</tabstop> + <tabstop>revEdit</tabstop> + <tabstop>tagButton</tabstop> + <tabstop>tagCombo</tabstop> + <tabstop>branchButton</tabstop> + <tabstop>branchCombo</tabstop> + <tabstop>remoteBranchButton</tabstop> + <tabstop>remoteBranchCombo</tabstop> + <tabstop>tipButton</tabstop> + <tabstop>noneButton</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>GitRevisionSelectionDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>266</x> + <y>214</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>223</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>GitRevisionSelectionDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>334</x> + <y>214</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>223</y> + </hint> + </hints> + </connection> + <connection> + <sender>revButton</sender> + <signal>toggled(bool)</signal> + <receiver>revEdit</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>60</x> + <y>49</y> + </hint> + <hint type="destinationlabel"> + <x>246</x> + <y>51</y> + </hint> + </hints> + </connection> + <connection> + <sender>tagButton</sender> + <signal>toggled(bool)</signal> + <receiver>tagCombo</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>88</x> + <y>75</y> + </hint> + <hint type="destinationlabel"> + <x>257</x> + <y>77</y> + </hint> + </hints> + </connection> + <connection> + <sender>branchButton</sender> + <signal>toggled(bool)</signal> + <receiver>branchCombo</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>79</x> + <y>101</y> + </hint> + <hint type="destinationlabel"> + <x>242</x> + <y>103</y> + </hint> + </hints> + </connection> + <connection> + <sender>remoteBranchButton</sender> + <signal>toggled(bool)</signal> + <receiver>remoteBranchCombo</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>83</x> + <y>120</y> + </hint> + <hint type="destinationlabel"> + <x>144</x> + <y>120</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,223 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter the revisions for the git diff command. +""" + +from __future__ import unicode_literals + +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox + +from .Ui_GitRevisionsSelectionDialog import Ui_GitRevisionsSelectionDialog + + +class GitRevisionsSelectionDialog(QDialog, Ui_GitRevisionsSelectionDialog): + """ + Class implementing a dialog to enter the revisions for the git diff + command. + """ + def __init__(self, tagsList, branchesList, parent=None): + """ + Constructor + + @param tagsList list of tags (list of strings) + @param branchesList list of branches (list of strings) + @param parent parent widget of the dialog (QWidget) + """ + super(GitRevisionsSelectionDialog, self).__init__(parent) + self.setupUi(self) + + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) + + self.tag1Combo.addItems(sorted(tagsList)) + self.tag2Combo.addItems(sorted(tagsList)) + self.branch1Combo.addItems(["master"] + sorted(branchesList)) + self.branch2Combo.addItems(["master"] + sorted(branchesList)) + + msh = self.minimumSizeHint() + self.resize(max(self.width(), msh.width()), msh.height()) + + def __updateOK(self): + """ + Private slot to update the OK button. + """ + enabled = True + if self.rev1Button.isChecked(): + enabled = enabled and self.rev1Edit.text() != "" + elif self.tag1Button.isChecked(): + enabled = enabled and self.tag1Combo.currentText() != "" + elif self.branch1Button.isChecked(): + enabled = enabled and self.branch1Combo.currentText() != "" + + if self.rev2Button.isChecked(): + enabled = enabled and self.rev2Edit.text() != "" + elif self.tag2Button.isChecked(): + enabled = enabled and self.tag2Combo.currentText() != "" + elif self.branch2Button.isChecked(): + enabled = enabled and self.branch2Combo.currentText() != "" + + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enabled) + + @pyqtSlot(bool) + def on_rev1Button_toggled(self, checked): + """ + Private slot to handle changes of the rev1 select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_rev2Button_toggled(self, checked): + """ + Private slot to handle changes of the rev2 select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_tag1Button_toggled(self, checked): + """ + Private slot to handle changes of the Tag1 select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_tag2Button_toggled(self, checked): + """ + Private slot to handle changes of the Tag2 select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_branch1Button_toggled(self, checked): + """ + Private slot to handle changes of the Branch1 select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_branch2Button_toggled(self, checked): + """ + Private slot to handle changes of the Branch2 select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(str) + def on_rev1Edit_textChanged(self, txt): + """ + Private slot to handle changes of the rev1 edit. + + @param txt text of the edit (string) + """ + self.__updateOK() + + @pyqtSlot(str) + def on_rev2Edit_textChanged(self, txt): + """ + Private slot to handle changes of the rev2 edit. + + @param txt text of the edit (string) + """ + self.__updateOK() + + @pyqtSlot(str) + def on_tag1Combo_editTextChanged(self, txt): + """ + Private slot to handle changes of the Tag1 combo. + + @param txt text of the combo (string) + """ + self.__updateOK() + + @pyqtSlot(str) + def on_tag2Combo_editTextChanged(self, txt): + """ + Private slot to handle changes of the Tag2 combo. + + @param txt text of the combo (string) + """ + self.__updateOK() + + @pyqtSlot(str) + def on_branch1Combo_editTextChanged(self, txt): + """ + Private slot to handle changes of the Branch1 combo. + + @param txt text of the combo (string) + """ + self.__updateOK() + + @pyqtSlot(str) + def on_branch2Combo_editTextChanged(self, txt): + """ + Private slot to handle changes of the Branch2 combo. + + @param txt text of the combo (string) + """ + self.__updateOK() + + def __getRevision(self, no): + """ + Private method to generate the revision. + + @param no revision number to generate (1 or 2) + @return revision (string) + """ + if no == 1: + revButton = self.rev1Button + revEdit = self.rev1Edit + tagButton = self.tag1Button + tagCombo = self.tag1Combo + branchButton = self.branch1Button + branchCombo = self.branch1Combo + tipButton = self.tip1Button + prevButton = self.prev1Button + noneButton = self.none1Button + else: + revButton = self.rev2Button + revEdit = self.rev2Edit + tagButton = self.tag2Button + tagCombo = self.tag2Combo + branchButton = self.branch2Button + branchCombo = self.branch2Combo + tipButton = self.tip2Button + prevButton = self.prev2Button + noneButton = self.none2Button + + if revButton.isChecked(): + return revEdit.text() + elif tagButton.isChecked(): + return tagCombo.currentText() + elif branchButton.isChecked(): + return branchCombo.currentText() + elif tipButton.isChecked(): + return "HEAD" + elif prevButton.isChecked(): + return "HEAD^" + elif noneButton.isChecked(): + return "" + + def getRevisions(self): + """ + Public method to get the revisions. + + @return list of two revisions (list of strings) + """ + rev1 = self.__getRevision(1) + rev2 = self.__getRevision(2) + + return [rev1, rev2]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,398 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitRevisionsSelectionDialog</class> + <widget class="QDialog" name="GitRevisionsSelectionDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>371</width> + <height>497</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git Diff</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QGroupBox" name="rev1GroupBox"> + <property name="title"> + <string>Revision &1</string> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QRadioButton" name="rev1Button"> + <property name="toolTip"> + <string>Select to specify a revision by a revision expression</string> + </property> + <property name="text"> + <string>Commit:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLineEdit" name="rev1Edit"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter a commit id</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QRadioButton" name="tag1Button"> + <property name="toolTip"> + <string>Select to specify a revision by a tag</string> + </property> + <property name="text"> + <string>Tag:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QComboBox" name="tag1Combo"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter a tag name</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QRadioButton" name="branch1Button"> + <property name="toolTip"> + <string>Select to specify a revision by a branch</string> + </property> + <property name="text"> + <string>Branch:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QComboBox" name="branch1Combo"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter a branch name</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="3" column="0" colspan="2"> + <widget class="QRadioButton" name="tip1Button"> + <property name="toolTip"> + <string>Select HEAD revision</string> + </property> + <property name="text"> + <string>HEAD</string> + </property> + <property name="checked"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="4" column="0" colspan="2"> + <widget class="QRadioButton" name="prev1Button"> + <property name="toolTip"> + <string>Select revision before HEAD</string> + </property> + <property name="text"> + <string>HEAD^</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="5" column="0" colspan="2"> + <widget class="QRadioButton" name="none1Button"> + <property name="text"> + <string>No revision selected</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="rev2GroupBox"> + <property name="title"> + <string>Revision &2</string> + </property> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0"> + <widget class="QRadioButton" name="rev2Button"> + <property name="toolTip"> + <string>Select to specify a revision by a revision expression</string> + </property> + <property name="text"> + <string>Commit:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLineEdit" name="rev2Edit"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter a commit id</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QRadioButton" name="tag2Button"> + <property name="toolTip"> + <string>Select to specify a revision by a tag</string> + </property> + <property name="text"> + <string>Tag:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QComboBox" name="tag2Combo"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter a tag name</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QRadioButton" name="branch2Button"> + <property name="toolTip"> + <string>Select to specify a revision by a branch</string> + </property> + <property name="text"> + <string>Branch:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QComboBox" name="branch2Combo"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter a branch name</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="3" column="0" colspan="2"> + <widget class="QRadioButton" name="tip2Button"> + <property name="toolTip"> + <string>Select HEAD revision</string> + </property> + <property name="text"> + <string>HEAD</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="4" column="0" colspan="2"> + <widget class="QRadioButton" name="prev2Button"> + <property name="toolTip"> + <string>Select revision before HEAD</string> + </property> + <property name="text"> + <string>HEAD^</string> + </property> + </widget> + </item> + <item row="5" column="0" colspan="2"> + <widget class="QRadioButton" name="none2Button"> + <property name="text"> + <string>No revision selected</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <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> + <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> + <tabstops> + <tabstop>rev1Button</tabstop> + <tabstop>rev1Edit</tabstop> + <tabstop>tag1Button</tabstop> + <tabstop>tag1Combo</tabstop> + <tabstop>branch1Button</tabstop> + <tabstop>branch1Combo</tabstop> + <tabstop>tip1Button</tabstop> + <tabstop>prev1Button</tabstop> + <tabstop>none1Button</tabstop> + <tabstop>rev2Button</tabstop> + <tabstop>rev2Edit</tabstop> + <tabstop>tag2Button</tabstop> + <tabstop>tag2Combo</tabstop> + <tabstop>branch2Button</tabstop> + <tabstop>branch2Combo</tabstop> + <tabstop>tip2Button</tabstop> + <tabstop>prev2Button</tabstop> + <tabstop>none2Button</tabstop> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>GitRevisionsSelectionDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>54</x> + <y>440</y> + </hint> + <hint type="destinationlabel"> + <x>21</x> + <y>143</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>GitRevisionsSelectionDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>106</x> + <y>440</y> + </hint> + <hint type="destinationlabel"> + <x>73</x> + <y>140</y> + </hint> + </hints> + </connection> + <connection> + <sender>rev1Button</sender> + <signal>toggled(bool)</signal> + <receiver>rev1Edit</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>32</x> + <y>71</y> + </hint> + <hint type="destinationlabel"> + <x>147</x> + <y>72</y> + </hint> + </hints> + </connection> + <connection> + <sender>rev2Button</sender> + <signal>toggled(bool)</signal> + <receiver>rev2Edit</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>68</x> + <y>286</y> + </hint> + <hint type="destinationlabel"> + <x>230</x> + <y>286</y> + </hint> + </hints> + </connection> + <connection> + <sender>tag1Button</sender> + <signal>toggled(bool)</signal> + <receiver>tag1Combo</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>59</x> + <y>105</y> + </hint> + <hint type="destinationlabel"> + <x>129</x> + <y>101</y> + </hint> + </hints> + </connection> + <connection> + <sender>branch1Button</sender> + <signal>toggled(bool)</signal> + <receiver>branch1Combo</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>50</x> + <y>124</y> + </hint> + <hint type="destinationlabel"> + <x>117</x> + <y>128</y> + </hint> + </hints> + </connection> + <connection> + <sender>tag2Button</sender> + <signal>toggled(bool)</signal> + <receiver>tag2Combo</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>36</x> + <y>306</y> + </hint> + <hint type="destinationlabel"> + <x>149</x> + <y>306</y> + </hint> + </hints> + </connection> + <connection> + <sender>branch2Button</sender> + <signal>toggled(bool)</signal> + <receiver>branch2Combo</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>73</x> + <y>331</y> + </hint> + <hint type="destinationlabel"> + <x>140</x> + <y>331</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,497 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to show the stashes. +""" + +from __future__ import unicode_literals +try: + str = unicode +except NameError: + pass + +import os + +from PyQt5.QtCore import pyqtSlot, Qt, QPoint, QProcess, QTimer +from PyQt5.QtGui import QCursor +from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QTreeWidgetItem, \ + QAbstractButton, QMenu, QHeaderView, QApplication, QLineEdit + +from E5Gui import E5MessageBox + +from .Ui_GitStashBrowserDialog import Ui_GitStashBrowserDialog + +from .GitUtilities import strToQByteArray + +import Preferences + + +class GitStashBrowserDialog(QWidget, Ui_GitStashBrowserDialog): + """ + Class implementing a dialog to show the stashes. + """ + NameColumn = 0 + DateColumn = 1 + MessageColumn = 2 + + Separator = "@@||@@" + + TotalStatisticsRole = Qt.UserRole + FileStatisticsRole = Qt.UserRole + 1 + + def __init__(self, vcs, parent=None): + """ + Constructor + + @param vcs reference to the vcs object + @param parent reference to the parent widget (QWidget) + """ + super(GitStashBrowserDialog, self).__init__(parent) + self.setupUi(self) + + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) + + self.__position = QPoint() + + self.__fileStatisticsRole = Qt.UserRole + self.__totalStatisticsRole = Qt.UserRole + 1 + + self.stashList.header().setSortIndicator(0, Qt.AscendingOrder) + + self.refreshButton = self.buttonBox.addButton( + self.tr("&Refresh"), QDialogButtonBox.ActionRole) + self.refreshButton.setToolTip( + self.tr("Press to refresh the list of stashes")) + self.refreshButton.setEnabled(False) + + self.vcs = vcs + self.__resetUI() + + self.__ioEncoding = Preferences.getSystem("IOEncoding") + + self.process = QProcess() + self.process.finished.connect(self.__procFinished) + self.process.readyReadStandardOutput.connect(self.__readStdout) + self.process.readyReadStandardError.connect(self.__readStderr) + + self.__contextMenu = QMenu() + self.__differencesAct = self.__contextMenu.addAction( + self.tr("Show"), self.__showPatch) + self.__contextMenu.addSeparator() + self.__applyAct = self.__contextMenu.addAction( + self.tr("Restore && Keep"), self.__apply) + self.__popAct = self.__contextMenu.addAction( + self.tr("Restore && Delete"), self.__pop) + self.__contextMenu.addSeparator() + self.__branchAct = self.__contextMenu.addAction( + self.tr("Create Branch"), self.__branch) + self.__contextMenu.addSeparator() + self.__dropAct = self.__contextMenu.addAction( + self.tr("Delete"), self.__drop) + self.__clearAct = self.__contextMenu.addAction( + self.tr("Delete All"), self.__clear) + + def closeEvent(self, e): + """ + Protected slot implementing a close event handler. + + @param e close event (QCloseEvent) + """ + if self.process is not None and \ + self.process.state() != QProcess.NotRunning: + self.process.terminate() + QTimer.singleShot(2000, self.process.kill) + self.process.waitForFinished(3000) + + self.__position = self.pos() + + e.accept() + + def show(self): + """ + Public slot to show the dialog. + """ + if not self.__position.isNull(): + self.move(self.__position) + self.__resetUI() + + super(GitStashBrowserDialog, self).show() + + def __resetUI(self): + """ + Private method to reset the user interface. + """ + self.stashList.clear() + + def __resizeColumnsStashes(self): + """ + Private method to resize the shelve list columns. + """ + self.stashList.header().resizeSections(QHeaderView.ResizeToContents) + self.stashList.header().setStretchLastSection(True) + + def __generateStashEntry(self, name, date, message): + """ + Private method to generate the stash items. + + @param name name of the stash (string) + @param date date the stash was created (string) + @param message stash message (string) + """ + QTreeWidgetItem(self.stashList, [name, date, message]) + + def __getStashEntries(self): + """ + Private method to retrieve the list of stashes. + """ + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True) + self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) + + self.inputGroup.setEnabled(True) + self.inputGroup.show() + self.refreshButton.setEnabled(False) + + QApplication.setOverrideCursor(QCursor(Qt.WaitCursor)) + QApplication.processEvents() + + self.buf = [] + self.errors.clear() + self.intercept = False + + args = self.vcs.initCommand("stash") + args.append("list") + args.append("--format=format:%gd{0}%ai{0}%gs%n".format(self.Separator)) + + self.process.kill() + + self.process.setWorkingDirectory(self.repodir) + + self.inputGroup.setEnabled(True) + self.inputGroup.show() + + self.process.start('git', args) + procStarted = self.process.waitForStarted(5000) + if not procStarted: + self.inputGroup.setEnabled(False) + self.inputGroup.hide() + E5MessageBox.critical( + self, + self.tr('Process Generation Error'), + self.tr( + 'The process {0} could not be started. ' + 'Ensure, that it is in the search path.' + ).format('git')) + + def start(self, projectDir): + """ + Public slot to start the git stash command. + + @param projectDir name of the project directory (string) + """ + self.errorGroup.hide() + QApplication.processEvents() + + self.__projectDir = projectDir + + # find the root of the repo + self.repodir = self.__projectDir + while not os.path.isdir(os.path.join(self.repodir, self.vcs.adminDir)): + self.repodir = os.path.dirname(self.repodir) + if os.path.splitdrive(self.repodir)[1] == os.sep: + return + + self.activateWindow() + self.raise_() + + self.stashList.clear() + self.__started = True + self.__getStashEntries() + + def __procFinished(self, exitCode, exitStatus): + """ + Private slot connected to the finished signal. + + @param exitCode exit code of the process (integer) + @param exitStatus exit status of the process (QProcess.ExitStatus) + """ + self.__processBuffer() + self.__finish() + + def __finish(self): + """ + Private slot called when the process finished or the user pressed + the button. + """ + if self.process is not None and \ + self.process.state() != QProcess.NotRunning: + self.process.terminate() + QTimer.singleShot(2000, self.process.kill) + self.process.waitForFinished(3000) + + QApplication.restoreOverrideCursor() + + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) + self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) + + self.inputGroup.setEnabled(False) + self.inputGroup.hide() + self.refreshButton.setEnabled(True) + + def __processBuffer(self): + """ + Private method to process the buffered output of the git stash command. + """ + for line in self.buf: + name, date, message = line.split(self.Separator) + date = date.strip().rsplit(":", 1)[0] + self.__generateStashEntry(name, date, message.strip()) + + self.__resizeColumnsStashes() + + if self.__started: + self.stashList.setCurrentItem(self.stashList.topLevelItem(0)) + self.__started = False + + def __readStdout(self): + """ + Private slot to handle the readyReadStandardOutput signal. + + It reads the output of the process and inserts it into a buffer. + """ + self.process.setReadChannel(QProcess.StandardOutput) + + while self.process.canReadLine(): + line = str(self.process.readLine(), self.__ioEncoding, + 'replace').strip() + if line: + self.buf.append(line) + + def __readStderr(self): + """ + Private slot to handle the readyReadStandardError signal. + + It reads the error output of the process and inserts it into the + error pane. + """ + if self.process is not None: + s = str(self.process.readAllStandardError(), + self.__ioEncoding, 'replace') + self.errorGroup.show() + self.errors.insertPlainText(s) + self.errors.ensureCursorVisible() + + @pyqtSlot(QAbstractButton) + def on_buttonBox_clicked(self, button): + """ + Private slot called by a button of the button box clicked. + + @param button button that was clicked (QAbstractButton) + """ + if button == self.buttonBox.button(QDialogButtonBox.Close): + self.close() + elif button == self.buttonBox.button(QDialogButtonBox.Cancel): + self.cancelled = True + self.__finish() + elif button == self.refreshButton: + self.on_refreshButton_clicked() + + @pyqtSlot(QTreeWidgetItem, QTreeWidgetItem) + def on_stashList_currentItemChanged(self, current, previous): + """ + Private slot called, when the current item of the stash list changes. + + @param current reference to the new current item (QTreeWidgetItem) + @param previous reference to the old current item (QTreeWidgetItem) + """ + self.statisticsList.clear() + self.filesLabel.setText("") + self.insertionsLabel.setText("") + self.deletionsLabel.setText("") + + if current: + if current.data(0, self.TotalStatisticsRole) is None: + args = self.vcs.initCommand("stash") + args.append("show") + args.append('--numstat') + args.append(current.text(self.NameColumn)) + + output = "" + process = QProcess() + process.setWorkingDirectory(self.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') + + if output: + totals = {"files": 0, "additions": 0, "deletions": 0} + fileData = [] + for line in output.splitlines(): + additions, deletions, name = \ + line.strip().split(None, 2) + totals["files"] += 1 + if additions != "-": + totals["additions"] += int(additions) + if deletions != "-": + totals["deletions"] += int(deletions) + fileData.append({ + "file": name, + "total": ("-" if additions == "-" else + str(int(additions) + int(deletions))), + "added": additions, + "deleted": deletions + }) + current.setData(0, self.TotalStatisticsRole, totals) + current.setData(0, self.FileStatisticsRole, fileData) + else: + return + + for dataDict in current.data(0, self.FileStatisticsRole): + QTreeWidgetItem(self.statisticsList, [ + dataDict["file"], dataDict["total"], + dataDict["added"], dataDict["deleted"]]) + self.statisticsList.header().resizeSections( + QHeaderView.ResizeToContents) + self.statisticsList.header().setStretchLastSection(True) + + totals = current.data(0, self.TotalStatisticsRole) + self.filesLabel.setText( + self.tr("%n file(s) changed", None, totals["files"])) + self.insertionsLabel.setText( + self.tr("%n line(s) inserted", None, int(totals["additions"]))) + self.deletionsLabel.setText( + self.tr("%n line(s) deleted", None, int(totals["deletions"]))) + + @pyqtSlot(QPoint) + def on_stashList_customContextMenuRequested(self, pos): + """ + Private slot to show the context menu of the stash list. + + @param pos position of the mouse pointer (QPoint) + """ + enable = len(self.stashList.selectedItems()) == 1 + self.__differencesAct.setEnabled(enable) + self.__applyAct.setEnabled(enable) + self.__popAct.setEnabled(enable) + self.__branchAct.setEnabled(enable) + self.__dropAct.setEnabled(enable) + self.__clearAct.setEnabled(self.stashList.topLevelItemCount() > 0) + + self.__contextMenu.popup(self.mapToGlobal(pos)) + + @pyqtSlot() + def on_refreshButton_clicked(self): + """ + Private slot to refresh the list of shelves. + """ + self.start(self.__projectDir) + + @pyqtSlot() + def on_sendButton_clicked(self): + """ + Private slot to send the input to the git process. + """ + inputTxt = self.input.text() + inputTxt += os.linesep + + if self.passwordCheckBox.isChecked(): + self.errors.insertPlainText(os.linesep) + self.errors.ensureCursorVisible() + else: + self.errors.insertPlainText(inputTxt) + self.errors.ensureCursorVisible() + self.errorGroup.show() + + self.process.write(strToQByteArray(inputTxt)) + + self.passwordCheckBox.setChecked(False) + self.input.clear() + + @pyqtSlot() + def on_input_returnPressed(self): + """ + Private slot to handle the press of the return key in the input field. + """ + self.intercept = True + self.on_sendButton_clicked() + + @pyqtSlot(bool) + def on_passwordCheckBox_toggled(self, checked): + """ + Private slot to handle the password checkbox toggled. + + @param checked flag indicating the status of the check box (boolean) + """ + if checked: + self.input.setEchoMode(QLineEdit.Password) + else: + self.input.setEchoMode(QLineEdit.Normal) + + def keyPressEvent(self, evt): + """ + Protected slot to handle a key press event. + + @param evt the key press event (QKeyEvent) + """ + if self.intercept: + self.intercept = False + evt.accept() + return + super(GitStashBrowserDialog, self).keyPressEvent(evt) + + def __showPatch(self): + """ + Private slot to show the contents of the selected stash. + """ + stashName = self.stashList.selectedItems()[0].text(self.NameColumn) + self.vcs.gitStashShowPatch(self.__projectDir, stashName) + + def __apply(self): + """ + Private slot to apply the selected stash but keep it. + """ + stashName = self.stashList.selectedItems()[0].text(self.NameColumn) + self.vcs.gitStashApply(self.__projectDir, stashName) + + def __pop(self): + """ + Private slot to apply the selected stash and delete it. + """ + stashName = self.stashList.selectedItems()[0].text(self.NameColumn) + self.vcs.gitStashPop(self.__projectDir, stashName) + self.on_refreshButton_clicked() + + def __branch(self): + """ + Private slot to create a branch from the selected stash. + """ + stashName = self.stashList.selectedItems()[0].text(self.NameColumn) + self.vcs.gitStashBranch(self.__projectDir, stashName) + self.on_refreshButton_clicked() + + def __drop(self): + """ + Private slot to delete the selected stash. + """ + stashName = self.stashList.selectedItems()[0].text(self.NameColumn) + res = self.vcs.gitStashDrop(self.__projectDir, stashName) + if res: + self.on_refreshButton_clicked() + + def __clear(self): + """ + Private slot to delete all stashes. + """ + res = self.vcs.gitStashClear(self.__projectDir) + if res: + self.on_refreshButton_clicked()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,255 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitStashBrowserDialog</class> + <widget class="QWidget" name="GitStashBrowserDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>650</width> + <height>574</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git Stash Browser</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QTreeWidget" name="stashList"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>5</verstretch> + </sizepolicy> + </property> + <property name="contextMenuPolicy"> + <enum>Qt::CustomContextMenu</enum> + </property> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <property name="itemsExpandable"> + <bool>false</bool> + </property> + <property name="sortingEnabled"> + <bool>true</bool> + </property> + <column> + <property name="text"> + <string>Name</string> + </property> + </column> + <column> + <property name="text"> + <string>Date</string> + </property> + </column> + <column> + <property name="text"> + <string>Message</string> + </property> + </column> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>4</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Statistics</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QTreeWidget" name="statisticsList"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>2</verstretch> + </sizepolicy> + </property> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::NoSelection</enum> + </property> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <property name="itemsExpandable"> + <bool>false</bool> + </property> + <column> + <property name="text"> + <string>File</string> + </property> + </column> + <column> + <property name="text"> + <string>Changes</string> + </property> + </column> + <column> + <property name="text"> + <string>Lines added</string> + </property> + </column> + <column> + <property name="text"> + <string>Lines deleted</string> + </property> + </column> + <column> + <property name="text"> + <string/> + </property> + </column> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLabel" name="filesLabel"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="insertionsLabel"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="deletionsLabel"> + <property name="text"> + <string/> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="errorGroup"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Errors</string> + </property> + <layout class="QVBoxLayout"> + <item> + <widget class="QTextEdit" name="errors"> + <property name="whatsThis"> + <string><b>Git stash errors</b><p>This shows possible error messages of the git stash command.</p></string> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="acceptRichText"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="inputGroup"> + <property name="title"> + <string>Input</string> + </property> + <layout class="QGridLayout" name="_2"> + <item row="1" column="1"> + <spacer> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>327</width> + <height>29</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="2"> + <widget class="QPushButton" name="sendButton"> + <property name="toolTip"> + <string>Press to send the input to the git process</string> + </property> + <property name="text"> + <string>&Send</string> + </property> + <property name="shortcut"> + <string>Alt+S</string> + </property> + </widget> + </item> + <item row="0" column="0" colspan="3"> + <widget class="QLineEdit" name="input"> + <property name="toolTip"> + <string>Enter data to be sent to the git process</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QCheckBox" name="passwordCheckBox"> + <property name="toolTip"> + <string>Select to switch the input field to password mode</string> + </property> + <property name="text"> + <string>&Password Mode</string> + </property> + <property name="shortcut"> + <string>Alt+P</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close</set> + </property> + </widget> + </item> + </layout> + <zorder>buttonBox</zorder> + <zorder>stashList</zorder> + <zorder>errorGroup</zorder> + <zorder>inputGroup</zorder> + <zorder>groupBox</zorder> + </widget> + <tabstops> + <tabstop>stashList</tabstop> + <tabstop>statisticsList</tabstop> + <tabstop>errors</tabstop> + <tabstop>input</tabstop> + <tabstop>passwordCheckBox</tabstop> + <tabstop>sendButton</tabstop> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections/> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitStashDataDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,53 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter the data for a stash operation. +""" + +from __future__ import unicode_literals + +from PyQt5.QtWidgets import QDialog + +from .Ui_GitStashDataDialog import Ui_GitStashDataDialog + + +class GitStashDataDialog(QDialog, Ui_GitStashDataDialog): + """ + Class implementing a dialog to enter the data for a stash operation. + """ + NoUntracked = 0 + UntrackedOnly = 1 + UntrackedAndIgnored = 2 + + def __init__(self, parent=None): + """ + Constructor + + @param parent reference to the parent widget (QWidget) + """ + super(GitStashDataDialog, self).__init__(parent) + self.setupUi(self) + + msh = self.minimumSizeHint() + self.resize(max(self.width(), msh.width()), msh.height()) + + def getData(self): + """ + Public method to get the user data. + + @return tuple containing the message (string), a flag indicating to + keep changes in the staging area (boolean) and an indication to + stash untracked and/or ignored files (integer) + """ + if self.noneRadioButton.isChecked(): + untracked = self.NoUntracked + elif self.untrackedRadioButton.isChecked(): + untracked = self.UntrackedOnly + else: + untracked = self.UntrackedAndIgnored + + return (self.messageEdit.text(), self.keepCheckBox.isChecked(), + untracked)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,140 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitStashDataDialog</class> + <widget class="QDialog" name="GitStashDataDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>500</width> + <height>238</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git Stash</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Message:</string> + </property> + <property name="alignment"> + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLineEdit" name="messageEdit"> + <property name="toolTip"> + <string>Enter a message for the stash</string> + </property> + </widget> + </item> + <item row="1" column="0" colspan="2"> + <widget class="QCheckBox" name="keepCheckBox"> + <property name="text"> + <string>Keep changes in staging area</string> + </property> + </widget> + </item> + <item row="2" column="0" colspan="2"> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Untracked/Ignored Files</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QRadioButton" name="noneRadioButton"> + <property name="toolTip"> + <string>Select to not stash untracked or ignored files</string> + </property> + <property name="text"> + <string>Don't stash untracked or ignored files</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QRadioButton" name="untrackedRadioButton"> + <property name="toolTip"> + <string>Select to stash untracked files</string> + </property> + <property name="text"> + <string>Stash untracked files</string> + </property> + </widget> + </item> + <item> + <widget class="QRadioButton" name="allRadioButton"> + <property name="toolTip"> + <string>Select to stash untracked and ignored files</string> + </property> + <property name="text"> + <string>Stash untracked and ignored files</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> + <tabstops> + <tabstop>messageEdit</tabstop> + <tabstop>keepCheckBox</tabstop> + <tabstop>noneRadioButton</tabstop> + <tabstop>untrackedRadioButton</tabstop> + <tabstop>allRadioButton</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>GitStashDataDialog</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>GitStashDataDialog</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/GitStatusDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,1273 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to show the output of the git status command +process. +""" + +from __future__ import unicode_literals +try: + str = unicode +except NameError: + pass + +import os +import tempfile + +from PyQt5.QtCore import pyqtSlot, qVersion, Qt, QProcess, QTimer, QSize +from PyQt5.QtGui import QTextCursor, QCursor +from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QMenu, QHeaderView, \ + QTreeWidgetItem, QLineEdit, QInputDialog, QToolTip + +from E5Gui.E5Application import e5App +from E5Gui import E5MessageBox + +from .Ui_GitStatusDialog import Ui_GitStatusDialog + +from .GitDiffHighlighter import GitDiffHighlighter +from .GitDiffGenerator import GitDiffGenerator +from .GitDiffParser import GitDiffParser +from .GitUtilities import strToQByteArray + +import Preferences +import UI.PixmapCache +import Utilities + + +class GitStatusDialog(QWidget, Ui_GitStatusDialog): + """ + Class implementing a dialog to show the output of the git status command + process. + """ + ConflictStates = ["AA", "AU", "DD", "DU", "UA", "UD", "UU"] + + ConflictRole = Qt.UserRole + + def __init__(self, vcs, parent=None): + """ + Constructor + + @param vcs reference to the vcs object + @param parent parent widget (QWidget) + """ + super(GitStatusDialog, self).__init__(parent) + self.setupUi(self) + + self.__toBeCommittedColumn = 0 + self.__statusWorkColumn = 1 + self.__statusIndexColumn = 2 + self.__pathColumn = 3 + self.__lastColumn = self.statusList.columnCount() + + self.refreshButton = self.buttonBox.addButton( + self.tr("Refresh"), QDialogButtonBox.ActionRole) + self.refreshButton.setToolTip( + self.tr("Press to refresh the status display")) + self.refreshButton.setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) + + self.diff = None + self.vcs = vcs + self.vcs.committed.connect(self.__committed) + self.process = QProcess() + self.process.finished.connect(self.__procFinished) + self.process.readyReadStandardOutput.connect(self.__readStdout) + self.process.readyReadStandardError.connect(self.__readStderr) + + self.errorGroup.hide() + self.inputGroup.hide() + + self.vDiffSplitter.setStretchFactor(0, 2) + self.vDiffSplitter.setStretchFactor(0, 2) + self.vDiffSplitter.setSizes([400, 400]) + self.__hDiffSplitterState = None + self.__vDiffSplitterState = None + + self.statusList.headerItem().setText(self.__lastColumn, "") + self.statusList.header().setSortIndicator( + self.__pathColumn, Qt.AscendingOrder) + + font = Preferences.getEditorOtherFonts("MonospacedFont") + self.lDiffEdit.setFontFamily(font.family()) + self.lDiffEdit.setFontPointSize(font.pointSize()) + self.rDiffEdit.setFontFamily(font.family()) + self.rDiffEdit.setFontPointSize(font.pointSize()) + self.lDiffEdit.customContextMenuRequested.connect( + self.__showLDiffContextMenu) + self.rDiffEdit.customContextMenuRequested.connect( + self.__showRDiffContextMenu) + + self.__lDiffMenu = QMenu() + self.__stageLinesAct = self.__lDiffMenu.addAction( + UI.PixmapCache.getIcon("vcsAdd.png"), + self.tr("Stage Selected Lines"), + self.__stageHunkOrLines) + self.__revertLinesAct = self.__lDiffMenu.addAction( + UI.PixmapCache.getIcon("vcsRevert.png"), + self.tr("Revert Selected Lines"), + self.__revertHunkOrLines) + self.__stageHunkAct = self.__lDiffMenu.addAction( + UI.PixmapCache.getIcon("vcsAdd.png"), + self.tr("Stage Hunk"), + self.__stageHunkOrLines) + self.__revertHunkAct = self.__lDiffMenu.addAction( + UI.PixmapCache.getIcon("vcsRevert.png"), + self.tr("Revert Hunk"), + self.__revertHunkOrLines) + + self.__rDiffMenu = QMenu() + self.__unstageLinesAct = self.__rDiffMenu.addAction( + UI.PixmapCache.getIcon("vcsRemove.png"), + self.tr("Unstage Selected Lines"), + self.__unstageHunkOrLines) + self.__unstageHunkAct = self.__rDiffMenu.addAction( + UI.PixmapCache.getIcon("vcsRemove.png"), + self.tr("Unstage Hunk"), + self.__unstageHunkOrLines) + + self.lDiffHighlighter = GitDiffHighlighter(self.lDiffEdit.document()) + self.rDiffHighlighter = GitDiffHighlighter(self.rDiffEdit.document()) + + self.lDiffParser = None + self.rDiffParser = None + + self.__selectedName = "" + + self.__diffGenerator = GitDiffGenerator(vcs, self) + self.__diffGenerator.finished.connect(self.__generatorFinished) + + self.modifiedIndicators = [ + self.tr('added'), + self.tr('copied'), + self.tr('deleted'), + self.tr('modified'), + self.tr('renamed'), + ] + self.modifiedOnlyIndicators = [ + self.tr('modified'), + ] + + self.unversionedIndicators = [ + self.tr('not tracked'), + ] + + self.missingIndicators = [ + self.tr('deleted'), + ] + + self.unmergedIndicators = [ + self.tr('unmerged'), + ] + + self.status = { + ' ': self.tr("unmodified"), + 'A': self.tr('added'), + 'C': self.tr('copied'), + 'D': self.tr('deleted'), + 'M': self.tr('modified'), + 'R': self.tr('renamed'), + 'U': self.tr('unmerged'), + '?': self.tr('not tracked'), + '!': self.tr('ignored'), + } + + self.__ioEncoding = Preferences.getSystem("IOEncoding") + + self.__initActionsMenu() + + def __initActionsMenu(self): + """ + Private method to initialize the actions menu. + """ + self.__actionsMenu = QMenu() + self.__actionsMenu.setTearOffEnabled(True) + if qVersion() >= "5.1.0": + self.__actionsMenu.setToolTipsVisible(True) + else: + self.__actionsMenu.hovered.connect(self.__actionsMenuHovered) + self.__actionsMenu.aboutToShow.connect(self.__showActionsMenu) + + self.__commitAct = self.__actionsMenu.addAction( + self.tr("Commit"), self.__commit) + self.__commitAct.setToolTip(self.tr("Commit the selected changes")) + self.__amendAct = self.__actionsMenu.addAction( + self.tr("Amend"), self.__amend) + self.__amendAct.setToolTip(self.tr( + "Amend the latest commit with the selected changes")) + self.__commitSelectAct = self.__actionsMenu.addAction( + self.tr("Select all for commit"), self.__commitSelectAll) + self.__commitDeselectAct = self.__actionsMenu.addAction( + self.tr("Unselect all from commit"), self.__commitDeselectAll) + + self.__actionsMenu.addSeparator() + self.__addAct = self.__actionsMenu.addAction( + self.tr("Add"), self.__add) + self.__addAct.setToolTip(self.tr("Add the selected files")) + self.__stageAct = self.__actionsMenu.addAction( + self.tr("Stage changes"), self.__stage) + self.__stageAct.setToolTip(self.tr( + "Stages all changes of the selected files")) + self.__unstageAct = self.__actionsMenu.addAction( + self.tr("Unstage changes"), self.__unstage) + self.__unstageAct.setToolTip(self.tr( + "Unstages all changes of the selected files")) + + self.__actionsMenu.addSeparator() + + self.__diffAct = self.__actionsMenu.addAction( + self.tr("Differences"), self.__diff) + self.__diffAct.setToolTip(self.tr( + "Shows the differences of the selected entry in a" + " separate dialog")) + self.__sbsDiffAct = self.__actionsMenu.addAction( + self.tr("Differences Side-By-Side"), self.__sbsDiff) + self.__sbsDiffAct.setToolTip(self.tr( + "Shows the differences of the selected entry side-by-side in" + " a separate dialog")) + + self.__actionsMenu.addSeparator() + + self.__revertAct = self.__actionsMenu.addAction( + self.tr("Revert"), self.__revert) + self.__revertAct.setToolTip(self.tr( + "Reverts the changes of the selected files")) + + self.__actionsMenu.addSeparator() + + self.__forgetAct = self.__actionsMenu.addAction( + self.tr("Forget missing"), self.__forget) + self.__forgetAct.setToolTip(self.tr( + "Forgets about the selected missing files")) + self.__restoreAct = self.__actionsMenu.addAction( + self.tr("Restore missing"), self.__restoreMissing) + self.__restoreAct.setToolTip(self.tr( + "Restores the selected missing files")) + + self.__actionsMenu.addSeparator() + + self.__editAct = self.__actionsMenu.addAction( + self.tr("Edit file"), self.__editConflict) + self.__editAct.setToolTip(self.tr( + "Edit the selected conflicting file")) + + self.__actionsMenu.addSeparator() + + act = self.__actionsMenu.addAction( + self.tr("Adjust column sizes"), self.__resizeColumns) + act.setToolTip(self.tr( + "Adjusts the width of all columns to their contents")) + + self.actionsButton.setIcon( + UI.PixmapCache.getIcon("actionsToolButton.png")) + self.actionsButton.setMenu(self.__actionsMenu) + + def __actionsMenuHovered(self, action): + """ + Private slot to show the tooltip for an action menu entry. + + @param action action to show tooltip for + @type QAction + """ + QToolTip.showText( + QCursor.pos(), action.toolTip(), + self.__actionsMenu, self.__actionsMenu.actionGeometry(action)) + + def closeEvent(self, e): + """ + Protected slot implementing a close event handler. + + @param e close event (QCloseEvent) + """ + if self.process is not None and \ + self.process.state() != QProcess.NotRunning: + self.process.terminate() + QTimer.singleShot(2000, self.process.kill) + self.process.waitForFinished(3000) + + self.vcs.getPlugin().setPreferences( + "StatusDialogGeometry", self.saveGeometry()) + self.vcs.getPlugin().setPreferences( + "StatusDialogSplitterStates", [ + self.vDiffSplitter.saveState(), + self.hDiffSplitter.saveState() + ] + ) + + e.accept() + + def show(self): + """ + Public slot to show the dialog. + """ + super(GitStatusDialog, self).show() + + geom = self.vcs.getPlugin().getPreferences( + "StatusDialogGeometry") + if geom.isEmpty(): + s = QSize(900, 600) + self.resize(s) + else: + self.restoreGeometry(geom) + + states = self.vcs.getPlugin().getPreferences( + "StatusDialogSplitterStates") + if len(states) == 2: + # we have two splitters + self.vDiffSplitter.restoreState(states[0]) + self.hDiffSplitter.restoreState(states[1]) + + def __resort(self): + """ + Private method to resort the tree. + """ + self.statusList.sortItems( + self.statusList.sortColumn(), + self.statusList.header().sortIndicatorOrder()) + + def __resizeColumns(self): + """ + Private method to resize the list columns. + """ + self.statusList.header().resizeSections(QHeaderView.ResizeToContents) + self.statusList.header().setStretchLastSection(True) + + def __generateItem(self, status, path): + """ + Private method to generate a status item in the status list. + + @param status status indicator (string) + @param path path of the file or directory (string) + """ + statusWorkText = self.status[status[1]] + statusIndexText = self.status[status[0]] + itm = QTreeWidgetItem(self.statusList, [ + "", + statusWorkText, + statusIndexText, + path, + ]) + + itm.setTextAlignment(self.__statusWorkColumn, Qt.AlignHCenter) + itm.setTextAlignment(self.__statusIndexColumn, Qt.AlignHCenter) + itm.setTextAlignment(self.__pathColumn, Qt.AlignLeft) + + if status not in self.ConflictStates + ["??", "!!"] and \ + statusIndexText in self.modifiedIndicators: + itm.setFlags(itm.flags() | Qt.ItemIsUserCheckable) + itm.setCheckState(self.__toBeCommittedColumn, Qt.Checked) + else: + itm.setFlags(itm.flags() & ~Qt.ItemIsUserCheckable) + + if statusWorkText not in self.__statusFilters: + self.__statusFilters.append(statusWorkText) + if statusIndexText not in self.__statusFilters: + self.__statusFilters.append(statusIndexText) + + if status in self.ConflictStates: + itm.setIcon(self.__statusWorkColumn, + UI.PixmapCache.getIcon( + os.path.join("VcsPlugins", "vcsGit", "icons", + "conflict.png"))) + itm.setData(0, self.ConflictRole, status in self.ConflictStates) + + def start(self, fn): + """ + Public slot to start the git status command. + + @param fn filename(s)/directoryname(s) to show the status of + (string or list of strings) + """ + self.errorGroup.hide() + self.intercept = False + self.args = fn + + self.__ioEncoding = Preferences.getSystem("IOEncoding") + + self.statusFilterCombo.clear() + self.__statusFilters = [] + self.statusList.clear() + + self.setWindowTitle(self.tr('Git Status')) + + args = self.vcs.initCommand("status") + args.append('--porcelain') + args.append("--") + if isinstance(fn, list): + self.dname, fnames = self.vcs.splitPathList(fn) + self.vcs.addArguments(args, fn) + else: + self.dname, fname = self.vcs.splitPath(fn) + args.append(fn) + + # find the root of the repo + self.__repodir = self.dname + while not os.path.isdir( + os.path.join(self.__repodir, self.vcs.adminDir)): + self.__repodir = os.path.dirname(self.__repodir) + if os.path.splitdrive(self.__repodir)[1] == os.sep: + return + + self.process.kill() + self.process.setWorkingDirectory(self.__repodir) + + self.process.start('git', args) + procStarted = self.process.waitForStarted(5000) + if not procStarted: + self.inputGroup.setEnabled(False) + self.inputGroup.hide() + E5MessageBox.critical( + self, + self.tr('Process Generation Error'), + self.tr( + 'The process {0} could not be started. ' + 'Ensure, that it is in the search path.' + ).format('git')) + else: + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True) + self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) + + self.refreshButton.setEnabled(False) + + def __finish(self): + """ + Private slot called when the process finished or the user pressed + the button. + """ + if self.process is not None and \ + self.process.state() != QProcess.NotRunning: + self.process.terminate() + QTimer.singleShot(2000, self.process.kill) + self.process.waitForFinished(3000) + + self.inputGroup.setEnabled(False) + self.inputGroup.hide() + self.refreshButton.setEnabled(True) + + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) + self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) + self.buttonBox.button(QDialogButtonBox.Close).setFocus( + Qt.OtherFocusReason) + + self.__statusFilters.sort() + self.__statusFilters.insert(0, "<{0}>".format(self.tr("all"))) + self.statusFilterCombo.addItems(self.__statusFilters) + + self.__resort() + self.__resizeColumns() + + self.__refreshDiff() + + def on_buttonBox_clicked(self, button): + """ + Private slot called by a button of the button box clicked. + + @param button button that was clicked (QAbstractButton) + """ + if button == self.buttonBox.button(QDialogButtonBox.Close): + self.close() + elif button == self.buttonBox.button(QDialogButtonBox.Cancel): + self.__finish() + elif button == self.refreshButton: + self.on_refreshButton_clicked() + + def __procFinished(self, exitCode, exitStatus): + """ + Private slot connected to the finished signal. + + @param exitCode exit code of the process (integer) + @param exitStatus exit status of the process (QProcess.ExitStatus) + """ + self.__finish() + + def __readStdout(self): + """ + Private slot to handle the readyReadStandardOutput signal. + + It reads the output of the process, formats it and inserts it into + the contents pane. + """ + if self.process is not None: + self.process.setReadChannel(QProcess.StandardOutput) + + while self.process.canReadLine(): + line = str(self.process.readLine(), self.__ioEncoding, + 'replace') + + status = line[:2] + path = line[3:].strip().split(" -> ")[-1].strip('"') + self.__generateItem(status, path) + + def __readStderr(self): + """ + Private slot to handle the readyReadStandardError signal. + + It reads the error output of the process and inserts it into the + error pane. + """ + if self.process is not None: + s = str(self.process.readAllStandardError(), + self.__ioEncoding, 'replace') + self.errorGroup.show() + self.errors.insertPlainText(s) + self.errors.ensureCursorVisible() + + # show input in case the process asked for some input + self.inputGroup.setEnabled(True) + self.inputGroup.show() + + def on_passwordCheckBox_toggled(self, isOn): + """ + Private slot to handle the password checkbox toggled. + + @param isOn flag indicating the status of the check box (boolean) + """ + if isOn: + self.input.setEchoMode(QLineEdit.Password) + else: + self.input.setEchoMode(QLineEdit.Normal) + + @pyqtSlot() + def on_sendButton_clicked(self): + """ + Private slot to send the input to the git process. + """ + inputTxt = self.input.text() + inputTxt += os.linesep + + if self.passwordCheckBox.isChecked(): + self.errors.insertPlainText(os.linesep) + self.errors.ensureCursorVisible() + else: + self.errors.insertPlainText(inputTxt) + self.errors.ensureCursorVisible() + + self.process.write(strToQByteArray(inputTxt)) + + self.passwordCheckBox.setChecked(False) + self.input.clear() + + def on_input_returnPressed(self): + """ + Private slot to handle the press of the return key in the input field. + """ + self.intercept = True + self.on_sendButton_clicked() + + def keyPressEvent(self, evt): + """ + Protected slot to handle a key press event. + + @param evt the key press event (QKeyEvent) + """ + if self.intercept: + self.intercept = False + evt.accept() + return + super(GitStatusDialog, self).keyPressEvent(evt) + + @pyqtSlot() + def on_refreshButton_clicked(self): + """ + Private slot to refresh the status display. + """ + selectedItems = self.statusList.selectedItems() + if len(selectedItems) == 1: + self.__selectedName = selectedItems[0].text(self.__pathColumn) + else: + self.__selectedName = "" + + self.start(self.args) + + @pyqtSlot(str) + def on_statusFilterCombo_activated(self, txt): + """ + Private slot to react to the selection of a status filter. + + @param txt selected status filter (string) + """ + if txt == "<{0}>".format(self.tr("all")): + for topIndex in range(self.statusList.topLevelItemCount()): + topItem = self.statusList.topLevelItem(topIndex) + topItem.setHidden(False) + else: + for topIndex in range(self.statusList.topLevelItemCount()): + topItem = self.statusList.topLevelItem(topIndex) + topItem.setHidden( + topItem.text(self.__statusWorkColumn) != txt and + topItem.text(self.__statusIndexColumn) != txt + ) + + @pyqtSlot() + def on_statusList_itemSelectionChanged(self): + """ + Private slot to act upon changes of selected items. + """ + self.__generateDiffs() + + ########################################################################### + ## Menu handling methods + ########################################################################### + + def __showActionsMenu(self): + """ + Private slot to prepare the actions button menu before it is shown. + """ + modified = len(self.__getModifiedItems()) + modifiedOnly = len(self.__getModifiedOnlyItems()) + unversioned = len(self.__getUnversionedItems()) + missing = len(self.__getMissingItems()) + commitable = len(self.__getCommitableItems()) + commitableUnselected = len(self.__getCommitableUnselectedItems()) + stageable = len(self.__getStageableItems()) + unstageable = len(self.__getUnstageableItems()) + conflicting = len(self.__getConflictingItems()) + + self.__commitAct.setEnabled(commitable) + self.__amendAct.setEnabled(commitable) + self.__commitSelectAct.setEnabled(commitableUnselected) + self.__commitDeselectAct.setEnabled(commitable) + self.__addAct.setEnabled(unversioned) + self.__stageAct.setEnabled(stageable) + self.__unstageAct.setEnabled(unstageable) + self.__diffAct.setEnabled(modified) + self.__sbsDiffAct.setEnabled(modifiedOnly == 1) + self.__revertAct.setEnabled(stageable) + self.__forgetAct.setEnabled(missing) + self.__restoreAct.setEnabled(missing) + self.__editAct.setEnabled(conflicting == 1) + + def __amend(self): + """ + Private slot to handle the Amend context menu entry. + """ + self.__commit(amend=True) + + def __commit(self, amend=False): + """ + Private slot to handle the Commit context menu entry. + + @param amend flag indicating to perform an amend operation (boolean) + """ + names = [os.path.join(self.dname, itm.text(self.__pathColumn)) + for itm in self.__getCommitableItems()] + if not names: + E5MessageBox.information( + self, + self.tr("Commit"), + self.tr("""There are no entries selected to be""" + """ committed.""")) + return + + if Preferences.getVCS("AutoSaveFiles"): + vm = e5App().getObject("ViewManager") + for name in names: + vm.saveEditor(name) + self.vcs.vcsCommit(names, commitAll=False, amend=amend) + # staged changes + + def __committed(self): + """ + Private slot called after the commit has finished. + """ + if self.isVisible(): + self.on_refreshButton_clicked() + self.vcs.checkVCSStatus() + + def __commitSelectAll(self): + """ + Private slot to select all entries for commit. + """ + self.__commitSelect(True) + + def __commitDeselectAll(self): + """ + Private slot to deselect all entries from commit. + """ + self.__commitSelect(False) + + def __add(self): + """ + Private slot to handle the Add context menu entry. + """ + names = [os.path.join(self.dname, itm.text(self.__pathColumn)) + for itm in self.__getUnversionedItems()] + if not names: + E5MessageBox.information( + self, + self.tr("Add"), + self.tr("""There are no unversioned entries""" + """ available/selected.""")) + return + + self.vcs.vcsAdd(names) + self.on_refreshButton_clicked() + + project = e5App().getObject("Project") + for name in names: + project.getModel().updateVCSStatus(name) + self.vcs.checkVCSStatus() + + def __stage(self): + """ + Private slot to handle the Stage context menu entry. + """ + names = [os.path.join(self.dname, itm.text(self.__pathColumn)) + for itm in self.__getStageableItems()] + if not names: + E5MessageBox.information( + self, + self.tr("Stage"), + self.tr("""There are no stageable entries""" + """ available/selected.""")) + return + + self.vcs.vcsAdd(names) + self.on_refreshButton_clicked() + + project = e5App().getObject("Project") + for name in names: + project.getModel().updateVCSStatus(name) + self.vcs.checkVCSStatus() + + def __unstage(self): + """ + Private slot to handle the Unstage context menu entry. + """ + names = [os.path.join(self.dname, itm.text(self.__pathColumn)) + for itm in self.__getUnstageableItems()] + if not names: + E5MessageBox.information( + self, + self.tr("Unstage"), + self.tr("""There are no unstageable entries""" + """ available/selected.""")) + return + + self.vcs.gitUnstage(names) + self.on_refreshButton_clicked() + + project = e5App().getObject("Project") + for name in names: + project.getModel().updateVCSStatus(name) + self.vcs.checkVCSStatus() + + def __forget(self): + """ + Private slot to handle the Forget Missing context menu entry. + """ + names = [os.path.join(self.dname, itm.text(self.__pathColumn)) + for itm in self.__getMissingItems()] + if not names: + E5MessageBox.information( + self, + self.tr("Forget Missing"), + self.tr("""There are no missing entries""" + """ available/selected.""")) + return + + self.vcs.vcsRemove(names, stageOnly=True) + self.on_refreshButton_clicked() + + def __revert(self): + """ + Private slot to handle the Revert context menu entry. + """ + names = [os.path.join(self.dname, itm.text(self.__pathColumn)) + for itm in self.__getStageableItems()] + if not names: + E5MessageBox.information( + self, + self.tr("Revert"), + self.tr("""There are no uncommitted, unstaged changes""" + """ available/selected.""")) + return + + self.vcs.gitRevert(names) + self.raise_() + self.activateWindow() + self.on_refreshButton_clicked() + + project = e5App().getObject("Project") + for name in names: + project.getModel().updateVCSStatus(name) + self.vcs.checkVCSStatus() + + def __restoreMissing(self): + """ + Private slot to handle the Restore Missing context menu entry. + """ + names = [os.path.join(self.dname, itm.text(self.__pathColumn)) + for itm in self.__getMissingItems()] + if not names: + E5MessageBox.information( + self, + self.tr("Restore Missing"), + self.tr("""There are no missing entries""" + """ available/selected.""")) + return + + self.vcs.gitRevert(names) + self.on_refreshButton_clicked() + self.vcs.checkVCSStatus() + + def __editConflict(self): + """ + Private slot to handle the Edit file context menu entry. + """ + itm = self.__getConflictingItems()[0] + filename = os.path.join(self.__repodir, itm.text(self.__pathColumn)) + if Utilities.MimeTypes.isTextFile(filename): + e5App().getObject("ViewManager").getEditor(filename) + + def __diff(self): + """ + Private slot to handle the Diff context menu entry. + """ + namesW = [os.path.join(self.dname, itm.text(self.__pathColumn)) + for itm in self.__getStageableItems()] + namesS = [os.path.join(self.dname, itm.text(self.__pathColumn)) + for itm in self.__getUnstageableItems()] + if not namesW and not namesS: + E5MessageBox.information( + self, + self.tr("Differences"), + self.tr("""There are no uncommitted changes""" + """ available/selected.""")) + return + + diffMode = "work2stage2repo" + names = namesW + namesS + + if self.diff is None: + from .GitDiffDialog import GitDiffDialog + self.diff = GitDiffDialog(self.vcs) + self.diff.show() + self.diff.start(names, diffMode=diffMode, refreshable=True) + + def __sbsDiff(self): + """ + Private slot to handle the Diff context menu entry. + """ + itm = self.__getModifiedOnlyItems()[0] + workModified = (itm.text(self.__statusWorkColumn) in + self.modifiedOnlyIndicators) + stageModified = (itm.text(self.__statusIndexColumn) in + self.modifiedOnlyIndicators) + names = [os.path.join(self.dname, itm.text(self.__pathColumn))] + + if workModified and stageModified: + # select from all three variants + messages = [ + self.tr("Working Tree to Staging Area"), + self.tr("Staging Area to HEAD Commit"), + self.tr("Working Tree to HEAD Commit"), + ] + result, ok = QInputDialog.getItem( + None, + self.tr("Side-by-Side Difference"), + self.tr("Select the compare method."), + messages, + 0, False) + if not ok: + return + + if result == messages[0]: + revisions = ["", ""] + elif result == messages[1]: + revisions = ["HEAD", "Stage"] + else: + revisions = ["HEAD", ""] + elif workModified: + # select from work variants + messages = [ + self.tr("Working Tree to Staging Area"), + self.tr("Working Tree to HEAD Commit"), + ] + result, ok = QInputDialog.getItem( + None, + self.tr("Side-by-Side Difference"), + self.tr("Select the compare method."), + messages, + 0, False) + if not ok: + return + + if result == messages[0]: + revisions = ["", ""] + else: + revisions = ["HEAD", ""] + else: + revisions = ["HEAD", "Stage"] + + self.vcs.gitSbsDiff(names[0], revisions=revisions) + + def __getCommitableItems(self): + """ + Private method to retrieve all entries the user wants to commit. + + @return list of all items, the user has checked + """ + commitableItems = [] + for index in range(self.statusList.topLevelItemCount()): + itm = self.statusList.topLevelItem(index) + if itm.checkState(self.__toBeCommittedColumn) == Qt.Checked: + commitableItems.append(itm) + return commitableItems + + def __getCommitableUnselectedItems(self): + """ + Private method to retrieve all entries the user may commit but hasn't + selected. + + @return list of all items, the user has not checked + """ + items = [] + for index in range(self.statusList.topLevelItemCount()): + itm = self.statusList.topLevelItem(index) + if itm.flags() & Qt.ItemIsUserCheckable and \ + itm.checkState(self.__toBeCommittedColumn) == Qt.Unchecked: + items.append(itm) + return items + + def __getModifiedItems(self): + """ + Private method to retrieve all entries, that have a modified status. + + @return list of all items with a modified status + """ + modifiedItems = [] + for itm in self.statusList.selectedItems(): + if (itm.text(self.__statusWorkColumn) in + self.modifiedIndicators or + itm.text(self.__statusIndexColumn) in + self.modifiedIndicators): + modifiedItems.append(itm) + return modifiedItems + + def __getModifiedOnlyItems(self): + """ + Private method to retrieve all entries, that have a modified status. + + @return list of all items with a modified status + """ + modifiedItems = [] + for itm in self.statusList.selectedItems(): + if (itm.text(self.__statusWorkColumn) in + self.modifiedOnlyIndicators or + itm.text(self.__statusIndexColumn) in + self.modifiedOnlyIndicators): + modifiedItems.append(itm) + return modifiedItems + + def __getUnversionedItems(self): + """ + Private method to retrieve all entries, that have an unversioned + status. + + @return list of all items with an unversioned status + """ + unversionedItems = [] + for itm in self.statusList.selectedItems(): + if itm.text(self.__statusWorkColumn) in self.unversionedIndicators: + unversionedItems.append(itm) + return unversionedItems + + def __getStageableItems(self): + """ + Private method to retrieve all entries, that have a stageable + status. + + @return list of all items with a stageable status + """ + stageableItems = [] + for itm in self.statusList.selectedItems(): + if itm.text(self.__statusWorkColumn) in \ + self.modifiedIndicators + self.unmergedIndicators: + stageableItems.append(itm) + return stageableItems + + def __getUnstageableItems(self): + """ + Private method to retrieve all entries, that have an unstageable + status. + + @return list of all items with an unstageable status + """ + unstageableItems = [] + for itm in self.statusList.selectedItems(): + if itm.text(self.__statusIndexColumn) in self.modifiedIndicators: + unstageableItems.append(itm) + return unstageableItems + + def __getMissingItems(self): + """ + Private method to retrieve all entries, that have a missing status. + + @return list of all items with a missing status + """ + missingItems = [] + for itm in self.statusList.selectedItems(): + if itm.text(self.__statusWorkColumn) in self.missingIndicators: + missingItems.append(itm) + return missingItems + + def __getConflictingItems(self): + """ + Private method to retrieve all entries, that have a conflict status. + + @return list of all items with a conflict status + """ + conflictingItems = [] + for itm in self.statusList.selectedItems(): + if itm.data(0, self.ConflictRole): + conflictingItems.append(itm) + return conflictingItems + + def __commitSelect(self, selected): + """ + Private slot to select or deselect all entries. + + @param selected commit selection state to be set (boolean) + """ + for index in range(self.statusList.topLevelItemCount()): + itm = self.statusList.topLevelItem(index) + if itm.flags() & Qt.ItemIsUserCheckable: + if selected: + itm.setCheckState(self.__toBeCommittedColumn, Qt.Checked) + else: + itm.setCheckState(self.__toBeCommittedColumn, Qt.Unchecked) + + ########################################################################### + ## Diff handling methods below + ########################################################################### + + def __generateDiffs(self): + """ + Private slot to generate diff outputs for the selected item. + """ + self.lDiffEdit.clear() + self.rDiffEdit.clear() + try: + self.lDiffHighlighter.regenerateRules() + self.rDiffHighlighter.regenerateRules() + except AttributeError: + # backward compatibility + pass + + selectedItems = self.statusList.selectedItems() + if len(selectedItems) == 1: + fn = os.path.join(self.dname, + selectedItems[0].text(self.__pathColumn)) + self.__diffGenerator.start(fn, diffMode="work2stage2repo") + + def __generatorFinished(self): + """ + Private slot connected to the finished signal of the diff generator. + """ + diff1, diff2 = self.__diffGenerator.getResult()[:2] + + if diff1: + self.lDiffParser = GitDiffParser(diff1) + for line in diff1[:]: + if line.startswith("@@ "): + break + else: + diff1.pop(0) + self.lDiffEdit.setPlainText("".join(diff1)) + else: + self.lDiffParser = None + + if diff2: + self.rDiffParser = GitDiffParser(diff2) + for line in diff2[:]: + if line.startswith("@@ "): + break + else: + diff2.pop(0) + self.rDiffEdit.setPlainText("".join(diff2)) + else: + self.rDiffParser = None + + for diffEdit in [self.lDiffEdit, self.rDiffEdit]: + tc = diffEdit.textCursor() + tc.movePosition(QTextCursor.Start) + diffEdit.setTextCursor(tc) + diffEdit.ensureCursorVisible() + + def __showLDiffContextMenu(self, coord): + """ + Private slot to show the context menu of the status list. + + @param coord position of the mouse pointer (QPoint) + """ + if bool(self.lDiffEdit.toPlainText()): + cursor = self.lDiffEdit.textCursor() + if cursor.hasSelection(): + self.__stageLinesAct.setEnabled(True) + self.__revertLinesAct.setEnabled(True) + self.__stageHunkAct.setEnabled(False) + self.__revertHunkAct.setEnabled(False) + else: + self.__stageLinesAct.setEnabled(False) + self.__revertLinesAct.setEnabled(False) + self.__stageHunkAct.setEnabled(True) + self.__revertHunkAct.setEnabled(True) + + cursor = self.lDiffEdit.cursorForPosition(coord) + self.lDiffEdit.setTextCursor(cursor) + + self.__lDiffMenu.popup(self.lDiffEdit.mapToGlobal(coord)) + + def __showRDiffContextMenu(self, coord): + """ + Private slot to show the context menu of the status list. + + @param coord position of the mouse pointer (QPoint) + """ + if bool(self.rDiffEdit.toPlainText()): + cursor = self.rDiffEdit.textCursor() + if cursor.hasSelection(): + self.__unstageLinesAct.setEnabled(True) + self.__unstageHunkAct.setEnabled(False) + else: + self.__unstageLinesAct.setEnabled(False) + self.__unstageHunkAct.setEnabled(True) + + cursor = self.rDiffEdit.cursorForPosition(coord) + self.rDiffEdit.setTextCursor(cursor) + + self.__rDiffMenu.popup(self.rDiffEdit.mapToGlobal(coord)) + + def __stageHunkOrLines(self): + """ + Private method to stage the selected lines or hunk. + """ + cursor = self.lDiffEdit.textCursor() + startIndex, endIndex = self.__selectedLinesIndexes(self.lDiffEdit) + if cursor.hasSelection(): + patch = self.lDiffParser.createLinesPatch(startIndex, endIndex) + else: + patch = self.lDiffParser.createHunkPatch(startIndex) + if patch: + patchFile = self.__tmpPatchFileName() + try: + f = open(patchFile, "w") + f.write(patch) + f.close() + self.vcs.gitApply(self.dname, patchFile, cached=True, + noDialog=True) + self.on_refreshButton_clicked() + finally: + os.remove(patchFile) + + def __unstageHunkOrLines(self): + """ + Private method to unstage the selected lines or hunk. + """ + cursor = self.rDiffEdit.textCursor() + startIndex, endIndex = self.__selectedLinesIndexes(self.rDiffEdit) + if cursor.hasSelection(): + patch = self.rDiffParser.createLinesPatch(startIndex, endIndex, + reverse=True) + else: + patch = self.rDiffParser.createHunkPatch(startIndex) + if patch: + patchFile = self.__tmpPatchFileName() + try: + f = open(patchFile, "w") + f.write(patch) + f.close() + self.vcs.gitApply(self.dname, patchFile, cached=True, + reverse=True, noDialog=True) + self.on_refreshButton_clicked() + finally: + os.remove(patchFile) + + def __revertHunkOrLines(self): + """ + Private method to revert the selected lines or hunk. + """ + cursor = self.lDiffEdit.textCursor() + startIndex, endIndex = self.__selectedLinesIndexes(self.lDiffEdit) + if cursor.hasSelection(): + title = self.tr("Revert selected lines") + else: + title = self.tr("Revert hunk") + res = E5MessageBox.yesNo( + self, + title, + self.tr("""Are you sure you want to revert the selected""" + """ changes?""")) + if res: + if cursor.hasSelection(): + patch = self.lDiffParser.createLinesPatch(startIndex, endIndex, + reverse=True) + else: + patch = self.lDiffParser.createHunkPatch(startIndex) + if patch: + patchFile = self.__tmpPatchFileName() + try: + f = open(patchFile, "w") + f.write(patch) + f.close() + self.vcs.gitApply(self.dname, patchFile, reverse=True, + noDialog=True) + self.on_refreshButton_clicked() + finally: + os.remove(patchFile) + + def __selectedLinesIndexes(self, diffEdit): + """ + Private method to extract the indexes of the selected lines. + + @param diffEdit reference to the edit widget (QTextEdit) + @return tuple of start and end indexes (integer, integer) + """ + cursor = diffEdit.textCursor() + selectionStart = cursor.selectionStart() + selectionEnd = cursor.selectionEnd() + + startIndex = -1 + + lineStart = 0 + for lineIdx, line in enumerate(diffEdit.toPlainText().splitlines()): + lineEnd = lineStart + len(line) + if lineStart <= selectionStart <= lineEnd: + startIndex = lineIdx + if lineStart <= selectionEnd <= lineEnd: + endIndex = lineIdx + break + lineStart = lineEnd + 1 + + return startIndex, endIndex + + def __tmpPatchFileName(self): + """ + Private method to generate a temporary patch file. + + @return name of the temporary file (string) + """ + prefix = 'eric-git-{0}-'.format(os.getpid()) + suffix = '-patch' + fd, path = tempfile.mkstemp(suffix, prefix) + os.close(fd) + return path + + def __refreshDiff(self): + """ + Private method to refresh the diff output after a refresh. + """ + if self.__selectedName: + for index in range(self.statusList.topLevelItemCount()): + itm = self.statusList.topLevelItem(index) + if itm.text(self.__pathColumn) == self.__selectedName: + itm.setSelected(True) + break + + self.__selectedName = ""
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,352 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitStatusDialog</class> + <widget class="QWidget" name="GitStatusDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>900</width> + <height>600</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git Status</string> + </property> + <property name="whatsThis"> + <string><b>Git Status</b> +<p>This dialog shows the status of the selected file or project.</p></string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QToolButton" name="actionsButton"> + <property name="toolTip"> + <string>Select action from menu</string> + </property> + <property name="popupMode"> + <enum>QToolButton::InstantPopup</enum> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_2"> + <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="QLabel" name="label"> + <property name="text"> + <string>&Filter on Status:</string> + </property> + <property name="buddy"> + <cstring>statusFilterCombo</cstring> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="statusFilterCombo"> + <property name="toolTip"> + <string>Select the status of entries to be shown</string> + </property> + <property name="sizeAdjustPolicy"> + <enum>QComboBox::AdjustToContents</enum> + </property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QSplitter" name="vDiffSplitter"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>5</verstretch> + </sizepolicy> + </property> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <widget class="QTreeWidget" name="statusList"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>2</verstretch> + </sizepolicy> + </property> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::ExtendedSelection</enum> + </property> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <property name="sortingEnabled"> + <bool>true</bool> + </property> + <column> + <property name="text"> + <string>Commit</string> + </property> + </column> + <column> + <property name="text"> + <string>Status (Work)</string> + </property> + </column> + <column> + <property name="text"> + <string>Status (Staging)</string> + </property> + </column> + <column> + <property name="text"> + <string>Path</string> + </property> + </column> + </widget> + <widget class="QSplitter" name="hDiffSplitter"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>3</verstretch> + </sizepolicy> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="childrenCollapsible"> + <bool>false</bool> + </property> + <widget class="QWidget" name="lDiffWidget" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>3</verstretch> + </sizepolicy> + </property> + <layout class="QVBoxLayout" name="verticalLayout_4"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Difference Working to Staging</string> + </property> + </widget> + </item> + <item> + <widget class="QTextEdit" name="lDiffEdit"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="contextMenuPolicy"> + <enum>Qt::CustomContextMenu</enum> + </property> + <property name="tabChangesFocus"> + <bool>true</bool> + </property> + <property name="lineWrapMode"> + <enum>QTextEdit::NoWrap</enum> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="acceptRichText"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </widget> + <widget class="QWidget" name="rDiffWidget" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>3</verstretch> + </sizepolicy> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Difference Staging to HEAD</string> + </property> + </widget> + </item> + <item> + <widget class="QTextEdit" name="rDiffEdit"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="contextMenuPolicy"> + <enum>Qt::CustomContextMenu</enum> + </property> + <property name="tabChangesFocus"> + <bool>true</bool> + </property> + <property name="lineWrapMode"> + <enum>QTextEdit::NoWrap</enum> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="acceptRichText"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </widget> + </widget> + </widget> + </item> + <item> + <widget class="QGroupBox" name="errorGroup"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Errors</string> + </property> + <layout class="QVBoxLayout"> + <item> + <widget class="QTextEdit" name="errors"> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="acceptRichText"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="inputGroup"> + <property name="title"> + <string>Input</string> + </property> + <layout class="QGridLayout"> + <item row="1" column="1"> + <spacer> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>327</width> + <height>29</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="2"> + <widget class="QPushButton" name="sendButton"> + <property name="toolTip"> + <string>Press to send the input to the git process</string> + </property> + <property name="text"> + <string>&Send</string> + </property> + <property name="shortcut"> + <string>Alt+S</string> + </property> + </widget> + </item> + <item row="0" column="0" colspan="3"> + <widget class="QLineEdit" name="input"> + <property name="toolTip"> + <string>Enter data to be sent to the git process</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QCheckBox" name="passwordCheckBox"> + <property name="toolTip"> + <string>Select to switch the input field to password mode</string> + </property> + <property name="text"> + <string>&Password Mode</string> + </property> + <property name="shortcut"> + <string>Alt+P</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close</set> + </property> + </widget> + </item> + </layout> + </widget> + <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> + <tabstops> + <tabstop>actionsButton</tabstop> + <tabstop>statusFilterCombo</tabstop> + <tabstop>statusList</tabstop> + <tabstop>lDiffEdit</tabstop> + <tabstop>rDiffEdit</tabstop> + <tabstop>errors</tabstop> + <tabstop>input</tabstop> + <tabstop>passwordCheckBox</tabstop> + <tabstop>sendButton</tabstop> + </tabstops> + <resources/> + <connections/> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,138 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the VCS status monitor thread class for Git. +""" + +from __future__ import unicode_literals +try: + str = unicode +except NameError: + pass + +from PyQt5.QtCore import QProcess + +from VCS.StatusMonitorThread import VcsStatusMonitorThread + +import Preferences + + +class GitStatusMonitorThread(VcsStatusMonitorThread): + """ + Class implementing the VCS status monitor thread class for Git. + """ + ConflictStates = ["AA", "AU", "DD", "DU", "UA", "UD", "UU"] + + def __init__(self, interval, project, vcs, parent=None): + """ + Constructor + + @param interval new interval in seconds (integer) + @param project reference to the project object (Project) + @param vcs reference to the version control object + @param parent reference to the parent object (QObject) + """ + VcsStatusMonitorThread.__init__(self, interval, project, vcs, parent) + + self.__ioEncoding = Preferences.getSystem("IOEncoding") + + self.__client = None + self.__useCommandLine = False + + def _performMonitor(self): + """ + Protected method implementing the monitoring action. + + This method populates the statusList member variable + with a list of strings giving the status in the first column and the + path relative to the project directory starting with the third column. + The allowed status flags are: + <ul> + <li>"A" path was added but not yet comitted</li> + <li>"M" path has local changes</li> + <li>"O" path was removed</li> + <li>"R" path was deleted and then re-added</li> + <li>"U" path needs an update</li> + <li>"Z" path contains a conflict</li> + <li>" " path is back at normal</li> + </ul> + + @return tuple of flag indicating successful operation (boolean) and + a status message in case of non successful operation (string) + """ + self.shouldUpdate = False + + # step 1: get overall status + args = self.vcs.initCommand("status") + args.append('--porcelain') + + output = "" + error = "" + process = QProcess() + process.setWorkingDirectory(self.projectDir) + process.start('git', args) + procStarted = process.waitForStarted(5000) + if procStarted: + finished = process.waitForFinished(300000) + if finished and process.exitCode() == 0: + output = str(process.readAllStandardOutput(), + self.__ioEncoding, 'replace') + else: + process.kill() + process.waitForFinished() + error = str(process.readAllStandardError(), + self.__ioEncoding, 'replace') + else: + process.kill() + process.waitForFinished() + error = self.tr("Could not start the Git process.") + + if error: + return False, error + + states = {} + for line in output.splitlines(): + flags = line[:2] + name = line[3:].split(" -> ")[-1] + if flags in self.ConflictStates: + states[name] = "Z" + if flags[0] in "AMDR": + if flags[0] == "D": + status = "O" + elif flags[0] == "R": + status = "A" + else: + status = flags[0] + states[name] = status + elif flags[1] in "MD": + if flags[1] == "D": + status = "O" + else: + status = flags[1] + states[name] = status + + # step 2: collect the status to be reported back + for name in states: + try: + if self.reportedStates[name] != states[name]: + self.statusList.append( + "{0} {1}".format(states[name], name)) + except KeyError: + self.statusList.append("{0} {1}".format(states[name], name)) + for name in self.reportedStates.keys(): + if name not in states: + self.statusList.append(" {0}".format(name)) + self.reportedStates = states + + return True, \ + self.tr("Git status checked successfully") + + def _shutdown(self): + """ + Protected method performing shutdown actions. + """ + if self.__client: + self.__client.stopServer()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,192 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter the data to add a submodule. +""" + +from __future__ import unicode_literals + +from PyQt5.QtCore import pyqtSlot, QUrl +from PyQt5.QtWidgets import QDialog, QDialogButtonBox + +from E5Gui.E5Completers import E5DirCompleter +from E5Gui import E5FileDialog + +from .Ui_GitSubmoduleAddDialog import Ui_GitSubmoduleAddDialog +from .Config import ConfigGitSchemes + +import Utilities +import Preferences +import UI.PixmapCache + + +class GitSubmoduleAddDialog(QDialog, Ui_GitSubmoduleAddDialog): + """ + Class implementing a dialog to enter the data to add a submodule. + """ + def __init__(self, vcs, repodir, parent=None): + """ + Constructor + + @param vcs reference to the version control object + @type Git + @param repodir directory containing the superproject + @type str + @param parent reference to the parent widget + @type QWidget + """ + super(GitSubmoduleAddDialog, self).__init__(parent) + self.setupUi(self) + + self.__vcs = vcs + self.__repodir = repodir + + self.submoduleDirButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.submoduleUrlButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.submoduleUrlClearHistoryButton.setIcon( + UI.PixmapCache.getIcon("editDelete.png")) + + submoduleUrlHistory = self.__vcs.getPlugin().getPreferences( + "RepositoryUrlHistory") + self.submoduleUrlCombo.addItems(submoduleUrlHistory) + self.submoduleUrlCombo.setEditText("") + + self.submoduleUrlDirCompleter = E5DirCompleter(self.submoduleUrlCombo) + self.submoduleDirCompleter = E5DirCompleter(self.submoduleDirEdit) + + ipath = Preferences.getMultiProject("Workspace") or \ + Utilities.getHomeDir() + self.__initPaths = [ + Utilities.fromNativeSeparators(ipath), + Utilities.fromNativeSeparators(ipath) + "/", + ] + + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) + + msh = self.minimumSizeHint() + self.resize(max(self.width(), msh.width()), msh.height()) + + @pyqtSlot(str) + def on_submoduleUrlCombo_editTextChanged(self, txt): + """ + Private slot to handle changes of the submodule repository URL. + + @param txt current text of the combo box + @type str + """ + url = QUrl.fromUserInput(txt) + enable = url.isValid() and url.scheme() in ConfigGitSchemes + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enable) + + self.submoduleUrlButton.setEnabled(url.scheme() == "file" or + len(txt) == 0) + + @pyqtSlot() + def on_submoduleUrlButton_clicked(self): + """ + Private slot to display a directory selection dialog. + """ + directory = E5FileDialog.getExistingDirectory( + self, + self.tr("Select Submodule Repository Directory"), + self.submoduleUrlCombo.currentText(), + E5FileDialog.Options(E5FileDialog.ShowDirsOnly)) + + if directory: + self.submoduleUrlCombo.setEditText( + Utilities.toNativeSeparators(directory)) + + @pyqtSlot() + def on_submoduleUrlClearHistoryButton_clicked(self): + """ + Private slot to clear the history of entered repository URLs. + """ + currentUrl = self.submoduleUrlCombo.currentText() + self.submoduleUrlCombo.clear() + self.submoduleUrlCombo.setEditText(currentUrl) + + self.__saveHistory() + + @pyqtSlot() + def on_submoduleDirButton_clicked(self): + """ + Private slot to display a directory selection dialog. + """ + directory = E5FileDialog.getExistingDirectory( + self, + self.tr("Select Submodule Directory"), + self.submoduleDirEdit.text(), + E5FileDialog.Options(E5FileDialog.ShowDirsOnly)) + + if directory: + self.submoduleDirEdit.setText( + Utilities.toNativeSeparators(directory)) + + def getData(self): + """ + Public method to get the entered data. + + @return tuple containing the repository URL, optional branch name, + optional logical name, optional submodule path and a flag + indicating to enforce the operation + @rtype tuple of (str, str, str, str, bool) + """ + self.__saveHistory() + + url = QUrl.fromUserInput( + self.submoduleUrlCombo.currentText().replace("\\", "/")) + path = self.submoduleDirEdit.text() + if path: + path = self.__getRelativePath(path) + + return ( + url.toString(QUrl.None_), + self.branchEdit.text(), + self.nameEdit.text(), + path, + self.forceCheckBox.isChecked(), + ) + + def __saveHistory(self): + """ + Private method to save the repository URL history. + """ + url = self.submoduleUrlCombo.currentText() + submoduleUrlHistory = [] + for index in range(self.submoduleUrlCombo.count()): + submoduleUrlHistory.append(self.submoduleUrlCombo.itemText(index)) + if url not in submoduleUrlHistory: + submoduleUrlHistory.insert(0, url) + + # max. list sizes is hard coded to 20 entries + newSubmoduleUrlHistory = [url for url in submoduleUrlHistory if url] + if len(newSubmoduleUrlHistory) > 20: + newSubmoduleUrlHistory = newSubmoduleUrlHistory[:20] + + self.__vcs.getPlugin().setPreferences( + "RepositoryUrlHistory", newSubmoduleUrlHistory) + + def __getRelativePath(self, path): + """ + Private method to convert a file path to a relative path. + + @param path file or directory name to convert + @type str + @return relative path or unchanged path, if path doesn't + belong to the project + @rtype str + """ + if path == self.__repodir: + return "" + elif Utilities.normcasepath(Utilities.toNativeSeparators(path))\ + .startswith(Utilities.normcasepath( + Utilities.toNativeSeparators(self.__repodir + "/"))): + relpath = path[len(self.__repodir):] + if relpath.startswith(("/", "\\")): + relpath = relpath[1:] + return relpath + else: + return path
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,187 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitSubmoduleAddDialog</class> + <widget class="QDialog" name="GitSubmoduleAddDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>562</width> + <height>202</height> + </rect> + </property> + <property name="windowTitle"> + <string>Add Submodule</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="TextLabel2"> + <property name="text"> + <string>&URL:</string> + </property> + <property name="buddy"> + <cstring>submoduleUrlCombo</cstring> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QComboBox" name="submoduleUrlCombo"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Enter the URL of the repository</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + <property name="insertPolicy"> + <enum>QComboBox::InsertAtTop</enum> + </property> + <property name="sizeAdjustPolicy"> + <enum>QComboBox::AdjustToMinimumContentsLength</enum> + </property> + </widget> + </item> + <item row="0" column="2"> + <widget class="QToolButton" name="submoduleUrlButton"> + <property name="toolTip"> + <string>Select the repository URL via a directory selection dialog</string> + </property> + </widget> + </item> + <item row="0" column="3"> + <widget class="QToolButton" name="submoduleUrlClearHistoryButton"> + <property name="toolTip"> + <string>Press to clear the history of entered repository URLs</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="TextLabel4"> + <property name="text"> + <string>Submodule &Directory:</string> + </property> + <property name="buddy"> + <cstring>submoduleDirEdit</cstring> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLineEdit" name="submoduleDirEdit"> + <property name="toolTip"> + <string>Enter the directory for the submodule (leave empty to use default).</string> + </property> + </widget> + </item> + <item row="1" column="2"> + <widget class="QToolButton" name="submoduleDirButton"/> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>&Branch:</string> + </property> + <property name="buddy"> + <cstring>branchEdit</cstring> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QLineEdit" name="branchEdit"> + <property name="toolTip"> + <string>Enter a branch name</string> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>&Logical Name:</string> + </property> + <property name="buddy"> + <cstring>nameEdit</cstring> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QLineEdit" name="nameEdit"> + <property name="toolTip"> + <string>Enter a logical name</string> + </property> + </widget> + </item> + <item row="4" column="0" colspan="2"> + <widget class="QCheckBox" name="forceCheckBox"> + <property name="toolTip"> + <string>Select to enforce the operation</string> + </property> + <property name="text"> + <string>&Force Operation</string> + </property> + </widget> + </item> + <item row="5" column="0" colspan="4"> + <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> + <tabstops> + <tabstop>submoduleUrlCombo</tabstop> + <tabstop>submoduleUrlButton</tabstop> + <tabstop>submoduleUrlClearHistoryButton</tabstop> + <tabstop>submoduleDirEdit</tabstop> + <tabstop>submoduleDirButton</tabstop> + <tabstop>branchEdit</tabstop> + <tabstop>nameEdit</tabstop> + <tabstop>forceCheckBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>GitSubmoduleAddDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>257</x> + <y>192</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>201</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>GitSubmoduleAddDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>325</x> + <y>192</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>201</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,78 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to get the data for a submodule deinit operation. +""" + +from __future__ import unicode_literals + +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox + +from .Ui_GitSubmodulesDeinitDialog import Ui_GitSubmodulesDeinitDialog + + +class GitSubmodulesDeinitDialog(QDialog, Ui_GitSubmodulesDeinitDialog): + """ + Class implementing a dialog to get the data for a submodule deinit + operation. + """ + def __init__(self, submodulePaths, parent=None): + """ + Constructor + + @param submodulePaths list of submodule paths + @type list of str + @param parent reference to the parent widget + @type QWidget + """ + super(GitSubmodulesDeinitDialog, self).__init__(parent) + self.setupUi(self) + + self.submodulesList.addItems(sorted(submodulePaths)) + + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) + + def __updateOK(self): + """ + Private slot to update the state of the OK button. + """ + enable = self.allCheckBox.isChecked() or \ + len(self.submodulesList.selectedItems()) > 0 + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enable) + + @pyqtSlot(bool) + def on_allCheckBox_toggled(self, checked): + """ + Private slot to react on changes of the all checkbox. + + @param checked state of the checkbox + @type bool + """ + self.__updateOK() + + @pyqtSlot() + def on_submodulesList_itemSelectionChanged(self): + """ + Private slot to react on changes of the submodule selection. + """ + self.__updateOK() + + def getData(self): + """ + Public method to get the entered data. + + @return tuple containing a flag to indicate all submodules, a list of + selected submodules and a flag indicating an enforced operation + @rtype tuple of (bool, list of str, bool) + """ + submodulePaths = [] + all = self.allCheckBox.isChecked() + if not all: + for itm in self.submodulesList.selectedItems(): + submodulePaths.append(itm.text()) + + return all, submodulePaths, self.forceCheckBox.isChecked()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,144 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitSubmodulesDeinitDialog</class> + <widget class="QDialog" name="GitSubmodulesDeinitDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>400</width> + <height>300</height> + </rect> + </property> + <property name="windowTitle"> + <string>Unregister Submodules</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QCheckBox" name="allCheckBox"> + <property name="toolTip"> + <string>Select to unregister all submodules</string> + </property> + <property name="text"> + <string>Unregister All Submodules</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Selected Submodules:</string> + </property> + </widget> + </item> + <item> + <widget class="QListWidget" name="submodulesList"> + <property name="toolTip"> + <string>Select the submodules to be unregistered</string> + </property> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::ExtendedSelection</enum> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="forceCheckBox"> + <property name="toolTip"> + <string>Select to enforce unregistering</string> + </property> + <property name="text"> + <string>Enforce Operation</string> + </property> + </widget> + </item> + <item> + <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> + <tabstops> + <tabstop>allCheckBox</tabstop> + <tabstop>submodulesList</tabstop> + <tabstop>forceCheckBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>GitSubmodulesDeinitDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>227</x> + <y>282</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>GitSubmodulesDeinitDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>295</x> + <y>288</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>allCheckBox</sender> + <signal>toggled(bool)</signal> + <receiver>label</receiver> + <slot>setDisabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>39</x> + <y>15</y> + </hint> + <hint type="destinationlabel"> + <x>37</x> + <y>39</y> + </hint> + </hints> + </connection> + <connection> + <sender>allCheckBox</sender> + <signal>toggled(bool)</signal> + <receiver>submodulesList</receiver> + <slot>setDisabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>76</x> + <y>16</y> + </hint> + <hint type="destinationlabel"> + <x>82</x> + <y>73</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,47 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to list the defined submodules. +""" + +from __future__ import unicode_literals + +from PyQt5.QtCore import Qt +from PyQt5.QtWidgets import QDialog, QTreeWidgetItem, QHeaderView + +from .Ui_GitSubmodulesListDialog import Ui_GitSubmodulesListDialog + + +class GitSubmodulesListDialog(QDialog, Ui_GitSubmodulesListDialog): + """ + Class implementing a dialog to list the defined submodules. + """ + def __init__(self, submodules, parent=None): + """ + Constructor + + @param submodules list of submodule data to be shown + @type list of dictionaries with submodule name, path, URL and branch + @param parent reference to the parent widget + @type QWidget + """ + super(GitSubmodulesListDialog, self).__init__(parent) + self.setupUi(self) + + for submodule in submodules: + QTreeWidgetItem(self.submodulesList, [ + submodule["name"], + submodule["path"], + submodule["url"], + submodule["branch"] + ]) + self.submodulesList.header().resizeSections( + QHeaderView.ResizeToContents) + self.submodulesList.header().setStretchLastSection(True) + + self.submodulesList.setSortingEnabled(True) + self.submodulesList.sortItems(0, Qt.AscendingOrder) + self.submodulesList.setSortingEnabled(False)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,106 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitSubmodulesListDialog</class> + <widget class="QDialog" name="GitSubmodulesListDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>500</width> + <height>300</height> + </rect> + </property> + <property name="windowTitle"> + <string>Defined Submodules</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QTreeWidget" name="submodulesList"> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <property name="itemsExpandable"> + <bool>false</bool> + </property> + <property name="expandsOnDoubleClick"> + <bool>false</bool> + </property> + <attribute name="headerStretchLastSection"> + <bool>false</bool> + </attribute> + <column> + <property name="text"> + <string>Name</string> + </property> + </column> + <column> + <property name="text"> + <string>Path</string> + </property> + </column> + <column> + <property name="text"> + <string>URL</string> + </property> + </column> + <column> + <property name="text"> + <string>Branch</string> + </property> + </column> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>GitSubmodulesListDialog</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>GitSubmodulesListDialog</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/GitSubmodulesStatusDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,190 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to show the status of the submodules of the +project. +""" + +from __future__ import unicode_literals +try: + str = unicode +except NameError: + pass + +import os + +from PyQt5.QtCore import pyqtSlot, Qt, QProcess +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QTreeWidgetItem, \ + QHeaderView, QAbstractButton + +from .Ui_GitSubmodulesStatusDialog import Ui_GitSubmodulesStatusDialog + +import Preferences + + +class GitSubmodulesStatusDialog(QDialog, Ui_GitSubmodulesStatusDialog): + """ + Class implementing a dialog to show the status of the submodules of the + project. + """ + def __init__(self, vcs, parent=None): + """ + Constructor + + @param vcs reference to the vcs object + @type Git + @param parent reference to the parent widget + @type QWidget + """ + super(GitSubmodulesStatusDialog, self).__init__(parent) + self.setupUi(self) + + self.__statusCodes = { + " ": self.tr("up-to-date"), + "-": self.tr("not initialized"), + "+": self.tr("different to index"), + "U": self.tr("merge conflicts") + } + + self.__vcs = vcs + self.__repodir = None + + self.refreshButton = self.buttonBox.addButton( + self.tr("Refresh"), QDialogButtonBox.ActionRole) + self.refreshButton.setToolTip( + self.tr("Press to refresh the status display")) + + def start(self, projectDir): + """ + Public method to populate the status list. + + @param projectDir name of the project directory + @type str + """ + # find the root of the repo + self.__repodir = projectDir + while not os.path.isdir(os.path.join(self.__repodir, + self.__vcs.adminDir)): + self.__repodir = os.path.dirname(self.__repodir) + if os.path.splitdrive(self.__repodir)[1] == os.sep: + return + + self.errorGroup.hide() + self.errors.clear() + self.statusList.clear() + self.buttonBox.setEnabled(False) + + args = self.__vcs.initCommand("submodule") + args.append("status") + if self.recursiveCheckBox.isChecked(): + args.append("--recursive") + if self.indexCheckBox.isChecked(): + args.append("--cached") + + process = QProcess() + process.setWorkingDirectory(self.__repodir) + process.start('git', args) + procStarted = process.waitForStarted(5000) + if procStarted: + finished = process.waitForFinished(30000) + if finished and process.exitCode() == 0: + ioEncoding = Preferences.getSystem("IOEncoding") + output = str(process.readAllStandardOutput(), + ioEncoding, 'replace') + error = str(process.readAllStandardError(), + ioEncoding, 'replace') + if error: + self.errors.setText(error) + self.errorGroup.show() + self.__processOutput(output) + else: + if not finished: + self.errors.setText(self.tr( + "The process {0} did not finish within 30 seconds.") + .format("git")) + else: + self.errors.setText(self.tr( + "The process {0} finished with an error.\n" + "Error: {1}") + .format("git", process.errorString())) + self.errorGroup.show() + else: + self.errors.setText(self.tr( + "The process {0} could not be started. " + "Ensure, that it is in the search path.").format("git")) + self.errorGroup.show() + + self.buttonBox.setEnabled(True) + self.buttonBox.setFocus() + + def __processOutput(self, output): + """ + Private method to process the output and populate the list. + + @param output output of the submodule status command + @type str + """ + for line in output.splitlines(): + try: + status = self.__statusCodes[line[0]] + except KeyError: + status = self.tr("unknown") + lineParts = line[1:].split(None, 2) + if len(lineParts) == 3 and lineParts[2][0] == "(": + # get rid of leading and trailing brackets + lineParts[2] = lineParts[2][1:-1] + QTreeWidgetItem(self.statusList, [ + lineParts[1], # submodule name + status, # submodule status + lineParts[0], # commit ID + lineParts[2], # additional info + ]) + + self.statusList.header().resizeSections( + QHeaderView.ResizeToContents) + + self.statusList.setSortingEnabled(True) + self.statusList.sortItems(0, Qt.AscendingOrder) + self.statusList.setSortingEnabled(False) + + @pyqtSlot(QAbstractButton) + def on_buttonBox_clicked(self, button): + """ + Private slot called by a button of the button box clicked. + + @param button button that was clicked (QAbstractButton) + """ + if button == self.buttonBox.button(QDialogButtonBox.Close): + self.close() + elif button == self.refreshButton: + self.on_refreshButton_clicked() + + @pyqtSlot() + def on_refreshButton_clicked(self): + """ + Private slot to refresh the status display. + """ + self.start(self.__repodir) + + @pyqtSlot(bool) + def on_indexCheckBox_toggled(self, checked): + """ + Private slot handling a change of the index check box. + + @param checked check state of the check box + @type bool + """ + self.on_refreshButton_clicked() + + @pyqtSlot(bool) + def on_recursiveCheckBox_toggled(self, checked): + """ + Private slot handling a change of the recursive check box. + + @param checked check state of the check box + @type bool + """ + self.on_refreshButton_clicked()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,168 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitSubmodulesStatusDialog</class> + <widget class="QDialog" name="GitSubmodulesStatusDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>700</width> + <height>400</height> + </rect> + </property> + <property name="windowTitle"> + <string>Submodules Status</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QTreeWidget" name="statusList"> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <property name="itemsExpandable"> + <bool>false</bool> + </property> + <column> + <property name="text"> + <string>Submodule</string> + </property> + </column> + <column> + <property name="text"> + <string>Status</string> + </property> + </column> + <column> + <property name="text"> + <string>Commit ID</string> + </property> + </column> + <column> + <property name="text"> + <string>Info</string> + </property> + </column> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QCheckBox" name="indexCheckBox"> + <property name="toolTip"> + <string>Select to show the status for the index</string> + </property> + <property name="text"> + <string>Show Status for Index</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="recursiveCheckBox"> + <property name="toolTip"> + <string>Perform a recursive operation</string> + </property> + <property name="text"> + <string>Recursive</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <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"> + <horstretch>0</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Errors</string> + </property> + <layout class="QVBoxLayout"> + <item> + <widget class="QTextEdit" name="errors"> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="acceptRichText"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Close</set> + </property> + </widget> + </item> + </layout> + </widget> + <tabstops> + <tabstop>statusList</tabstop> + <tabstop>indexCheckBox</tabstop> + <tabstop>recursiveCheckBox</tabstop> + <tabstop>errors</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>GitSubmodulesStatusDialog</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>GitSubmodulesStatusDialog</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/GitSubmodulesSummaryOptionsDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,64 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter submodule summary options. +""" + +from __future__ import unicode_literals + +from PyQt5.QtWidgets import QDialog + +from .Ui_GitSubmodulesSummaryOptionsDialog import \ + Ui_GitSubmodulesSummaryOptionsDialog + + +class GitSubmodulesSummaryOptionsDialog(QDialog, + Ui_GitSubmodulesSummaryOptionsDialog): + """ + Class implementing a dialog to enter submodule summary options. + """ + def __init__(self, submodulePaths, parent=None): + """ + Constructor + + @param submodulePaths list of submodule paths + @type list of str + @param parent reference to the parent widget + @type QWidget + """ + super(GitSubmodulesSummaryOptionsDialog, self).__init__(parent) + self.setupUi(self) + + self.submodulesList.addItems(sorted(submodulePaths)) + + def getData(self): + """ + Public method to get the entered data. + + @return tuple containing a list of selected submodules, a flag + indicating to show summary for the superproject index, a flag + indicating to show summary for the submodules index, an optional + commit ID and a value for the number of entries to be shown + @rtype tuple of (list of str, bool, bool, str, int) + """ + submodulePaths = [] + for itm in self.submodulesList.selectedItems(): + submodulePaths.append(itm.text()) + + limit = self.limitSpinBox.value() + if limit == 0: + # adjust for unlimited + limit = -1 + + superProject = self.filesCheckBox.isChecked() + if superProject: + index = False + commit = "" + else: + index = self.indexCheckBox.isChecked() + commit = self.commitEdit.text().strip() + + return submodulePaths, superProject, index, commit, limit
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,202 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitSubmodulesSummaryOptionsDialog</class> + <widget class="QDialog" name="GitSubmodulesSummaryOptionsDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>400</width> + <height>350</height> + </rect> + </property> + <property name="windowTitle"> + <string>Submodule Summary Options</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0" colspan="3"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Selected Submodules:</string> + </property> + </widget> + </item> + <item row="1" column="0" colspan="3"> + <widget class="QListWidget" name="submodulesList"> + <property name="toolTip"> + <string>Select the submodules to show the summary for</string> + </property> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::ExtendedSelection</enum> + </property> + </widget> + </item> + <item row="2" column="0" colspan="3"> + <widget class="QCheckBox" name="filesCheckBox"> + <property name="toolTip"> + <string>Select to show summary information for the index of the superproject</string> + </property> + <property name="text"> + <string>Show Summary for Superproject Index</string> + </property> + </widget> + </item> + <item row="3" column="0" colspan="3"> + <widget class="QCheckBox" name="indexCheckBox"> + <property name="toolTip"> + <string>Select to show summary information for the index</string> + </property> + <property name="text"> + <string>Show Summary for Index</string> + </property> + </widget> + </item> + <item row="4" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Commit:</string> + </property> + </widget> + </item> + <item row="4" column="1" colspan="2"> + <widget class="QLineEdit" name="commitEdit"> + <property name="toolTip"> + <string>Enter a commit ID to show summary information for</string> + </property> + <property name="placeholderText"> + <string>Enter Commit ID</string> + </property> + </widget> + </item> + <item row="5" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Limit:</string> + </property> + </widget> + </item> + <item row="5" column="1"> + <widget class="QSpinBox" name="limitSpinBox"> + <property name="toolTip"> + <string>Enter the maximum number of entries to be shown per submodule</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="specialValueText"> + <string>No Limit</string> + </property> + <property name="maximum"> + <number>9999</number> + </property> + <property name="singleStep"> + <number>5</number> + </property> + </widget> + </item> + <item row="5" column="2"> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>269</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="6" column="0" colspan="3"> + <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> + <tabstops> + <tabstop>submodulesList</tabstop> + <tabstop>filesCheckBox</tabstop> + <tabstop>indexCheckBox</tabstop> + <tabstop>commitEdit</tabstop> + <tabstop>limitSpinBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>GitSubmodulesSummaryOptionsDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>227</x> + <y>332</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>GitSubmodulesSummaryOptionsDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>295</x> + <y>338</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>filesCheckBox</sender> + <signal>toggled(bool)</signal> + <receiver>indexCheckBox</receiver> + <slot>setDisabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>59</x> + <y>226</y> + </hint> + <hint type="destinationlabel"> + <x>62</x> + <y>249</y> + </hint> + </hints> + </connection> + <connection> + <sender>filesCheckBox</sender> + <signal>toggled(bool)</signal> + <receiver>commitEdit</receiver> + <slot>setDisabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>86</x> + <y>226</y> + </hint> + <hint type="destinationlabel"> + <x>86</x> + <y>271</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,47 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter submodule synchronization options. +""" + +from __future__ import unicode_literals + +from PyQt5.QtWidgets import QDialog + +from .Ui_GitSubmodulesSyncDialog import Ui_GitSubmodulesSyncDialog + + +class GitSubmodulesSyncDialog(QDialog, Ui_GitSubmodulesSyncDialog): + """ + Class implementing a dialog to enter submodule synchronization options. + """ + def __init__(self, submodulePaths, parent=None): + """ + Constructor + + @param submodulePaths list of submodule paths + @type list of str + @param parent reference to the parent widget + @type QWidget + """ + super(GitSubmodulesSyncDialog, self).__init__(parent) + self.setupUi(self) + + self.submodulesList.addItems(sorted(submodulePaths)) + + def getData(self): + """ + Public method to get the entered data. + + @return tuple containing a list of selected submodules and a flag + indicating a recursive operation + @rtype tuple of (list of str, bool) + """ + submodulePaths = [] + for itm in self.submodulesList.selectedItems(): + submodulePaths.append(itm.text()) + + return submodulePaths, self.recursiveCheckBox.isChecked()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,97 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitSubmodulesSyncDialog</class> + <widget class="QDialog" name="GitSubmodulesSyncDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>400</width> + <height>300</height> + </rect> + </property> + <property name="windowTitle"> + <string>Synchronize Submodule URLs</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Selected Submodules:</string> + </property> + </widget> + </item> + <item> + <widget class="QListWidget" name="submodulesList"> + <property name="toolTip"> + <string>Select the submodules to be synchronized</string> + </property> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::ExtendedSelection</enum> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="recursiveCheckBox"> + <property name="toolTip"> + <string>Select to perform a recursive synchronization</string> + </property> + <property name="text"> + <string>Recursive Operation</string> + </property> + </widget> + </item> + <item> + <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>GitSubmodulesSyncDialog</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>GitSubmodulesSyncDialog</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/GitSubmodulesUpdateOptionsDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,71 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter options for a submodule update command. +""" + +from __future__ import unicode_literals + +from PyQt5.QtWidgets import QDialog + +from .Ui_GitSubmodulesUpdateOptionsDialog import \ + Ui_GitSubmodulesUpdateOptionsDialog + + +class GitSubmodulesUpdateOptionsDialog(QDialog, + Ui_GitSubmodulesUpdateOptionsDialog): + """ + Class implementing a dialog to enter options for a submodule update + command. + """ + def __init__(self, submodulePaths, parent=None): + """ + Constructor + + @param submodulePaths list of submodule paths + @type list of str + @param parent reference to the parent widget + @type QWidget + """ + super(GitSubmodulesUpdateOptionsDialog, self).__init__(parent) + self.setupUi(self) + + self.submodulesList.addItems(sorted(submodulePaths)) + + def getData(self): + """ + Public method to get the entered data. + + @return tuple containing the update procedure, a flag indicating an + init, a flag indicating an update with remote, a flag indicating + not to fetch the remote, a flag indicating an enforced operation + and a list of selected submodules. + @rtype tuple of (int, bool, bool, bool, bool, list of str) + """ + submodulePaths = [] + for itm in self.submodulesList.selectedItems(): + submodulePaths.append(itm.text()) + + if self.checkoutButton.isChecked(): + procedure = "--checkout" + elif self.rebaseButton.isChecked(): + procedure = "--rebase" + else: + procedure = "--merge" + + if self.remoteCheckBox.isChecked(): + nofetch = self.nofetchCheckBox.isChecked() + else: + nofetch = False + + return ( + procedure, + self.initCheckBox.isChecked(), + self.remoteCheckBox.isChecked(), + nofetch, + self.forceCheckBox.isChecked(), + submodulePaths, + )
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,198 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitSubmodulesUpdateOptionsDialog</class> + <widget class="QDialog" name="GitSubmodulesUpdateOptionsDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>400</width> + <height>458</height> + </rect> + </property> + <property name="windowTitle"> + <string>Submodule Update Options</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Update Procedure</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QRadioButton" name="checkoutButton"> + <property name="toolTip"> + <string>Select to perform a 'checkout' procedure</string> + </property> + <property name="text"> + <string>checkout</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QRadioButton" name="rebaseButton"> + <property name="toolTip"> + <string>Select to perform a 'rebase' procedure</string> + </property> + <property name="text"> + <string>rebase</string> + </property> + </widget> + </item> + <item> + <widget class="QRadioButton" name="mergeButton"> + <property name="toolTip"> + <string>Select to perform a 'merge' procedure</string> + </property> + <property name="text"> + <string>merge</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QCheckBox" name="initCheckBox"> + <property name="toolTip"> + <string>Select to initialize submodules before the update</string> + </property> + <property name="text"> + <string>Initialize before Update</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="remoteCheckBox"> + <property name="toolTip"> + <string>Fetch remote changes before updating</string> + </property> + <property name="text"> + <string>Synchronize with remote</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="nofetchCheckBox"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Select to not fetch the remote</string> + </property> + <property name="text"> + <string>Don't Fetch</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Selected Submodules:</string> + </property> + </widget> + </item> + <item> + <widget class="QListWidget" name="submodulesList"> + <property name="toolTip"> + <string>Select the submodules to be updated</string> + </property> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::ExtendedSelection</enum> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="forceCheckBox"> + <property name="toolTip"> + <string>Select to enforce the update</string> + </property> + <property name="text"> + <string>Enforce Operation</string> + </property> + </widget> + </item> + <item> + <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> + <tabstops> + <tabstop>checkoutButton</tabstop> + <tabstop>rebaseButton</tabstop> + <tabstop>mergeButton</tabstop> + <tabstop>initCheckBox</tabstop> + <tabstop>remoteCheckBox</tabstop> + <tabstop>nofetchCheckBox</tabstop> + <tabstop>submodulesList</tabstop> + <tabstop>forceCheckBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>GitSubmodulesUpdateOptionsDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>227</x> + <y>437</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>GitSubmodulesUpdateOptionsDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>295</x> + <y>443</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>remoteCheckBox</sender> + <signal>toggled(bool)</signal> + <receiver>nofetchCheckBox</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>37</x> + <y>124</y> + </hint> + <hint type="destinationlabel"> + <x>37</x> + <y>157</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,376 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to show a list of tags or branches. +""" + +from __future__ import unicode_literals +try: + str = unicode +except NameError: + pass + +import os + +from PyQt5.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QHeaderView, \ + QTreeWidgetItem, QLineEdit + +from E5Gui import E5MessageBox + +from .Ui_GitTagBranchListDialog import Ui_GitTagBranchListDialog + +from .GitUtilities import strToQByteArray + +import Preferences + + +class GitTagBranchListDialog(QDialog, Ui_GitTagBranchListDialog): + """ + Class implementing a dialog to show a list of tags or branches. + """ + def __init__(self, vcs, parent=None): + """ + Constructor + + @param vcs reference to the vcs object + @param parent parent widget (QWidget) + """ + super(GitTagBranchListDialog, self).__init__(parent) + self.setupUi(self) + self.setWindowFlags(Qt.Window) + + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) + + self.process = QProcess() + self.vcs = vcs + + self.tagList.headerItem().setText(self.tagList.columnCount(), "") + self.tagList.header().setSortIndicator(1, Qt.AscendingOrder) + + self.process.finished.connect(self.__procFinished) + self.process.readyReadStandardOutput.connect(self.__readStdout) + self.process.readyReadStandardError.connect(self.__readStderr) + + self.show() + QCoreApplication.processEvents() + + def closeEvent(self, e): + """ + Protected slot implementing a close event handler. + + @param e close event (QCloseEvent) + """ + if self.process is not None and \ + self.process.state() != QProcess.NotRunning: + self.process.terminate() + QTimer.singleShot(2000, self.process.kill) + self.process.waitForFinished(3000) + + e.accept() + + def start(self, path, tags, listAll=True, merged=True): + """ + Public slot to start the tag/branch list command. + + @param path name of directory to be listed (string) + @param tags flag indicating a list of tags is requested + (False = branches, True = tags) + @param listAll flag indicating to show all tags or branches (boolean) + @param merged flag indicating to show only merged or non-merged + branches (boolean) + """ + self.tagList.clear() + + self.errorGroup.hide() + + self.intercept = False + self.tagsMode = tags + if tags: + self.tagList.setHeaderItem( + QTreeWidgetItem([self.tr("Commit"), self.tr("Name"), + self.tr("Annotation Message")])) + else: + self.setWindowTitle(self.tr("Git Branches List")) + self.tagList.setHeaderItem( + QTreeWidgetItem([self.tr("Commit"), self.tr("Name")])) + self.activateWindow() + + dname, fname = self.vcs.splitPath(path) + + # find the root of the repo + self.repodir = dname + while not os.path.isdir(os.path.join(self.repodir, self.vcs.adminDir)): + self.repodir = os.path.dirname(self.repodir) + if os.path.splitdrive(self.repodir)[1] == os.sep: + return + + if self.tagsMode: + args = self.vcs.initCommand("tag") + args.append('--list') + args.append('-n') + else: + args = self.vcs.initCommand("branch") + args.append('--list') + args.append('--all') + args.append('--verbose') + if not listAll: + if merged: + args.append("--merged") + else: + args.append("--no-merged") + + self.process.kill() + self.process.setWorkingDirectory(self.repodir) + + self.process.start('git', args) + procStarted = self.process.waitForStarted(5000) + if not procStarted: + self.inputGroup.setEnabled(False) + self.inputGroup.hide() + E5MessageBox.critical( + self, + self.tr('Process Generation Error'), + self.tr( + 'The process {0} could not be started. ' + 'Ensure, that it is in the search path.' + ).format('git')) + else: + self.inputGroup.setEnabled(True) + self.inputGroup.show() + + def __finish(self): + """ + Private slot called when the process finished or the user pressed + the button. + """ + if self.process is not None and \ + self.process.state() != QProcess.NotRunning: + self.process.terminate() + QTimer.singleShot(2000, self.process.kill) + self.process.waitForFinished(3000) + + self.inputGroup.setEnabled(False) + self.inputGroup.hide() + + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) + self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) + self.buttonBox.button(QDialogButtonBox.Close).setFocus( + Qt.OtherFocusReason) + + self.__resizeColumns() + self.__resort() + + def on_buttonBox_clicked(self, button): + """ + Private slot called by a button of the button box clicked. + + @param button button that was clicked (QAbstractButton) + """ + if button == self.buttonBox.button(QDialogButtonBox.Close): + self.close() + elif button == self.buttonBox.button(QDialogButtonBox.Cancel): + self.__finish() + + def __procFinished(self, exitCode, exitStatus): + """ + Private slot connected to the finished signal. + + @param exitCode exit code of the process (integer) + @param exitStatus exit status of the process (QProcess.ExitStatus) + """ + self.__finish() + + def __resort(self): + """ + Private method to resort the tree. + """ + self.tagList.sortItems( + self.tagList.sortColumn(), + self.tagList.header().sortIndicatorOrder()) + + def __resizeColumns(self): + """ + Private method to resize the list columns. + """ + self.tagList.header().resizeSections(QHeaderView.ResizeToContents) + self.tagList.header().setStretchLastSection(True) + + def __generateItem(self, commit, name, msg="", bold=False, italic=False): + """ + Private method to generate a tag item in the tag list. + + @param commit commit id of the tag/branch (string) + @param name name of the tag/branch (string) + @param msg tag annotation message + @param bold flag indicating to show the entry in bold (boolean) + @param italic flag indicating to show the entry in italic (boolean) + """ + itm = QTreeWidgetItem(self.tagList) + itm.setData(0, Qt.DisplayRole, commit) + itm.setData(1, Qt.DisplayRole, name) + if msg: + itm.setData(2, Qt.DisplayRole, msg) + itm.setTextAlignment(0, Qt.AlignRight) + if bold or italic: + font = itm.font(1) + if bold: + font.setBold(True) + if italic: + font.setItalic(True) + itm.setFont(1, font) + + def __getCommit(self, tag): + """ + Private method to get the commit id for a tag. + + @param tag tag name (string) + @return commit id shortened to 10 characters (string) + """ + args = self.vcs.initCommand("show") + args.append("--abbrev-commit") + args.append("--abbrev={0}".format( + self.vcs.getPlugin().getPreferences("CommitIdLength"))) + args.append("--no-patch") + args.append(tag) + + output = "" + process = QProcess() + process.setWorkingDirectory(self.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') + + if output: + for line in output.splitlines(): + if line.startswith("commit "): + commitId = line.split()[1] + return commitId + + return "" + + def __readStdout(self): + """ + Private slot to handle the readyReadStdout signal. + + It reads the output of the process, formats it and inserts it into + the contents pane. + """ + self.process.setReadChannel(QProcess.StandardOutput) + + while self.process.canReadLine(): + s = str(self.process.readLine(), + Preferences.getSystem("IOEncoding"), + 'replace') + self.__processOutputLine(s) + + def __processOutputLine(self, line): + """ + Private method to process the lines of output. + + @param line output line to be processed (string) + """ + if self.tagsMode: + name, msg = line.strip().split(None, 1) + commit = self.__getCommit(name) + self.__generateItem(commit, name, msg.strip()) + else: + bold = line.startswith("* ") + line = line[2:] + if line.startswith("("): + name, line = line[1:].split(")", 1) + commit = line.strip().split(None, 1)[0] + else: + data = line.split(None, 2) + if data[1].startswith("->"): + name = " ".join(line.strip().split()) + commit = "" + else: + commit = data[1] + name = data[0] + italic = name.startswith("remotes/") + self.__generateItem(commit, name, bold=bold, italic=italic) + + def __readStderr(self): + """ + Private slot to handle the readyReadStderr signal. + + It reads the error output of the process and inserts it into the + error pane. + """ + if self.process is not None: + s = str(self.process.readAllStandardError(), + Preferences.getSystem("IOEncoding"), + 'replace') + self.__showError(s) + + def __showError(self, out): + """ + Private slot to show some error. + + @param out error to be shown (string) + """ + self.errorGroup.show() + self.errors.insertPlainText(out) + self.errors.ensureCursorVisible() + + def on_passwordCheckBox_toggled(self, isOn): + """ + Private slot to handle the password checkbox toggled. + + @param isOn flag indicating the status of the check box (boolean) + """ + if isOn: + self.input.setEchoMode(QLineEdit.Password) + else: + self.input.setEchoMode(QLineEdit.Normal) + + @pyqtSlot() + def on_sendButton_clicked(self): + """ + Private slot to send the input to the git process. + """ + inputTxt = self.input.text() + inputTxt += os.linesep + + if self.passwordCheckBox.isChecked(): + self.errors.insertPlainText(os.linesep) + self.errors.ensureCursorVisible() + else: + self.errors.insertPlainText(inputTxt) + self.errors.ensureCursorVisible() + + self.process.write(strToQByteArray(inputTxt)) + + self.passwordCheckBox.setChecked(False) + self.input.clear() + + def on_input_returnPressed(self): + """ + Private slot to handle the press of the return key in the input field. + """ + self.intercept = True + self.on_sendButton_clicked() + + def keyPressEvent(self, evt): + """ + Protected slot to handle a key press event. + + @param evt the key press event (QKeyEvent) + """ + if self.intercept: + self.intercept = False + evt.accept() + return + + super(GitTagBranchListDialog, self).keyPressEvent(evt)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,166 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitTagBranchListDialog</class> + <widget class="QDialog" name="GitTagBranchListDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>634</width> + <height>494</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git Tag List</string> + </property> + <property name="whatsThis"> + <string><b>Git Tag/Branch List</b> +<p>This dialog shows a list of the projects tags or branches.</p></string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout"> + <item> + <widget class="QTreeWidget" name="tagList"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>2</verstretch> + </sizepolicy> + </property> + <property name="whatsThis"> + <string><b>Tag/Branches List</b> +<p>This shows a list of the projects tags or branches.</p></string> + </property> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <property name="itemsExpandable"> + <bool>false</bool> + </property> + <property name="sortingEnabled"> + <bool>true</bool> + </property> + <column> + <property name="text"> + <string>Commit</string> + </property> + </column> + <column> + <property name="text"> + <string>Name</string> + </property> + </column> + </widget> + </item> + <item> + <widget class="QGroupBox" name="errorGroup"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Errors</string> + </property> + <layout class="QVBoxLayout"> + <item> + <widget class="QTextEdit" name="errors"> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="acceptRichText"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="inputGroup"> + <property name="title"> + <string>Input</string> + </property> + <layout class="QGridLayout"> + <item row="1" column="1"> + <spacer> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>327</width> + <height>29</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="2"> + <widget class="QPushButton" name="sendButton"> + <property name="toolTip"> + <string>Press to send the input to the git process</string> + </property> + <property name="text"> + <string>&Send</string> + </property> + <property name="shortcut"> + <string>Alt+S</string> + </property> + </widget> + </item> + <item row="0" column="0" colspan="3"> + <widget class="QLineEdit" name="input"> + <property name="toolTip"> + <string>Enter data to be sent to the git process</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QCheckBox" name="passwordCheckBox"> + <property name="toolTip"> + <string>Select to switch the input field to password mode</string> + </property> + <property name="text"> + <string>&Password Mode</string> + </property> + <property name="shortcut"> + <string>Alt+P</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close</set> + </property> + </widget> + </item> + </layout> + </widget> + <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> + <tabstops> + <tabstop>tagList</tabstop> + <tabstop>errors</tabstop> + <tabstop>input</tabstop> + <tabstop>passwordCheckBox</tabstop> + <tabstop>sendButton</tabstop> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections/> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitTagDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,98 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter the data for a tagging operation. +""" + +from __future__ import unicode_literals + +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox + +from .Ui_GitTagDialog import Ui_GitTagDialog + + +class GitTagDialog(QDialog, Ui_GitTagDialog): + """ + Class implementing a dialog to enter the data for a tagging operation. + """ + CreateTag = 1 + DeleteTag = 2 + VerifyTag = 3 + + AnnotatedTag = 1 + SignedTag = 2 + LocalTag = 3 + + def __init__(self, taglist, revision=None, tagName=None, parent=None): + """ + Constructor + + @param taglist list of previously entered tags (list of strings) + @param revision revision to set tag for (string) + @param tagName name of the tag (string) + @param parent parent widget (QWidget) + """ + super(GitTagDialog, self).__init__(parent) + self.setupUi(self) + + self.okButton = self.buttonBox.button(QDialogButtonBox.Ok) + self.okButton.setEnabled(False) + + self.tagCombo.clear() + self.tagCombo.addItem("") + self.tagCombo.addItems(sorted(taglist, reverse=True)) + + if revision: + self.revisionEdit.setText(revision) + + if tagName: + index = self.tagCombo.findText(tagName) + if index > -1: + self.tagCombo.setCurrentIndex(index) + # suggest the most relevant tag action + self.verifyTagButton.setChecked(True) + else: + self.tagCombo.setEditText(tagName) + self.createTagButton.setChecked(True) + + msh = self.minimumSizeHint() + self.resize(max(self.width(), msh.width()), msh.height()) + + @pyqtSlot(str) + def on_tagCombo_editTextChanged(self, text): + """ + Private method used to enable/disable the OK-button. + + @param text tag name entered in the combo (string) + """ + self.okButton.setDisabled(text == "") + + def getParameters(self): + """ + Public method to retrieve the tag data. + + @return tuple of two strings, two int and a boolean (tag, revision, + tag operation, tag type, enforce operation) + """ + tag = self.tagCombo.currentText().replace(" ", "_") + + if self.createTagButton.isChecked(): + tagOp = GitTagDialog.CreateTag + elif self.deleteTagButton.isChecked(): + tagOp = GitTagDialog.DeleteTag + else: + tagOp = GitTagDialog.VerifyTag + + if self.globalTagButton.isChecked(): + tagType = GitTagDialog.AnnotatedTag + elif self.signedTagButton.isChecked(): + tagType = GitTagDialog.SignedTag + else: + tagType = GitTagDialog.LocalTag + + return (tag, self.revisionEdit.text(), tagOp, tagType, + self.forceCheckBox.isChecked())
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitTagDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,292 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitTagDialog</class> + <widget class="QDialog" name="GitTagDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>391</width> + <height>344</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git Tag</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QGridLayout" name="gridLayout_3"> + <item row="0" column="0"> + <widget class="QLabel" name="TextLabel1"> + <property name="text"> + <string>Name:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QComboBox" name="tagCombo"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Enter the name of the tag</string> + </property> + <property name="whatsThis"> + <string><b>Tag Name</b> +<p>Enter the name of the tag to be created, deleted or verified.</p></string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + <property name="duplicatesEnabled"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Revision:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLineEdit" name="revisionEdit"> + <property name="toolTip"> + <string>Enter a revision to set a tag for</string> + </property> + </widget> + </item> + <item row="2" column="0" colspan="2"> + <widget class="QGroupBox" name="tagActionGroup"> + <property name="title"> + <string>Tag Action</string> + </property> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0"> + <widget class="QRadioButton" name="createTagButton"> + <property name="toolTip"> + <string>Select to create a tag</string> + </property> + <property name="whatsThis"> + <string><b>Create Tag</b> +<p>Select this entry in order to create a tag.</p></string> + </property> + <property name="text"> + <string>Create Tag</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QRadioButton" name="deleteTagButton"> + <property name="toolTip"> + <string>Select to delete a tag</string> + </property> + <property name="whatsThis"> + <string><b>Delete Tag</b> +<p>Select this entry in order to delete the selected tag.</p></string> + </property> + <property name="text"> + <string>Delete Tag</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QRadioButton" name="verifyTagButton"> + <property name="toolTip"> + <string>Select to verify a tag</string> + </property> + <property name="whatsThis"> + <string><b>Verify Tag</b> +<p>Select this entry in order to verify the selected tag.</p></string> + </property> + <property name="text"> + <string>Verify Tag</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="3" column="0" colspan="2"> + <widget class="QGroupBox" name="tagTypeGroup"> + <property name="title"> + <string>Tag Type</string> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QRadioButton" name="globalTagButton"> + <property name="toolTip"> + <string>Select to create/delete/verify a global tag</string> + </property> + <property name="text"> + <string>Global Tag</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QRadioButton" name="signedTagButton"> + <property name="toolTip"> + <string>Select to create/delete/verify a signed tag</string> + </property> + <property name="text"> + <string>Signed Tag</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QRadioButton" name="localTagButton"> + <property name="toolTip"> + <string>Select to create/delete/verify a local tag</string> + </property> + <property name="text"> + <string>Local Tag</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="4" column="0" colspan="2"> + <widget class="QCheckBox" name="forceCheckBox"> + <property name="toolTip"> + <string>Select to enforce the create operation</string> + </property> + <property name="text"> + <string>Enforce Operation</string> + </property> + </widget> + </item> + <item row="5" 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> + <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> + <tabstops> + <tabstop>tagCombo</tabstop> + <tabstop>revisionEdit</tabstop> + <tabstop>createTagButton</tabstop> + <tabstop>deleteTagButton</tabstop> + <tabstop>verifyTagButton</tabstop> + <tabstop>globalTagButton</tabstop> + <tabstop>signedTagButton</tabstop> + <tabstop>localTagButton</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>GitTagDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>104</x> + <y>333</y> + </hint> + <hint type="destinationlabel"> + <x>25</x> + <y>214</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>GitTagDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>141</x> + <y>333</y> + </hint> + <hint type="destinationlabel"> + <x>128</x> + <y>210</y> + </hint> + </hints> + </connection> + <connection> + <sender>deleteTagButton</sender> + <signal>toggled(bool)</signal> + <receiver>revisionEdit</receiver> + <slot>setDisabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>344</x> + <y>127</y> + </hint> + <hint type="destinationlabel"> + <x>137</x> + <y>49</y> + </hint> + </hints> + </connection> + <connection> + <sender>verifyTagButton</sender> + <signal>toggled(bool)</signal> + <receiver>revisionEdit</receiver> + <slot>setDisabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>80</x> + <y>149</y> + </hint> + <hint type="destinationlabel"> + <x>101</x> + <y>57</y> + </hint> + </hints> + </connection> + <connection> + <sender>createTagButton</sender> + <signal>toggled(bool)</signal> + <receiver>tagTypeGroup</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>62</x> + <y>119</y> + </hint> + <hint type="destinationlabel"> + <x>59</x> + <y>182</y> + </hint> + </hints> + </connection> + <connection> + <sender>createTagButton</sender> + <signal>toggled(bool)</signal> + <receiver>forceCheckBox</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>43</x> + <y>120</y> + </hint> + <hint type="destinationlabel"> + <x>35</x> + <y>288</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,45 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter some user data. +""" + +from __future__ import unicode_literals + +from PyQt5.QtWidgets import QDialog + +from .Ui_GitUserConfigDataDialog import Ui_GitUserConfigDataDialog + + +class GitUserConfigDataDialog(QDialog, Ui_GitUserConfigDataDialog): + """ + Class implementing a dialog to enter some user data. + """ + def __init__(self, version=(0, 0), parent=None): + """ + Constructor + + @param version Git version info (tuple of two integers) + @param parent reference to the parent widget (QWidget) + """ + super(GitUserConfigDataDialog, self).__init__(parent) + self.setupUi(self) + + msh = self.minimumSizeHint() + self.resize(max(self.width(), msh.width()), msh.height()) + + def getData(self): + """ + Public method to retrieve the entered data. + + @return tuple with user's first name, last name and email address + (tuple of three strings) + """ + return ( + self.firstNameEdit.text(), + self.lastNameEdit.text(), + self.emailEdit.text(), + )
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,131 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>GitUserConfigDataDialog</class> + <widget class="QDialog" name="GitUserConfigDataDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>400</width> + <height>184</height> + </rect> + </property> + <property name="windowTitle"> + <string>Git User Data</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>User Data</string> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>First Name:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="E5ClearableLineEdit" name="firstNameEdit"> + <property name="toolTip"> + <string>Enter the first name</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Last Name:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="E5ClearableLineEdit" name="lastNameEdit"> + <property name="toolTip"> + <string>Enter the last name</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Email:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="E5ClearableLineEdit" name="emailEdit"> + <property name="toolTip"> + <string>Enter the email address</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <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> + <customwidgets> + <customwidget> + <class>E5ClearableLineEdit</class> + <extends>QLineEdit</extends> + <header>E5Gui/E5LineEdit.h</header> + </customwidget> + </customwidgets> + <tabstops> + <tabstop>firstNameEdit</tabstop> + <tabstop>lastNameEdit</tabstop> + <tabstop>emailEdit</tabstop> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>GitUserConfigDataDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>257</x> + <y>378</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>GitUserConfigDataDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>325</x> + <y>378</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/GitUtilities.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,67 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing some common utility functions for the Git package. +""" + +from __future__ import unicode_literals + +import os +import sys + +from PyQt5.QtCore import QProcessEnvironment, QByteArray + +import Utilities + + +def getConfigPath(): + """ + Public function to get the filename of the config file. + + @return filename of the config file (string) + """ + if Utilities.isWindowsPlatform(): + userprofile = os.environ["USERPROFILE"] + return os.path.join(userprofile, ".gitconfig") + else: + homedir = Utilities.getHomeDir() + return os.path.join(homedir, ".gitconfig") + + +def prepareProcess(proc, language=""): + """ + Public function to prepare the given process. + + @param proc reference to the proces to be prepared (QProcess) + @param language language to be set (string) + """ + env = QProcessEnvironment.systemEnvironment() + + # set the language for the process + if language: + env.insert("LANGUAGE", language) + + proc.setProcessEnvironment(env) + + +try: + from Globals import strToQByteArray +except ImportError: + def strToQByteArray(txt): + """ + Module function to convert a Python string into a QByteArray. + + @param txt Python string to be converted + @type str, bytes, bytearray, unicode + """ + if sys.version_info[0] == 2: + if isinstance(txt, unicode): # __IGNORE_WARNING__ + txt = txt.encode("utf-8") + else: + if isinstance(txt, str): + txt = txt.encode("utf-8") + + return QByteArray(txt)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,699 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the VCS project browser helper for Git. +""" + +from __future__ import unicode_literals + +import os + +from PyQt5.QtWidgets import QMenu, QDialog + +from E5Gui.E5Application import e5App + +from Project.ProjectBrowserModel import ProjectBrowserFileItem + +from VCS.ProjectBrowserHelper import VcsProjectBrowserHelper + +import UI.PixmapCache + + +class GitProjectBrowserHelper(VcsProjectBrowserHelper): + """ + Class implementing the VCS project browser helper for Git. + """ + def __init__(self, vcsObject, browserObject, projectObject, + isTranslationsBrowser, parent=None, name=None): + """ + Constructor + + @param vcsObject reference to the vcs object + @param browserObject reference to the project browser object + @param projectObject reference to the project object + @param isTranslationsBrowser flag indicating, the helper is requested + for the translations browser (this needs some special treatment) + @param parent parent widget (QWidget) + @param name name of this object (string) + """ + VcsProjectBrowserHelper.__init__(self, vcsObject, browserObject, + projectObject, isTranslationsBrowser, + parent, name) + + def showContextMenu(self, menu, standardItems): + """ + Public slot called before the context menu is shown. + + It enables/disables the VCS menu entries depending on the overall + VCS status and the file status. + + @param menu reference to the menu to be shown + @param standardItems array of standard items that need + activation/deactivation depending on the overall VCS status + """ + if self.browser.currentItem().data(1) == self.vcs.vcsName(): + for act in self.vcsMenuActions: + act.setEnabled(True) + for act in standardItems: + act.setEnabled(False) + else: + for act in self.vcsMenuActions: + act.setEnabled(False) + for act in standardItems: + act.setEnabled(True) + + def showContextMenuMulti(self, menu, standardItems): + """ + Public slot called before the context menu (multiple selections) is + shown. + + It enables/disables the VCS menu entries depending on the overall + VCS status and the files status. + + @param menu reference to the menu to be shown + @param standardItems array of standard items that need + activation/deactivation depending on the overall VCS status + """ + vcsName = self.vcs.vcsName() + items = self.browser.getSelectedItems() + vcsItems = 0 + # determine number of selected items under VCS control + for itm in items: + if itm.data(1) == vcsName: + vcsItems += 1 + + if vcsItems > 0: + if vcsItems != len(items): + for act in self.vcsMultiMenuActions: + act.setEnabled(False) + else: + for act in self.vcsMultiMenuActions: + act.setEnabled(True) + for act in standardItems: + act.setEnabled(False) + else: + for act in self.vcsMultiMenuActions: + act.setEnabled(False) + for act in standardItems: + act.setEnabled(True) + + def showContextMenuDir(self, menu, standardItems): + """ + Public slot called before the context menu is shown. + + It enables/disables the VCS menu entries depending on the overall + VCS status and the directory status. + + @param menu reference to the menu to be shown + @param standardItems array of standard items that need + activation/deactivation depending on the overall VCS status + """ + if self.browser.currentItem().data(1) == self.vcs.vcsName(): + for act in self.vcsDirMenuActions: + act.setEnabled(True) + for act in standardItems: + act.setEnabled(False) + else: + for act in self.vcsDirMenuActions: + act.setEnabled(False) + for act in standardItems: + act.setEnabled(True) + + def showContextMenuDirMulti(self, menu, standardItems): + """ + Public slot called before the context menu is shown. + + It enables/disables the VCS menu entries depending on the overall + VCS status and the directory status. + + @param menu reference to the menu to be shown + @param standardItems array of standard items that need + activation/deactivation depending on the overall VCS status + """ + vcsName = self.vcs.vcsName() + items = self.browser.getSelectedItems() + vcsItems = 0 + # determine number of selected items under VCS control + for itm in items: + if itm.data(1) == vcsName: + vcsItems += 1 + + if vcsItems > 0: + if vcsItems != len(items): + for act in self.vcsDirMultiMenuActions: + act.setEnabled(False) + else: + for act in self.vcsDirMultiMenuActions: + act.setEnabled(True) + for act in standardItems: + act.setEnabled(False) + else: + for act in self.vcsDirMultiMenuActions: + act.setEnabled(False) + for act in standardItems: + act.setEnabled(True) + + ########################################################################### + ## Protected menu generation methods below + ########################################################################### + + def _addVCSMenu(self, mainMenu): + """ + Protected method used to add the VCS menu to all project browsers. + + @param mainMenu reference to the menu to be amended + """ + self.vcsMenuActions = [] + self.vcsAddMenuActions = [] + + menu = QMenu(self.tr("Version Control")) + + act = menu.addAction( + UI.PixmapCache.getIcon( + os.path.join("VcsPlugins", "vcsGit", "icons", "git.png")), + self.vcs.vcsName(), self._VCSInfoDisplay) + font = act.font() + font.setBold(True) + act.setFont(font) + menu.addSeparator() + + act = menu.addAction( + UI.PixmapCache.getIcon("vcsCommit.png"), + self.tr('Commit changes to repository...'), + self._VCSCommit) + self.vcsMenuActions.append(act) + menu.addSeparator() + act = menu.addAction( + UI.PixmapCache.getIcon("vcsAdd.png"), + self.tr('Add/Stage to repository'), + self._VCSAdd) + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRevert.png"), + self.tr('Unstage changes'), + self.__GitUnstage) + self.vcsMenuActions.append(act) + menu.addSeparator() + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRemove.png"), + self.tr('Remove from repository (and disk)'), + self._VCSRemove) + self.vcsMenuActions.append(act) + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRemove.png"), + self.tr('Remove from repository only'), + self.__GitForget) + self.vcsMenuActions.append(act) + menu.addSeparator() + act = menu.addAction(self.tr('Copy'), self.__GitCopy) + self.vcsMenuActions.append(act) + act = menu.addAction(self.tr('Move'), self.__GitMove) + self.vcsMenuActions.append(act) + menu.addSeparator() + act = menu.addAction( + UI.PixmapCache.getIcon("vcsLog.png"), + self.tr('Show log browser'), self._VCSLogBrowser) + self.vcsMenuActions.append(act) + menu.addSeparator() + act = menu.addAction( + UI.PixmapCache.getIcon("vcsStatus.png"), + self.tr('Show status'), self._VCSStatus) + self.vcsMenuActions.append(act) + menu.addSeparator() + act = menu.addAction( + UI.PixmapCache.getIcon("vcsDiff.png"), + self.tr('Show differences'), self._VCSDiff) + self.vcsMenuActions.append(act) + act = menu.addAction( + UI.PixmapCache.getIcon("vcsSbsDiff.png"), + self.tr('Show differences side-by-side'), self.__GitSbsDiff) + self.vcsMenuActions.append(act) + act = menu.addAction( + UI.PixmapCache.getIcon("vcsDiff.png"), + self.tr('Show differences (extended)'), + self.__GitExtendedDiff) + self.vcsMenuActions.append(act) + act = menu.addAction( + UI.PixmapCache.getIcon("vcsSbsDiff.png"), + self.tr('Show differences side-by-side (extended)'), + self.__GitSbsExtendedDiff) + self.vcsMenuActions.append(act) + menu.addSeparator() + self.annotateAct = menu.addAction( + self.tr('Show annotated file'), + self.__GitBlame) + self.vcsMenuActions.append(self.annotateAct) + menu.addSeparator() + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRevert.png"), + self.tr('Revert changes'), self.__GitRevert) + self.vcsMenuActions.append(act) + menu.addSeparator() + + menu.addSeparator() + menu.addAction(self.tr('Select all local file entries'), + self.browser.selectLocalEntries) + menu.addAction(self.tr('Select all versioned file entries'), + self.browser.selectVCSEntries) + menu.addAction(self.tr('Select all local directory entries'), + self.browser.selectLocalDirEntries) + menu.addAction(self.tr('Select all versioned directory entries'), + self.browser.selectVCSDirEntries) + menu.addSeparator() + menu.addAction(self.tr("Configure..."), self.__GitConfigure) + + mainMenu.addSeparator() + mainMenu.addMenu(menu) + self.menu = menu + + def _addVCSMenuMulti(self, mainMenu): + """ + Protected method used to add the VCS menu for multi selection to all + project browsers. + + @param mainMenu reference to the menu to be amended + """ + self.vcsMultiMenuActions = [] + + menu = QMenu(self.tr("Version Control")) + + act = menu.addAction( + UI.PixmapCache.getIcon( + os.path.join("VcsPlugins", "vcsGit", "icons", "git.png")), + self.vcs.vcsName(), self._VCSInfoDisplay) + font = act.font() + font.setBold(True) + act.setFont(font) + menu.addSeparator() + + act = menu.addAction( + UI.PixmapCache.getIcon("vcsCommit.png"), + self.tr('Commit changes to repository...'), + self._VCSCommit) + self.vcsMultiMenuActions.append(act) + menu.addSeparator() + act = menu.addAction( + UI.PixmapCache.getIcon("vcsAdd.png"), + self.tr('Add/Stage to repository'), self._VCSAdd) + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRevert.png"), + self.tr('Unstage changes'), + self.__GitUnstage) + self.vcsMultiMenuActions.append(act) + menu.addSeparator() + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRemove.png"), + self.tr('Remove from repository (and disk)'), + self._VCSRemove) + self.vcsMultiMenuActions.append(act) + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRemove.png"), + self.tr('Remove from repository only'), + self.__GitForget) + self.vcsMultiMenuActions.append(act) + menu.addSeparator() + act = menu.addAction( + UI.PixmapCache.getIcon("vcsStatus.png"), + self.tr('Show status'), self._VCSStatus) + self.vcsMultiMenuActions.append(act) + menu.addSeparator() + act = menu.addAction( + UI.PixmapCache.getIcon("vcsDiff.png"), + self.tr('Show differences'), self._VCSDiff) + self.vcsMultiMenuActions.append(act) + act = menu.addAction( + UI.PixmapCache.getIcon("vcsDiff.png"), + self.tr('Show differences (extended)'), + self.__GitExtendedDiff) + self.vcsMultiMenuActions.append(act) + menu.addSeparator() + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRevert.png"), + self.tr('Revert changes'), self.__GitRevert) + self.vcsMultiMenuActions.append(act) + menu.addSeparator() + + menu.addSeparator() + menu.addAction(self.tr('Select all local file entries'), + self.browser.selectLocalEntries) + menu.addAction(self.tr('Select all versioned file entries'), + self.browser.selectVCSEntries) + menu.addAction(self.tr('Select all local directory entries'), + self.browser.selectLocalDirEntries) + menu.addAction(self.tr('Select all versioned directory entries'), + self.browser.selectVCSDirEntries) + menu.addSeparator() + menu.addAction(self.tr("Configure..."), self.__GitConfigure) + + mainMenu.addSeparator() + mainMenu.addMenu(menu) + self.menuMulti = menu + + def _addVCSMenuBack(self, mainMenu): + """ + Protected method used to add the VCS menu to all project browsers. + + @param mainMenu reference to the menu to be amended + """ + menu = QMenu(self.tr("Version Control")) + + act = menu.addAction( + UI.PixmapCache.getIcon( + os.path.join("VcsPlugins", "vcsGit", "icons", "git.png")), + self.vcs.vcsName(), self._VCSInfoDisplay) + font = act.font() + font.setBold(True) + act.setFont(font) + menu.addSeparator() + + menu.addAction(self.tr('Select all local file entries'), + self.browser.selectLocalEntries) + menu.addAction(self.tr('Select all versioned file entries'), + self.browser.selectVCSEntries) + menu.addAction(self.tr('Select all local directory entries'), + self.browser.selectLocalDirEntries) + menu.addAction(self.tr('Select all versioned directory entries'), + self.browser.selectVCSDirEntries) + menu.addSeparator() + menu.addAction(self.tr("Configure..."), self.__GitConfigure) + + mainMenu.addSeparator() + mainMenu.addMenu(menu) + self.menuBack = menu + + def _addVCSMenuDir(self, mainMenu): + """ + Protected method used to add the VCS menu to all project browsers. + + @param mainMenu reference to the menu to be amended + """ + if mainMenu is None: + return + + self.vcsDirMenuActions = [] + self.vcsAddDirMenuActions = [] + + menu = QMenu(self.tr("Version Control")) + + act = menu.addAction( + UI.PixmapCache.getIcon( + os.path.join("VcsPlugins", "vcsGit", "icons", "git.png")), + self.vcs.vcsName(), self._VCSInfoDisplay) + font = act.font() + font.setBold(True) + act.setFont(font) + menu.addSeparator() + + act = menu.addAction( + UI.PixmapCache.getIcon("vcsCommit.png"), + self.tr('Commit changes to repository...'), + self._VCSCommit) + self.vcsDirMenuActions.append(act) + menu.addSeparator() + act = menu.addAction( + UI.PixmapCache.getIcon("vcsAdd.png"), + self.tr('Add/Stage to repository'), self._VCSAdd) + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRevert.png"), + self.tr('Unstage changes'), + self.__GitUnstage) + self.vcsDirMenuActions.append(act) + menu.addSeparator() + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRemove.png"), + self.tr('Remove from repository (and disk)'), + self._VCSRemove) + self.vcsDirMenuActions.append(act) + menu.addSeparator() + act = menu.addAction(self.tr('Copy'), self.__GitCopy) + self.vcsDirMenuActions.append(act) + act = menu.addAction(self.tr('Move'), self.__GitMove) + self.vcsDirMenuActions.append(act) + menu.addSeparator() + act = menu.addAction( + UI.PixmapCache.getIcon("vcsLog.png"), + self.tr('Show log browser'), self._VCSLogBrowser) + self.vcsDirMenuActions.append(act) + menu.addSeparator() + act = menu.addAction( + UI.PixmapCache.getIcon("vcsStatus.png"), + self.tr('Show status'), self._VCSStatus) + self.vcsDirMenuActions.append(act) + menu.addSeparator() + act = menu.addAction( + UI.PixmapCache.getIcon("vcsDiff.png"), + self.tr('Show differences'), self._VCSDiff) + self.vcsDirMenuActions.append(act) + act = menu.addAction( + UI.PixmapCache.getIcon("vcsDiff.png"), + self.tr('Show differences (extended)'), + self.__GitExtendedDiff) + self.vcsDirMenuActions.append(act) + menu.addSeparator() + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRevert.png"), + self.tr('Revert changes'), self.__GitRevert) + self.vcsDirMenuActions.append(act) + menu.addSeparator() + + menu.addSeparator() + menu.addAction(self.tr('Select all local file entries'), + self.browser.selectLocalEntries) + menu.addAction(self.tr('Select all versioned file entries'), + self.browser.selectVCSEntries) + menu.addAction(self.tr('Select all local directory entries'), + self.browser.selectLocalDirEntries) + menu.addAction(self.tr('Select all versioned directory entries'), + self.browser.selectVCSDirEntries) + menu.addSeparator() + menu.addAction(self.tr("Configure..."), self.__GitConfigure) + + mainMenu.addSeparator() + mainMenu.addMenu(menu) + self.menuDir = menu + + def _addVCSMenuDirMulti(self, mainMenu): + """ + Protected method used to add the VCS menu to all project browsers. + + @param mainMenu reference to the menu to be amended + """ + if mainMenu is None: + return + + self.vcsDirMultiMenuActions = [] + + menu = QMenu(self.tr("Version Control")) + + act = menu.addAction( + UI.PixmapCache.getIcon( + os.path.join("VcsPlugins", "vcsGit", "icons", "git.png")), + self.vcs.vcsName(), self._VCSInfoDisplay) + font = act.font() + font.setBold(True) + act.setFont(font) + menu.addSeparator() + + act = menu.addAction( + UI.PixmapCache.getIcon("vcsCommit.png"), + self.tr('Commit changes to repository...'), + self._VCSCommit) + self.vcsDirMultiMenuActions.append(act) + menu.addSeparator() + act = menu.addAction( + UI.PixmapCache.getIcon("vcsAdd.png"), + self.tr('Add/Stage to repository'), self._VCSAdd) + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRevert.png"), + self.tr('Unstage changes'), + self.__GitUnstage) + self.vcsDirMultiMenuActions.append(act) + menu.addSeparator() + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRemove.png"), + self.tr('Remove from repository (and disk)'), + self._VCSRemove) + self.vcsDirMultiMenuActions.append(act) + menu.addSeparator() + act = menu.addAction( + UI.PixmapCache.getIcon("vcsStatus.png"), + self.tr('Show status'), self._VCSStatus) + self.vcsDirMultiMenuActions.append(act) + menu.addSeparator() + act = menu.addAction( + UI.PixmapCache.getIcon("vcsDiff.png"), + self.tr('Show differences'), self._VCSDiff) + self.vcsDirMultiMenuActions.append(act) + act = menu.addAction( + UI.PixmapCache.getIcon("vcsDiff.png"), + self.tr('Show differences (extended)'), + self.__GitExtendedDiff) + self.vcsDirMultiMenuActions.append(act) + menu.addSeparator() + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRevert.png"), + self.tr('Revert changes'), self.__GitRevert) + self.vcsDirMultiMenuActions.append(act) + menu.addSeparator() + + menu.addSeparator() + menu.addAction(self.tr('Select all local file entries'), + self.browser.selectLocalEntries) + menu.addAction(self.tr('Select all versioned file entries'), + self.browser.selectVCSEntries) + menu.addAction(self.tr('Select all local directory entries'), + self.browser.selectLocalDirEntries) + menu.addAction(self.tr('Select all versioned directory entries'), + self.browser.selectVCSDirEntries) + menu.addSeparator() + menu.addAction(self.tr("Configure..."), self.__GitConfigure) + + mainMenu.addSeparator() + mainMenu.addMenu(menu) + self.menuDirMulti = menu + + def __GitConfigure(self): + """ + Private method to open the configuration dialog. + """ + e5App().getObject("UserInterface")\ + .showPreferences("zzz_gitPage") + + def __GitForget(self): + """ + Private slot called by the context menu to remove the selected file + from the Git repository leaving a copy in the project directory. + """ + from UI.DeleteFilesConfirmationDialog import \ + DeleteFilesConfirmationDialog + if self.isTranslationsBrowser: + items = self.browser.getSelectedItems([ProjectBrowserFileItem]) + names = [itm.fileName() for itm in items] + + dlg = DeleteFilesConfirmationDialog( + self.parent(), + self.tr("Remove from repository only"), + self.tr( + "Do you really want to remove these files" + " from the repository?"), + names) + else: + items = self.browser.getSelectedItems() + names = [itm.fileName() for itm in items] + files = [self.browser.project.getRelativePath(name) + for name in names] + + dlg = DeleteFilesConfirmationDialog( + self.parent(), + self.tr("Remove from repository only"), + self.tr( + "Do you really want to remove these files" + " from the repository?"), + files) + + if dlg.exec_() == QDialog.Accepted: + self.vcs.vcsRemove(names, stageOnly=True) + + for fn in names: + self._updateVCSStatus(fn) + + def __GitCopy(self): + """ + Private slot called by the context menu to copy the selected file. + """ + itm = self.browser.currentItem() + try: + fn = itm.fileName() + except AttributeError: + fn = itm.dirName() + self.vcs.gitCopy(fn, self.project) + + def __GitMove(self): + """ + Private slot called by the context menu to move the selected file. + """ + itm = self.browser.currentItem() + try: + fn = itm.fileName() + except AttributeError: + fn = itm.dirName() + isFile = os.path.isfile(fn) + movefiles = self.browser.project.getFiles(fn) + if self.vcs.vcsMove(fn, self.project): + if isFile: + self.browser.closeSourceWindow.emit(fn) + else: + for mf in movefiles: + self.browser.closeSourceWindow.emit(mf) + + def __GitExtendedDiff(self): + """ + Private slot called by the context menu to show the difference of a + file to the repository. + + This gives the chance to enter the revisions to compare. + """ + names = [] + for itm in self.browser.getSelectedItems(): + try: + names.append(itm.fileName()) + except AttributeError: + names.append(itm.dirName()) + self.vcs.gitExtendedDiff(names) + + def __GitSbsDiff(self): + """ + Private slot called by the context menu to show the difference of a + file to the repository side-by-side. + """ + itm = self.browser.currentItem() + fn = itm.fileName() + self.vcs.gitSbsDiff(fn) + + def __GitSbsExtendedDiff(self): + """ + Private slot called by the context menu to show the difference of a + file to the repository side-by-side. + + It allows the selection of revisions to compare. + """ + itm = self.browser.currentItem() + fn = itm.fileName() + self.vcs.gitSbsDiff(fn, extended=True) + + def __GitUnstage(self): + """ + Private slot to unstage changes. + """ + names = [] + for itm in self.browser.getSelectedItems(): + try: + name = itm.fileName() + except AttributeError: + name = itm.dirName() + names.append(name) + self.vcs.gitUnstage(names) + + def __GitRevert(self): + """ + Private slot to revert changes of the working area. + """ + names = [] + for itm in self.browser.getSelectedItems(): + try: + name = itm.fileName() + except AttributeError: + name = itm.dirName() + names.append(name) + self.vcs.gitRevert(names) + + def __GitBlame(self): + """ + Private slot called by the context menu to show the annotations of a + file. + """ + itm = self.browser.currentItem() + fn = itm.fileName() + self.vcs.gitBlame(fn)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/ProjectHelper.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,2341 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the VCS project helper for Git. +""" + +from __future__ import unicode_literals + +import os + +from PyQt5.QtCore import QFileInfo +from PyQt5.QtWidgets import QMenu, QInputDialog, QToolBar + +from E5Gui import E5MessageBox +from E5Gui.E5Application import e5App + +from VCS.ProjectHelper import VcsProjectHelper + +from E5Gui.E5Action import E5Action + +import UI.PixmapCache + + +class GitProjectHelper(VcsProjectHelper): + """ + Class implementing the VCS project helper for Git. + """ + def __init__(self, vcsObject, projectObject, parent=None, name=None): + """ + Constructor + + @param vcsObject reference to the vcs object + @param projectObject reference to the project object + @param parent parent widget (QWidget) + @param name name of this object (string) + """ + VcsProjectHelper.__init__(self, vcsObject, projectObject, parent, name) + + def setObjects(self, vcsObject, projectObject): + """ + Public method to set references to the vcs and project objects. + + @param vcsObject reference to the vcs object + @param projectObject reference to the project object + """ + self.vcs = vcsObject + self.project = projectObject + + def getProject(self): + """ + Public method to get a reference to the project object. + + @return reference to the project object (Project) + """ + return self.project + + def getActions(self): + """ + Public method to get a list of all actions. + + @return list of all actions (list of E5Action) + """ + actions = self.actions[:] + return actions + + def initActions(self): + """ + Public method to generate the action objects. + """ + self.vcsNewAct = E5Action( + self.tr('New from repository'), + UI.PixmapCache.getIcon("vcsCheckout.png"), + self.tr('&New from repository...'), 0, 0, + self, 'git_new') + self.vcsNewAct.setStatusTip(self.tr( + 'Create (clone) a new project from a Git repository' + )) + self.vcsNewAct.setWhatsThis(self.tr( + """<b>New from repository</b>""" + """<p>This creates (clones) a new local project from """ + """a Git repository.</p>""" + )) + self.vcsNewAct.triggered.connect(self._vcsCheckout) + self.actions.append(self.vcsNewAct) + + self.gitFetchAct = E5Action( + self.tr('Fetch changes'), + UI.PixmapCache.getIcon("vcsUpdate.png"), + self.tr('Fetch changes'), + 0, 0, self, 'git_fetch') + self.gitFetchAct.setStatusTip(self.tr( + 'Fetch changes from a remote repository' + )) + self.gitFetchAct.setWhatsThis(self.tr( + """<b>Fetch changes</b>""" + """<p>This fetches changes from a remote repository into the """ + """local repository.</p>""" + )) + self.gitFetchAct.triggered.connect(self.__gitFetch) + self.actions.append(self.gitFetchAct) + + self.gitPullAct = E5Action( + self.tr('Pull changes'), + UI.PixmapCache.getIcon("vcsUpdate.png"), + self.tr('Pull changes'), + 0, 0, self, 'git_pull') + self.gitPullAct.setStatusTip(self.tr( + 'Pull changes from a remote repository and update the work area' + )) + self.gitPullAct.setWhatsThis(self.tr( + """<b>Pull changes</b>""" + """<p>This pulls changes from a remote repository into the """ + """local repository and updates the work area.</p>""" + )) + self.gitPullAct.triggered.connect(self.__gitPull) + self.actions.append(self.gitPullAct) + + self.vcsCommitAct = E5Action( + self.tr('Commit changes to repository'), + UI.PixmapCache.getIcon("vcsCommit.png"), + self.tr('Commit changes to repository...'), 0, 0, self, + 'git_commit') + self.vcsCommitAct.setStatusTip(self.tr( + 'Commit changes of the local project to the Git repository' + )) + self.vcsCommitAct.setWhatsThis(self.tr( + """<b>Commit changes to repository</b>""" + """<p>This commits changes of the local project to the """ + """Git repository.</p>""" + )) + self.vcsCommitAct.triggered.connect(self._vcsCommit) + self.actions.append(self.vcsCommitAct) + + self.gitPushAct = E5Action( + self.tr('Push changes'), + UI.PixmapCache.getIcon("vcsCommit.png"), + self.tr('Push changes'), + 0, 0, self, 'git_push') + self.gitPushAct.setStatusTip(self.tr( + 'Push changes to a remote repository' + )) + self.gitPushAct.setWhatsThis(self.tr( + """<b>Push changes</b>""" + """<p>This pushes changes from the local repository to a """ + """remote repository.</p>""" + )) + self.gitPushAct.triggered.connect(self.__gitPush) + self.actions.append(self.gitPushAct) + + self.vcsExportAct = E5Action( + self.tr('Export from repository'), + UI.PixmapCache.getIcon("vcsExport.png"), + self.tr('&Export from repository...'), + 0, 0, self, 'git_export_repo') + self.vcsExportAct.setStatusTip(self.tr( + 'Export a project from the repository' + )) + self.vcsExportAct.setWhatsThis(self.tr( + """<b>Export from repository</b>""" + """<p>This exports a project from the repository.</p>""" + )) + self.vcsExportAct.triggered.connect(self._vcsExport) + self.actions.append(self.vcsExportAct) + + self.gitLogBrowserAct = E5Action( + self.tr('Show log browser'), + UI.PixmapCache.getIcon("vcsLog.png"), + self.tr('Show log browser'), + 0, 0, self, 'git_log_browser') + self.gitLogBrowserAct.setStatusTip(self.tr( + 'Show a dialog to browse the log of the local project' + )) + self.gitLogBrowserAct.setWhatsThis(self.tr( + """<b>Show log browser</b>""" + """<p>This shows a dialog to browse the log of the local""" + """ project. A limited number of entries is shown first.""" + """ More can be retrieved later on.</p>""" + )) + self.gitLogBrowserAct.triggered.connect(self._vcsLogBrowser) + self.actions.append(self.gitLogBrowserAct) + + self.gitReflogBrowserAct = E5Action( + self.tr('Show reflog browser'), + UI.PixmapCache.getIcon("vcsLog.png"), + self.tr('Show reflog browser'), + 0, 0, self, 'git_reflog_browser') + self.gitReflogBrowserAct.setStatusTip(self.tr( + 'Show a dialog to browse the reflog of the local project' + )) + self.gitReflogBrowserAct.setWhatsThis(self.tr( + """<b>Show reflog browser</b>""" + """<p>This shows a dialog to browse the reflog of the local""" + """ project. A limited number of entries is shown first.""" + """ More can be retrieved later on.</p>""" + )) + self.gitReflogBrowserAct.triggered.connect(self.__gitReflogBrowser) + self.actions.append(self.gitReflogBrowserAct) + + self.vcsDiffAct = E5Action( + self.tr('Show differences'), + UI.PixmapCache.getIcon("vcsDiff.png"), + self.tr('Show &differences...'), + 0, 0, self, 'git_diff') + self.vcsDiffAct.setStatusTip(self.tr( + 'Show the differences of the local project to the repository' + )) + self.vcsDiffAct.setWhatsThis(self.tr( + """<b>Show differences</b>""" + """<p>This shows differences of the local project to the""" + """ repository.</p>""" + )) + self.vcsDiffAct.triggered.connect(self._vcsDiff) + self.actions.append(self.vcsDiffAct) + + self.gitExtDiffAct = E5Action( + self.tr('Show differences (extended)'), + UI.PixmapCache.getIcon("vcsDiff.png"), + self.tr('Show differences (extended) ...'), + 0, 0, self, 'git_extendeddiff') + self.gitExtDiffAct.setStatusTip(self.tr( + 'Show the difference of revisions of the project to the repository' + )) + self.gitExtDiffAct.setWhatsThis(self.tr( + """<b>Show differences (extended)</b>""" + """<p>This shows differences of selectable revisions of the""" + """ project.</p>""" + )) + self.gitExtDiffAct.triggered.connect(self.__gitExtendedDiff) + self.actions.append(self.gitExtDiffAct) + + self.vcsStatusAct = E5Action( + self.tr('Show status'), + UI.PixmapCache.getIcon("vcsStatus.png"), + self.tr('Show &status...'), + 0, 0, self, 'git_status') + self.vcsStatusAct.setStatusTip(self.tr( + 'Show the status of the local project' + )) + self.vcsStatusAct.setWhatsThis(self.tr( + """<b>Show status</b>""" + """<p>This shows the status of the local project.</p>""" + )) + self.vcsStatusAct.triggered.connect(self._vcsStatus) + self.actions.append(self.vcsStatusAct) + + self.vcsSwitchAct = E5Action( + self.tr('Switch'), + UI.PixmapCache.getIcon("vcsSwitch.png"), + self.tr('S&witch...'), + 0, 0, self, 'git_switch') + self.vcsSwitchAct.setStatusTip(self.tr( + 'Switch the working directory to another revision' + )) + self.vcsSwitchAct.setWhatsThis(self.tr( + """<b>Switch</b>""" + """<p>This switches the working directory to another""" + """ revision.</p>""" + )) + self.vcsSwitchAct.triggered.connect(self._vcsSwitch) + self.actions.append(self.vcsSwitchAct) + + self.vcsTagAct = E5Action( + self.tr('Tag in repository'), + UI.PixmapCache.getIcon("vcsTag.png"), + self.tr('&Tag in repository...'), + 0, 0, self, 'git_tag') + self.vcsTagAct.setStatusTip(self.tr( + 'Perform tag operations for the local project' + )) + self.vcsTagAct.setWhatsThis(self.tr( + """<b>Tag in repository</b>""" + """<p>This performs selectable tag operations for the local""" + """ project.</p>""" + )) + self.vcsTagAct.triggered.connect(self._vcsTag) + self.actions.append(self.vcsTagAct) + + self.gitTagListAct = E5Action( + self.tr('List tags'), + self.tr('&List tags...'), + 0, 0, self, 'git_list_tags') + self.gitTagListAct.setStatusTip(self.tr( + 'List tags of the project' + )) + self.gitTagListAct.setWhatsThis(self.tr( + """<b>List tags</b>""" + """<p>This lists the tags of the project.</p>""" + )) + self.gitTagListAct.triggered.connect(self.__gitTagList) + self.actions.append(self.gitTagListAct) + + self.gitDescribeTagAct = E5Action( + self.tr('Show most recent tag'), + self.tr('Show most recent tag'), + 0, 0, self, 'git_describe_tag') + self.gitDescribeTagAct.setStatusTip(self.tr( + 'Show the most recent tag reachable from the work tree' + )) + self.gitDescribeTagAct.setWhatsThis(self.tr( + """<b>Show most recent tag</b>""" + """<p>This shows the most recent tag reachable from the work""" + """ tree.</p>""" + )) + self.gitDescribeTagAct.triggered.connect(self.__gitDescribeTag) + self.actions.append(self.gitDescribeTagAct) + + self.gitBranchListAct = E5Action( + self.tr('List branches'), + self.tr('&List branches...'), + 0, 0, self, 'git_list_branches') + self.gitBranchListAct.setStatusTip(self.tr( + 'List branches of the project' + )) + self.gitBranchListAct.setWhatsThis(self.tr( + """<b>List branches</b>""" + """<p>This lists the branches of the project.</p>""" + )) + self.gitBranchListAct.triggered.connect(self.__gitBranchList) + self.actions.append(self.gitBranchListAct) + + self.gitMergedBranchListAct = E5Action( + self.tr('List merged branches'), + self.tr('List &merged branches...'), + 0, 0, self, 'git_list_merged_branches') + self.gitMergedBranchListAct.setStatusTip(self.tr( + 'List merged branches of the project' + )) + self.gitMergedBranchListAct.setWhatsThis(self.tr( + """<b>List merged branches</b>""" + """<p>This lists the merged branches of the project.</p>""" + )) + self.gitMergedBranchListAct.triggered.connect( + self.__gitMergedBranchList) + self.actions.append(self.gitMergedBranchListAct) + + self.gitNotMergedBranchListAct = E5Action( + self.tr('List non-merged branches'), + self.tr('List &non-merged branches...'), + 0, 0, self, 'git_list_non_merged_branches') + self.gitNotMergedBranchListAct.setStatusTip(self.tr( + 'List non-merged branches of the project' + )) + self.gitNotMergedBranchListAct.setWhatsThis(self.tr( + """<b>List non-merged branches</b>""" + """<p>This lists the non-merged branches of the project.</p>""" + )) + self.gitNotMergedBranchListAct.triggered.connect( + self.__gitNotMergedBranchList) + self.actions.append(self.gitNotMergedBranchListAct) + + self.gitBranchAct = E5Action( + self.tr('Branch in repository'), + UI.PixmapCache.getIcon("vcsBranch.png"), + self.tr('&Branch in repository...'), + 0, 0, self, 'git_branch') + self.gitBranchAct.setStatusTip(self.tr( + 'Perform branch operations for the local project' + )) + self.gitBranchAct.setWhatsThis(self.tr( + """<b>Branch in repository</b>""" + """<p>This performs selectable branch operations for the local""" + """ project.</p>""" + )) + self.gitBranchAct.triggered.connect(self.__gitBranch) + self.actions.append(self.gitBranchAct) + + self.gitDeleteRemoteBranchAct = E5Action( + self.tr('Delete Remote Branch'), + self.tr('&Delete Remote Branch...'), + 0, 0, self, 'git_delete_remote_branch') + self.gitDeleteRemoteBranchAct.setStatusTip(self.tr( + 'Delete a branch from a remote repository' + )) + self.gitDeleteRemoteBranchAct.setWhatsThis(self.tr( + """<b>Delete Remote Branch</b>""" + """<p>This deletes a branch from a remote repository.</p>""" + )) + self.gitDeleteRemoteBranchAct.triggered.connect(self.__gitDeleteBranch) + self.actions.append(self.gitDeleteRemoteBranchAct) + + self.gitShowBranchAct = E5Action( + self.tr('Show current branch'), + self.tr('Show current branch'), + 0, 0, self, 'git_show_branch') + self.gitShowBranchAct.setStatusTip(self.tr( + 'Show the current branch of the project' + )) + self.gitShowBranchAct.setWhatsThis(self.tr( + """<b>Show current branch</b>""" + """<p>This shows the current branch of the project.</p>""" + )) + self.gitShowBranchAct.triggered.connect(self.__gitShowBranch) + self.actions.append(self.gitShowBranchAct) + + self.vcsRevertAct = E5Action( + self.tr('Revert changes'), + UI.PixmapCache.getIcon("vcsRevert.png"), + self.tr('Re&vert changes'), + 0, 0, self, 'git_revert') + self.vcsRevertAct.setStatusTip(self.tr( + 'Revert all changes made to the local project' + )) + self.vcsRevertAct.setWhatsThis(self.tr( + """<b>Revert changes</b>""" + """<p>This reverts all changes made to the local project.</p>""" + )) + self.vcsRevertAct.triggered.connect(self.__gitRevert) + self.actions.append(self.vcsRevertAct) + + self.gitUnstageAct = E5Action( + self.tr('Unstage changes'), + UI.PixmapCache.getIcon("vcsRevert.png"), + self.tr('&Unstage changes'), + 0, 0, self, 'git_revert') + self.gitUnstageAct.setStatusTip(self.tr( + 'Unstage all changes made to the local project' + )) + self.gitUnstageAct.setWhatsThis(self.tr( + """<b>Unstage changes</b>""" + """<p>This unstages all changes made to the local project.</p>""" + )) + self.gitUnstageAct.triggered.connect(self.__gitUnstage) + self.actions.append(self.gitUnstageAct) + + self.vcsMergeAct = E5Action( + self.tr('Merge'), + UI.PixmapCache.getIcon("vcsMerge.png"), + self.tr('Mer&ge changes...'), + 0, 0, self, 'git_merge') + self.vcsMergeAct.setStatusTip(self.tr( + 'Merge changes into the local project' + )) + self.vcsMergeAct.setWhatsThis(self.tr( + """<b>Merge</b>""" + """<p>This merges changes into the local project.</p>""" + )) + self.vcsMergeAct.triggered.connect(self._vcsMerge) + self.actions.append(self.vcsMergeAct) + + self.gitCancelMergeAct = E5Action( + self.tr('Cancel uncommitted/failed merge'), + self.tr('Cancel uncommitted/failed merge'), + 0, 0, self, 'git_cancel_merge') + self.gitCancelMergeAct.setStatusTip(self.tr( + 'Cancel an uncommitted or failed merge and lose all changes' + )) + self.gitCancelMergeAct.setWhatsThis(self.tr( + """<b>Cancel uncommitted/failed merge</b>""" + """<p>This cancels an uncommitted or failed merge causing all""" + """ changes to be lost.</p>""" + )) + self.gitCancelMergeAct.triggered.connect(self.__gitCancelMerge) + self.actions.append(self.gitCancelMergeAct) + + self.gitCommitMergeAct = E5Action( + self.tr('Commit failed merge'), + self.tr('Commit failed merge'), + 0, 0, self, 'git_commit_merge') + self.gitCommitMergeAct.setStatusTip(self.tr( + 'Commit a failed merge after conflicts have been resolved' + )) + self.gitCommitMergeAct.setWhatsThis(self.tr( + """<b>Commit failed merge</b>""" + """<p>This commits a failed merge after conflicts have been""" + """ resolved.</p>""" + )) + self.gitCommitMergeAct.triggered.connect(self.__gitCommitMerge) + self.actions.append(self.gitCommitMergeAct) + + self.vcsCleanupAct = E5Action( + self.tr('Cleanup'), + self.tr('Cleanu&p'), + 0, 0, self, 'git_cleanup') + self.vcsCleanupAct.setStatusTip(self.tr( + 'Cleanup the local project' + )) + self.vcsCleanupAct.setWhatsThis(self.tr( + """<b>Cleanup</b>""" + """<p>This performs a cleanup of the local project.</p>""" + )) + self.vcsCleanupAct.triggered.connect(self._vcsCleanup) + self.actions.append(self.vcsCleanupAct) + + self.vcsCommandAct = E5Action( + self.tr('Execute command'), + self.tr('E&xecute command...'), + 0, 0, self, 'git_command') + self.vcsCommandAct.setStatusTip(self.tr( + 'Execute an arbitrary Git command' + )) + self.vcsCommandAct.setWhatsThis(self.tr( + """<b>Execute command</b>""" + """<p>This opens a dialog to enter an arbitrary Git""" + """ command.</p>""" + )) + self.vcsCommandAct.triggered.connect(self._vcsCommand) + self.actions.append(self.vcsCommandAct) + + self.gitConfigAct = E5Action( + self.tr('Configure'), + self.tr('Configure...'), + 0, 0, self, 'git_configure') + self.gitConfigAct.setStatusTip(self.tr( + 'Show the configuration dialog with the Git page selected' + )) + self.gitConfigAct.setWhatsThis(self.tr( + """<b>Configure</b>""" + """<p>Show the configuration dialog with the Git page""" + """ selected.</p>""" + )) + self.gitConfigAct.triggered.connect(self.__gitConfigure) + self.actions.append(self.gitConfigAct) + + self.gitRemotesShowAct = E5Action( + self.tr('Show Remotes'), + self.tr('Show Remotes...'), + 0, 0, self, 'git_show_remotes') + self.gitRemotesShowAct.setStatusTip(self.tr( + 'Show the available remote repositories' + )) + self.gitRemotesShowAct.setWhatsThis(self.tr( + """<b>Show Remotes</b>""" + """<p>This shows the remote repositories available for""" + """ pulling, fetching and pushing.</p>""" + )) + self.gitRemotesShowAct.triggered.connect(self.__gitShowRemotes) + self.actions.append(self.gitRemotesShowAct) + + self.gitRemoteShowAct = E5Action( + self.tr('Show Remote Info'), + self.tr('Show Remote Info...'), + 0, 0, self, 'git_show_remote_info') + self.gitRemoteShowAct.setStatusTip(self.tr( + 'Show information about a remote repository' + )) + self.gitRemoteShowAct.setWhatsThis(self.tr( + """<b>Show Remotes</b>""" + """<p>This shows the remote repositories available for""" + """ pulling, fetching and pushing.</p>""" + )) + self.gitRemoteShowAct.triggered.connect(self.__gitShowRemote) + self.actions.append(self.gitRemoteShowAct) + + self.gitRemoteAddAct = E5Action( + self.tr('Add'), + self.tr('Add...'), + 0, 0, self, 'git_add_remote') + self.gitRemoteAddAct.setStatusTip(self.tr( + 'Add a remote repository' + )) + self.gitRemoteAddAct.setWhatsThis(self.tr( + """<b>Add</b>""" + """<p>This adds a remote repository.</p>""" + )) + self.gitRemoteAddAct.triggered.connect(self.__gitAddRemote) + self.actions.append(self.gitRemoteAddAct) + + self.gitRemoteRemoveAct = E5Action( + self.tr('Remove'), + self.tr('Remove...'), + 0, 0, self, 'git_remove_remote') + self.gitRemoteRemoveAct.setStatusTip(self.tr( + 'Remove a remote repository' + )) + self.gitRemoteRemoveAct.setWhatsThis(self.tr( + """<b>Remove</b>""" + """<p>This removes a remote repository.</p>""" + )) + self.gitRemoteRemoveAct.triggered.connect(self.__gitRemoveRemote) + self.actions.append(self.gitRemoteRemoveAct) + + self.gitRemotePruneAct = E5Action( + self.tr('Prune'), + self.tr('Prune...'), + 0, 0, self, 'git_prune_remote') + self.gitRemotePruneAct.setStatusTip(self.tr( + 'Prune stale remote-tracking branches of a remote repository' + )) + self.gitRemotePruneAct.setWhatsThis(self.tr( + """<b>Prune</b>""" + """<p>This prunes stale remote-tracking branches of a remote""" + """ repository.</p>""" + )) + self.gitRemotePruneAct.triggered.connect(self.__gitPruneRemote) + self.actions.append(self.gitRemotePruneAct) + + self.gitRemoteRenameAct = E5Action( + self.tr('Rename'), + self.tr('Rename...'), + 0, 0, self, 'git_rename_remote') + self.gitRemoteRenameAct.setStatusTip(self.tr( + 'Rename a remote repository' + )) + self.gitRemoteRenameAct.setWhatsThis(self.tr( + """<b>Rename</b>""" + """<p>This renames a remote repository.</p>""" + )) + self.gitRemoteRenameAct.triggered.connect(self.__gitRenameRemote) + self.actions.append(self.gitRemoteRenameAct) + + self.gitCherryPickAct = E5Action( + self.tr('Copy Commits'), + UI.PixmapCache.getIcon("vcsGraft.png"), + self.tr('Copy Commits'), + 0, 0, self, 'git_cherrypick') + self.gitCherryPickAct.setStatusTip(self.tr( + 'Copies commits into the current branch' + )) + self.gitCherryPickAct.setWhatsThis(self.tr( + """<b>Copy Commits</b>""" + """<p>This copies commits on top of the current branch.</p>""" + )) + self.gitCherryPickAct.triggered.connect(self.__gitCherryPick) + self.actions.append(self.gitCherryPickAct) + + self.gitCherryPickContinueAct = E5Action( + self.tr('Continue Copying Session'), + self.tr('Continue Copying Session'), + 0, 0, self, 'git_cherrypick_continue') + self.gitCherryPickContinueAct.setStatusTip(self.tr( + 'Continue the last copying session after conflicts were resolved' + )) + self.gitCherryPickContinueAct.setWhatsThis(self.tr( + """<b>Continue Copying Session</b>""" + """<p>This continues the last copying session after conflicts""" + """ were resolved.</p>""" + )) + self.gitCherryPickContinueAct.triggered.connect( + self.__gitCherryPickContinue) + self.actions.append(self.gitCherryPickContinueAct) + + self.gitCherryPickQuitAct = E5Action( + self.tr('Quit Copying Session'), + self.tr('Quit Copying Session'), + 0, 0, self, 'git_cherrypick_quit') + self.gitCherryPickQuitAct.setStatusTip(self.tr( + 'Quit the current copying session' + )) + self.gitCherryPickQuitAct.setWhatsThis(self.tr( + """<b>Quit Copying Session</b>""" + """<p>This quits the current copying session.</p>""" + )) + self.gitCherryPickQuitAct.triggered.connect(self.__gitCherryPickQuit) + self.actions.append(self.gitCherryPickQuitAct) + + self.gitCherryPickAbortAct = E5Action( + self.tr('Cancel Copying Session'), + self.tr('Cancel Copying Session'), + 0, 0, self, 'git_cherrypick_abort') + self.gitCherryPickAbortAct.setStatusTip(self.tr( + 'Cancel the current copying session and return to the' + ' previous state' + )) + self.gitCherryPickAbortAct.setWhatsThis(self.tr( + """<b>Cancel Copying Session</b>""" + """<p>This cancels the current copying session and returns to""" + """ the previous state.</p>""" + )) + self.gitCherryPickAbortAct.triggered.connect(self.__gitCherryPickAbort) + self.actions.append(self.gitCherryPickAbortAct) + + self.gitStashAct = E5Action( + self.tr('Stash changes'), + self.tr('Stash changes...'), + 0, 0, self, 'git_stash') + self.gitStashAct.setStatusTip(self.tr( + 'Stash all current changes of the project' + )) + self.gitStashAct.setWhatsThis(self.tr( + """<b>Stash changes</b>""" + """<p>This stashes all current changes of the project.</p>""" + )) + self.gitStashAct.triggered.connect(self.__gitStashSave) + self.actions.append(self.gitStashAct) + + self.gitStashBrowserAct = E5Action( + self.tr('Show stash browser'), + self.tr('Show stash browser...'), + 0, 0, self, 'git_stash_browser') + self.gitStashBrowserAct.setStatusTip(self.tr( + 'Show a dialog with all stashes' + )) + self.gitStashBrowserAct.setWhatsThis(self.tr( + """<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>""" + )) + self.gitStashBrowserAct.triggered.connect(self.__gitStashBrowser) + self.actions.append(self.gitStashBrowserAct) + + self.gitStashShowAct = E5Action( + self.tr('Show stash'), + self.tr('Show stash...'), + 0, 0, self, 'git_stash_show') + self.gitStashShowAct.setStatusTip(self.tr( + 'Show a dialog with a patch of a stash' + )) + self.gitStashShowAct.setWhatsThis(self.tr( + """<b>Show stash...</b>""" + """<p>This shows a dialog with a patch of a selectable""" + """ stash.</p>""" + )) + self.gitStashShowAct.triggered.connect(self.__gitStashShow) + self.actions.append(self.gitStashShowAct) + + self.gitStashApplyAct = E5Action( + self.tr('Restore && Keep'), + self.tr('Restore && Keep'), + 0, 0, self, 'git_stash_apply') + self.gitStashApplyAct.setStatusTip(self.tr( + 'Restore a stash but keep it' + )) + self.gitStashApplyAct.setWhatsThis(self.tr( + """<b>Restore & Keep</b>""" + """<p>This restores a selectable stash and keeps it.</p>""" + )) + self.gitStashApplyAct.triggered.connect(self.__gitStashApply) + self.actions.append(self.gitStashApplyAct) + + self.gitStashPopAct = E5Action( + self.tr('Restore && Delete'), + self.tr('Restore && Delete'), + 0, 0, self, 'git_stash_pop') + self.gitStashPopAct.setStatusTip(self.tr( + 'Restore a stash and delete it' + )) + self.gitStashPopAct.setWhatsThis(self.tr( + """<b>Restore & Delete</b>""" + """<p>This restores a selectable stash and deletes it.</p>""" + )) + self.gitStashPopAct.triggered.connect(self.__gitStashPop) + self.actions.append(self.gitStashPopAct) + + self.gitStashBranchAct = E5Action( + self.tr('Create Branch'), + self.tr('Create Branch'), + 0, 0, self, 'git_stash_branch') + self.gitStashBranchAct.setStatusTip(self.tr( + 'Create a new branch and restore a stash into it' + )) + self.gitStashBranchAct.setWhatsThis(self.tr( + """<b>Create Branch</b>""" + """<p>This creates a new branch and restores a stash into""" + """ it.</p>""" + )) + self.gitStashBranchAct.triggered.connect(self.__gitStashBranch) + self.actions.append(self.gitStashBranchAct) + + self.gitStashDropAct = E5Action( + self.tr('Delete'), + self.tr('Delete'), + 0, 0, self, 'git_stash_delete') + self.gitStashDropAct.setStatusTip(self.tr( + 'Delete a stash' + )) + self.gitStashDropAct.setWhatsThis(self.tr( + """<b>Delete</b>""" + """<p>This deletes a stash.</p>""" + )) + self.gitStashDropAct.triggered.connect(self.__gitStashDrop) + self.actions.append(self.gitStashDropAct) + + self.gitStashClearAct = E5Action( + self.tr('Delete All'), + self.tr('Delete All'), + 0, 0, self, 'git_stash_delete_all') + self.gitStashClearAct.setStatusTip(self.tr( + 'Delete all stashes' + )) + self.gitStashClearAct.setWhatsThis(self.tr( + """<b>Delete All</b>""" + """<p>This deletes all stashes.</p>""" + )) + self.gitStashClearAct.triggered.connect(self.__gitStashClear) + self.actions.append(self.gitStashClearAct) + + self.gitEditUserConfigAct = E5Action( + self.tr('Edit user configuration'), + self.tr('Edit user configuration...'), + 0, 0, self, 'git_user_configure') + self.gitEditUserConfigAct.setStatusTip(self.tr( + 'Show an editor to edit the user configuration file' + )) + self.gitEditUserConfigAct.setWhatsThis(self.tr( + """<b>Edit user configuration</b>""" + """<p>Show an editor to edit the user configuration file.</p>""" + )) + self.gitEditUserConfigAct.triggered.connect(self.__gitEditUserConfig) + self.actions.append(self.gitEditUserConfigAct) + + self.gitRepoConfigAct = E5Action( + self.tr('Edit repository configuration'), + self.tr('Edit repository configuration...'), + 0, 0, self, 'git_repo_configure') + self.gitRepoConfigAct.setStatusTip(self.tr( + 'Show an editor to edit the repository configuration file' + )) + self.gitRepoConfigAct.setWhatsThis(self.tr( + """<b>Edit repository configuration</b>""" + """<p>Show an editor to edit the repository configuration""" + """ file.</p>""" + )) + self.gitRepoConfigAct.triggered.connect(self.__gitEditRepoConfig) + self.actions.append(self.gitRepoConfigAct) + + self.gitCreateIgnoreAct = E5Action( + self.tr('Create .gitignore'), + self.tr('Create .gitignore'), + 0, 0, self, 'git_create_ignore') + self.gitCreateIgnoreAct.setStatusTip(self.tr( + 'Create a .gitignore file with default values' + )) + self.gitCreateIgnoreAct.setWhatsThis(self.tr( + """<b>Create .gitignore</b>""" + """<p>This creates a .gitignore file with default values.</p>""" + )) + self.gitCreateIgnoreAct.triggered.connect(self.__gitCreateIgnore) + self.actions.append(self.gitCreateIgnoreAct) + + self.gitShowConfigAct = E5Action( + self.tr('Show combined configuration settings'), + self.tr('Show combined configuration settings...'), + 0, 0, self, 'git_show_config') + self.gitShowConfigAct.setStatusTip(self.tr( + 'Show the combined configuration settings from all configuration' + ' files' + )) + self.gitShowConfigAct.setWhatsThis(self.tr( + """<b>Show combined configuration settings</b>""" + """<p>This shows the combined configuration settings""" + """ from all configuration files.</p>""" + )) + self.gitShowConfigAct.triggered.connect(self.__gitShowConfig) + self.actions.append(self.gitShowConfigAct) + + self.gitVerifyAct = E5Action( + self.tr('Verify repository'), + self.tr('Verify repository...'), + 0, 0, self, 'git_verify') + self.gitVerifyAct.setStatusTip(self.tr( + 'Verify the connectivity and validity of objects of the database' + )) + self.gitVerifyAct.setWhatsThis(self.tr( + """<b>Verify repository</b>""" + """<p>This verifies the connectivity and validity of objects""" + """ of the database.</p>""" + )) + self.gitVerifyAct.triggered.connect(self.__gitVerify) + self.actions.append(self.gitVerifyAct) + + self.gitHouseKeepingAct = E5Action( + self.tr('Optimize repository'), + self.tr('Optimize repository...'), + 0, 0, self, 'git_housekeeping') + self.gitHouseKeepingAct.setStatusTip(self.tr( + 'Cleanup and optimize the local repository' + )) + self.gitHouseKeepingAct.setWhatsThis(self.tr( + """<b>Optimize repository</b>""" + """<p>This cleans up and optimizes the local repository.</p>""" + )) + self.gitHouseKeepingAct.triggered.connect(self.__gitHouseKeeping) + self.actions.append(self.gitHouseKeepingAct) + + self.gitStatisticsAct = E5Action( + self.tr('Repository Statistics'), + self.tr('Repository Statistics...'), + 0, 0, self, 'git_statistics') + self.gitStatisticsAct.setStatusTip(self.tr( + 'Show some statistics of the local repository' + )) + self.gitStatisticsAct.setWhatsThis(self.tr( + """<b>Repository Statistics</b>""" + """<p>This show some statistics of the local repository.</p>""" + )) + self.gitStatisticsAct.triggered.connect(self.__gitStatistics) + self.actions.append(self.gitStatisticsAct) + + self.gitCreateArchiveAct = E5Action( + self.tr('Create Archive'), + self.tr('Create Archive'), + 0, 0, self, 'git_create_archive') + self.gitCreateArchiveAct.setStatusTip(self.tr( + 'Create an archive from the local repository' + )) + self.gitCreateArchiveAct.setWhatsThis(self.tr( + """<b>Create Archive</b>""" + """<p>This creates an archive from the local repository.</p>""" + )) + self.gitCreateArchiveAct.triggered.connect(self.__gitCreateArchive) + self.actions.append(self.gitCreateArchiveAct) + + self.gitBundleAct = E5Action( + self.tr('Create bundle'), + self.tr('Create bundle...'), + 0, 0, self, 'mercurial_bundle_create') + self.gitBundleAct.setStatusTip(self.tr( + 'Create bundle file collecting changesets' + )) + self.gitBundleAct.setWhatsThis(self.tr( + """<b>Create bundle</b>""" + """<p>This creates a bundle file collecting selected""" + """ changesets (git bundle create).</p>""" + )) + self.gitBundleAct.triggered.connect(self.__gitBundle) + self.actions.append(self.gitBundleAct) + + self.gitBundleVerifyAct = E5Action( + self.tr('Verify bundle'), + self.tr('Verify bundle...'), + 0, 0, self, 'mercurial_bundle_verify') + self.gitBundleVerifyAct.setStatusTip(self.tr( + 'Verify the validity and applicability of a bundle file' + )) + self.gitBundleVerifyAct.setWhatsThis(self.tr( + """<b>Verify bundle</b>""" + """<p>This verifies that a bundle file is valid and will""" + """ apply cleanly.</p>""" + )) + self.gitBundleVerifyAct.triggered.connect(self.__gitVerifyBundle) + self.actions.append(self.gitBundleVerifyAct) + + self.gitBundleListHeadsAct = E5Action( + self.tr('List bundle heads'), + self.tr('List bundle heads...'), + 0, 0, self, 'mercurial_bundle_list_heads') + self.gitBundleListHeadsAct.setStatusTip(self.tr( + 'List all heads contained in a bundle file' + )) + self.gitBundleListHeadsAct.setWhatsThis(self.tr( + """<b>List bundle heads</b>""" + """<p>This lists all heads contained in a bundle file.</p>""" + )) + self.gitBundleListHeadsAct.triggered.connect(self.__gitBundleListHeads) + self.actions.append(self.gitBundleListHeadsAct) + + self.gitBundleApplyFetchAct = E5Action( + self.tr('Apply Bundle (fetch)'), + self.tr('Apply Bundle (fetch)...'), + 0, 0, self, 'mercurial_bundle_apply_fetch') + self.gitBundleApplyFetchAct.setStatusTip(self.tr( + 'Apply a head of a bundle file using fetch' + )) + self.gitBundleApplyFetchAct.setWhatsThis(self.tr( + """<b>Apply Bundle (fetch)</b>""" + """<p>This applies a head of a bundle file using fetch.</p>""" + )) + self.gitBundleApplyFetchAct.triggered.connect(self.__gitBundleFetch) + self.actions.append(self.gitBundleApplyFetchAct) + + self.gitBundleApplyPullAct = E5Action( + self.tr('Apply Bundle (pull)'), + self.tr('Apply Bundle (pull)...'), + 0, 0, self, 'mercurial_bundle_apply_pull') + self.gitBundleApplyPullAct.setStatusTip(self.tr( + 'Apply a head of a bundle file using pull' + )) + self.gitBundleApplyPullAct.setWhatsThis(self.tr( + """<b>Apply Bundle (pull)</b>""" + """<p>This applies a head of a bundle file using pull.</p>""" + )) + self.gitBundleApplyPullAct.triggered.connect(self.__gitBundlePull) + self.actions.append(self.gitBundleApplyPullAct) + + self.gitBisectStartAct = E5Action( + self.tr('Start'), + self.tr('Start'), + 0, 0, self, 'git_bisect_start') + self.gitBisectStartAct.setStatusTip(self.tr( + 'Start a bisect session' + )) + self.gitBisectStartAct.setWhatsThis(self.tr( + """<b>Start</b>""" + """<p>This starts a bisect session.</p>""" + )) + self.gitBisectStartAct.triggered.connect(self.__gitBisectStart) + self.actions.append(self.gitBisectStartAct) + + self.gitBisectStartExtendedAct = E5Action( + self.tr('Start (Extended)'), + self.tr('Start (Extended)'), + 0, 0, self, 'git_bisect_start_extended') + self.gitBisectStartExtendedAct.setStatusTip(self.tr( + 'Start a bisect session giving a bad and optionally good commits' + )) + self.gitBisectStartExtendedAct.setWhatsThis(self.tr( + """<b>Start (Extended)</b>""" + """<p>This starts a bisect session giving a bad and optionally""" + """ good commits.</p>""" + )) + self.gitBisectStartExtendedAct.triggered.connect( + self.__gitBisectStartExtended) + self.actions.append(self.gitBisectStartExtendedAct) + + self.gitBisectGoodAct = E5Action( + self.tr('Mark as "good"'), + self.tr('Mark as "good"...'), + 0, 0, self, 'git_bisect_good') + self.gitBisectGoodAct.setStatusTip(self.tr( + 'Mark a selectable revision as good' + )) + self.gitBisectGoodAct.setWhatsThis(self.tr( + """<b>Mark as "good"</b>""" + """<p>This marks a selectable revision as good.</p>""" + )) + self.gitBisectGoodAct.triggered.connect(self.__gitBisectGood) + self.actions.append(self.gitBisectGoodAct) + + self.gitBisectBadAct = E5Action( + self.tr('Mark as "bad"'), + self.tr('Mark as "bad"...'), + 0, 0, self, 'git_bisect_bad') + self.gitBisectBadAct.setStatusTip(self.tr( + 'Mark a selectable revision as bad' + )) + self.gitBisectBadAct.setWhatsThis(self.tr( + """<b>Mark as "bad"</b>""" + """<p>This marks a selectable revision as bad.</p>""" + )) + self.gitBisectBadAct.triggered.connect(self.__gitBisectBad) + self.actions.append(self.gitBisectBadAct) + + self.gitBisectSkipAct = E5Action( + self.tr('Skip'), + self.tr('Skip...'), + 0, 0, self, 'git_bisect_skip') + self.gitBisectSkipAct.setStatusTip(self.tr( + 'Skip a selectable revision' + )) + self.gitBisectSkipAct.setWhatsThis(self.tr( + """<b>Skip</b>""" + """<p>This skips a selectable revision.</p>""" + )) + self.gitBisectSkipAct.triggered.connect(self.__gitBisectSkip) + self.actions.append(self.gitBisectSkipAct) + + self.gitBisectResetAct = E5Action( + self.tr('Reset'), + self.tr('Reset...'), + 0, 0, self, 'git_bisect_reset') + self.gitBisectResetAct.setStatusTip(self.tr( + 'Reset the bisect session' + )) + self.gitBisectResetAct.setWhatsThis(self.tr( + """<b>Reset</b>""" + """<p>This resets the bisect session.</p>""" + )) + self.gitBisectResetAct.triggered.connect(self.__gitBisectReset) + self.actions.append(self.gitBisectResetAct) + + self.gitBisectLogBrowserAct = E5Action( + self.tr('Show bisect log browser'), + UI.PixmapCache.getIcon("vcsLog.png"), + self.tr('Show bisect log browser'), + 0, 0, self, 'git_bisect_log_browser') + self.gitBisectLogBrowserAct.setStatusTip(self.tr( + 'Show a dialog to browse the bisect log of the local project' + )) + self.gitBisectLogBrowserAct.setWhatsThis(self.tr( + """<b>Show bisect log browser</b>""" + """<p>This shows a dialog to browse the bisect log of the local""" + """ project.</p>""" + )) + self.gitBisectLogBrowserAct.triggered.connect( + self.__gitBisectLogBrowser) + self.actions.append(self.gitBisectLogBrowserAct) + + self.gitBisectCreateReplayAct = E5Action( + self.tr('Create replay file'), + self.tr('Create replay file'), + 0, 0, self, 'git_bisect_create_replay') + self.gitBisectCreateReplayAct.setStatusTip(self.tr( + 'Create a replay file to repeat the current bisect session' + )) + self.gitBisectCreateReplayAct.setWhatsThis(self.tr( + """<b>Create replay file</b>""" + """<p>This creates a replay file to repeat the current bisect""" + """ session.</p>""" + )) + self.gitBisectCreateReplayAct.triggered.connect( + self.__gitBisectCreateReplay) + self.actions.append(self.gitBisectCreateReplayAct) + + self.gitBisectEditReplayAct = E5Action( + self.tr('Edit replay file'), + self.tr('Edit replay file'), + 0, 0, self, 'git_bisect_edit_replay') + self.gitBisectEditReplayAct.setStatusTip(self.tr( + 'Edit a bisect replay file' + )) + self.gitBisectEditReplayAct.setWhatsThis(self.tr( + """<b>Edit replay file</b>""" + """<p>This edits a bisect replay file.</p>""" + )) + self.gitBisectEditReplayAct.triggered.connect( + self.__gitBisectEditReplay) + self.actions.append(self.gitBisectEditReplayAct) + + self.gitBisectReplayAct = E5Action( + self.tr('Replay session'), + self.tr('Replay session'), + 0, 0, self, 'git_bisect_replay') + self.gitBisectReplayAct.setStatusTip(self.tr( + 'Replay a bisect session from file' + )) + self.gitBisectReplayAct.setWhatsThis(self.tr( + """<b>Replay session</b>""" + """<p>This replays a bisect session from file.</p>""" + )) + self.gitBisectReplayAct.triggered.connect(self.__gitBisectReplay) + self.actions.append(self.gitBisectReplayAct) + + self.gitCheckPatchesAct = E5Action( + self.tr('Check patch files'), + self.tr('Check patch files'), + 0, 0, self, 'git_check_patches') + self.gitCheckPatchesAct.setStatusTip(self.tr( + 'Check a list of patch files, if they would apply cleanly' + )) + self.gitCheckPatchesAct.setWhatsThis(self.tr( + """<b>Check patch files</b>""" + """<p>This checks a list of patch files, if they would apply""" + """ cleanly.</p>""" + )) + self.gitCheckPatchesAct.triggered.connect(self.__gitCheckPatches) + self.actions.append(self.gitCheckPatchesAct) + + self.gitApplyPatchesAct = E5Action( + self.tr('Apply patch files'), + self.tr('Apply patch files'), + 0, 0, self, 'git_apply_patches') + self.gitApplyPatchesAct.setStatusTip(self.tr( + 'Apply a list of patch files' + )) + self.gitApplyPatchesAct.setWhatsThis(self.tr( + """<b>Apply patch files</b>""" + """<p>This applies a list of patch files.</p>""" + )) + self.gitApplyPatchesAct.triggered.connect(self.__gitApplyPatches) + self.actions.append(self.gitApplyPatchesAct) + + self.gitShowPatcheStatisticsAct = E5Action( + self.tr('Show patch statistics'), + self.tr('Show patch statistics'), + 0, 0, self, 'git_show_patches_statistics') + self.gitShowPatcheStatisticsAct.setStatusTip(self.tr( + 'Show some statistics for a list of patch files' + )) + self.gitShowPatcheStatisticsAct.setWhatsThis(self.tr( + """<b>Show patch statistics</b>""" + """<p>This shows some statistics for a list of patch files.</p>""" + )) + self.gitShowPatcheStatisticsAct.triggered.connect( + self.__gitShowPatchStatistics) + self.actions.append(self.gitShowPatcheStatisticsAct) + + self.gitSubmoduleAddAct = E5Action( + self.tr('Add'), + self.tr('Add'), + 0, 0, self, 'git_submodule_add') + self.gitSubmoduleAddAct.setStatusTip(self.tr( + 'Add a submodule to the current project' + )) + self.gitSubmoduleAddAct.setWhatsThis(self.tr( + """<b>Add</b>""" + """<p>This adds a submodule to the current project.</p>""" + )) + self.gitSubmoduleAddAct.triggered.connect( + self.__gitSubmoduleAdd) + self.actions.append(self.gitSubmoduleAddAct) + + self.gitSubmodulesListAct = E5Action( + self.tr('List'), + self.tr('List'), + 0, 0, self, 'git_submodules_list') + self.gitSubmodulesListAct.setStatusTip(self.tr( + 'List the submodule of the current project' + )) + self.gitSubmodulesListAct.setWhatsThis(self.tr( + """<b>List</b>""" + """<p>This lists the submodules of the current project.</p>""" + )) + self.gitSubmodulesListAct.triggered.connect( + self.__gitSubmodulesList) + self.actions.append(self.gitSubmodulesListAct) + + self.gitSubmodulesInitAct = E5Action( + self.tr('Initialize'), + self.tr('Initialize'), + 0, 0, self, 'git_submodules_init') + self.gitSubmodulesInitAct.setStatusTip(self.tr( + 'Initialize the submodules of the current project' + )) + self.gitSubmodulesInitAct.setWhatsThis(self.tr( + """<b>Initialize</b>""" + """<p>This initializes the submodules of the current""" + """ project.</p>""" + )) + self.gitSubmodulesInitAct.triggered.connect( + self.__gitSubmodulesInit) + self.actions.append(self.gitSubmodulesInitAct) + + self.gitSubmodulesDeinitAct = E5Action( + self.tr('Unregister'), + self.tr('Unregister'), + 0, 0, self, 'git_submodules_deinit') + self.gitSubmodulesDeinitAct.setStatusTip(self.tr( + 'Unregister submodules of the current project' + )) + self.gitSubmodulesDeinitAct.setWhatsThis(self.tr( + """<b>Unregister</b>""" + """<p>This unregisters submodules of the current project.</p>""" + )) + self.gitSubmodulesDeinitAct.triggered.connect( + self.__gitSubmodulesDeinit) + self.actions.append(self.gitSubmodulesDeinitAct) + + self.gitSubmodulesUpdateAct = E5Action( + self.tr('Update'), + self.tr('Update'), + 0, 0, self, 'git_submodules_update') + self.gitSubmodulesUpdateAct.setStatusTip(self.tr( + 'Update submodules of the current project' + )) + self.gitSubmodulesUpdateAct.setWhatsThis(self.tr( + """<b>Update</b>""" + """<p>This updates submodules of the current project.</p>""" + )) + self.gitSubmodulesUpdateAct.triggered.connect( + self.__gitSubmodulesUpdate) + self.actions.append(self.gitSubmodulesUpdateAct) + + self.gitSubmodulesUpdateInitAct = E5Action( + self.tr('Initialize and Update'), + self.tr('Initialize and Update'), + 0, 0, self, 'git_submodules_update_init') + self.gitSubmodulesUpdateInitAct.setStatusTip(self.tr( + 'Initialize and update submodules of the current project' + )) + self.gitSubmodulesUpdateInitAct.setWhatsThis(self.tr( + """<b>Initialize and Update</b>""" + """<p>This initializes and updates submodules of the current""" + """ project.</p>""" + )) + self.gitSubmodulesUpdateInitAct.triggered.connect( + self.__gitSubmodulesUpdateInit) + self.actions.append(self.gitSubmodulesUpdateInitAct) + + self.gitSubmodulesUpdateRemoteAct = E5Action( + self.tr('Fetch and Update'), + self.tr('Fetch and Update'), + 0, 0, self, 'git_submodules_update_remote') + self.gitSubmodulesUpdateRemoteAct.setStatusTip(self.tr( + 'Fetch and update submodules of the current project' + )) + self.gitSubmodulesUpdateRemoteAct.setWhatsThis(self.tr( + """<b>Fetch and Update</b>""" + """<p>This fetches and updates submodules of the current""" + """ project.</p>""" + )) + self.gitSubmodulesUpdateRemoteAct.triggered.connect( + self.__gitSubmodulesUpdateRemote) + self.actions.append(self.gitSubmodulesUpdateRemoteAct) + + self.gitSubmodulesUpdateOptionsAct = E5Action( + self.tr('Update with Options'), + self.tr('Update with Options'), + 0, 0, self, 'git_submodules_update_options') + self.gitSubmodulesUpdateOptionsAct.setStatusTip(self.tr( + 'Update submodules of the current project offering a dialog' + ' to enter options' + )) + self.gitSubmodulesUpdateOptionsAct.setWhatsThis(self.tr( + """<b>Update with Options</b>""" + """<p>This updates submodules of the current project""" + """ offering a dialog to enter update options.</p>""" + )) + self.gitSubmodulesUpdateOptionsAct.triggered.connect( + self.__gitSubmodulesUpdateOptions) + self.actions.append(self.gitSubmodulesUpdateOptionsAct) + + self.gitSubmodulesSyncAct = E5Action( + self.tr('Synchronize URLs'), + self.tr('Synchronize URLs'), + 0, 0, self, 'git_submodules_sync') + self.gitSubmodulesSyncAct.setStatusTip(self.tr( + 'Synchronize URLs of submodules of the current project' + )) + self.gitSubmodulesSyncAct.setWhatsThis(self.tr( + """<b>Synchronize URLs</b>""" + """<p>This synchronizes URLs of submodules of the current""" + """ project.</p>""" + )) + self.gitSubmodulesSyncAct.triggered.connect( + self.__gitSubmodulesSync) + self.actions.append(self.gitSubmodulesSyncAct) + + self.gitSubmodulesStatusAct = E5Action( + self.tr('Show Status'), + self.tr('Show Status'), + 0, 0, self, 'git_submodules_status') + self.gitSubmodulesStatusAct.setStatusTip(self.tr( + 'Show the status of submodules of the current project' + )) + self.gitSubmodulesStatusAct.setWhatsThis(self.tr( + """<b>Show Status</b>""" + """<p>This shows a dialog with the status of submodules of the""" + """ current project.</p>""" + )) + self.gitSubmodulesStatusAct.triggered.connect( + self.__gitSubmodulesStatus) + self.actions.append(self.gitSubmodulesStatusAct) + + self.gitSubmodulesSummaryAct = E5Action( + self.tr('Show Summary'), + self.tr('Show Summary'), + 0, 0, self, 'git_submodules_summary') + self.gitSubmodulesSummaryAct.setStatusTip(self.tr( + 'Show summary information for submodules of the current project' + )) + self.gitSubmodulesSummaryAct.setWhatsThis(self.tr( + """<b>Show Summary</b>""" + """<p>This shows some summary information for submodules of the""" + """ current project.</p>""" + )) + self.gitSubmodulesSummaryAct.triggered.connect( + self.__gitSubmodulesSummary) + self.actions.append(self.gitSubmodulesSummaryAct) + + def initMenu(self, menu): + """ + Public method to generate the VCS menu. + + @param menu reference to the menu to be populated (QMenu) + """ + menu.clear() + + self.subMenus = [] + + adminMenu = QMenu(self.tr("Administration"), menu) + adminMenu.setTearOffEnabled(True) + adminMenu.addAction(self.gitShowConfigAct) + adminMenu.addAction(self.gitRepoConfigAct) + adminMenu.addSeparator() + adminMenu.addAction(self.gitReflogBrowserAct) + adminMenu.addSeparator() + adminMenu.addAction(self.gitCreateIgnoreAct) + adminMenu.addSeparator() + adminMenu.addAction(self.gitCreateArchiveAct) + adminMenu.addSeparator() + adminMenu.addAction(self.gitStatisticsAct) + adminMenu.addAction(self.gitVerifyAct) + adminMenu.addAction(self.gitHouseKeepingAct) + self.subMenus.append(adminMenu) + + bundleMenu = QMenu(self.tr("Bundle Management"), menu) + bundleMenu.setTearOffEnabled(True) + bundleMenu.addAction(self.gitBundleAct) + bundleMenu.addSeparator() + bundleMenu.addAction(self.gitBundleVerifyAct) + bundleMenu.addAction(self.gitBundleListHeadsAct) + bundleMenu.addSeparator() + bundleMenu.addAction(self.gitBundleApplyFetchAct) + bundleMenu.addAction(self.gitBundleApplyPullAct) + self.subMenus.append(bundleMenu) + + patchMenu = QMenu(self.tr("Patch Management"), menu) + patchMenu.setTearOffEnabled(True) + patchMenu.addAction(self.gitCheckPatchesAct) + patchMenu.addAction(self.gitApplyPatchesAct) + patchMenu.addSeparator() + patchMenu.addAction(self.gitShowPatcheStatisticsAct) + self.subMenus.append(patchMenu) + + bisectMenu = QMenu(self.tr("Bisect"), menu) + bisectMenu.setTearOffEnabled(True) + bisectMenu.addAction(self.gitBisectStartAct) + bisectMenu.addAction(self.gitBisectStartExtendedAct) + bisectMenu.addSeparator() + bisectMenu.addAction(self.gitBisectGoodAct) + bisectMenu.addAction(self.gitBisectBadAct) + bisectMenu.addAction(self.gitBisectSkipAct) + bisectMenu.addSeparator() + bisectMenu.addAction(self.gitBisectResetAct) + bisectMenu.addSeparator() + bisectMenu.addAction(self.gitBisectLogBrowserAct) + bisectMenu.addSeparator() + bisectMenu.addAction(self.gitBisectCreateReplayAct) + bisectMenu.addAction(self.gitBisectEditReplayAct) + bisectMenu.addAction(self.gitBisectReplayAct) + self.subMenus.append(bisectMenu) + + tagsMenu = QMenu(self.tr("Tags"), menu) + tagsMenu.setIcon(UI.PixmapCache.getIcon("vcsTag.png")) + tagsMenu.setTearOffEnabled(True) + tagsMenu.addAction(self.vcsTagAct) + tagsMenu.addAction(self.gitTagListAct) + tagsMenu.addAction(self.gitDescribeTagAct) + self.subMenus.append(tagsMenu) + + branchesMenu = QMenu(self.tr("Branches"), menu) + branchesMenu.setIcon(UI.PixmapCache.getIcon("vcsBranch.png")) + branchesMenu.setTearOffEnabled(True) + branchesMenu.addAction(self.gitBranchAct) + branchesMenu.addSeparator() + branchesMenu.addAction(self.gitBranchListAct) + branchesMenu.addAction(self.gitMergedBranchListAct) + branchesMenu.addAction(self.gitNotMergedBranchListAct) + branchesMenu.addAction(self.gitShowBranchAct) + branchesMenu.addSeparator() + branchesMenu.addAction(self.gitDeleteRemoteBranchAct) + self.subMenus.append(branchesMenu) + + changesMenu = QMenu(self.tr("Manage Changes"), menu) + changesMenu.setTearOffEnabled(True) + changesMenu.addAction(self.gitUnstageAct) + changesMenu.addAction(self.vcsRevertAct) + changesMenu.addAction(self.vcsMergeAct) + changesMenu.addAction(self.gitCommitMergeAct) + changesMenu.addAction(self.gitCancelMergeAct) + + remotesMenu = QMenu(self.tr("Remote Repositories"), menu) + remotesMenu.setTearOffEnabled(True) + remotesMenu.addAction(self.gitRemotesShowAct) + remotesMenu.addAction(self.gitRemoteShowAct) + remotesMenu.addSeparator() + remotesMenu.addAction(self.gitRemoteAddAct) + remotesMenu.addAction(self.gitRemoteRenameAct) + remotesMenu.addAction(self.gitRemoteRemoveAct) + remotesMenu.addAction(self.gitRemotePruneAct) + + cherrypickMenu = QMenu(self.tr("Cherry-pick"), menu) + cherrypickMenu.setIcon(UI.PixmapCache.getIcon("vcsGraft.png")) + cherrypickMenu.setTearOffEnabled(True) + cherrypickMenu.addAction(self.gitCherryPickAct) + cherrypickMenu.addAction(self.gitCherryPickContinueAct) + cherrypickMenu.addAction(self.gitCherryPickQuitAct) + cherrypickMenu.addAction(self.gitCherryPickAbortAct) + + stashMenu = QMenu(self.tr("Stash"), menu) + stashMenu.setTearOffEnabled(True) + stashMenu.addAction(self.gitStashAct) + stashMenu.addSeparator() + stashMenu.addAction(self.gitStashBrowserAct) + stashMenu.addAction(self.gitStashShowAct) + stashMenu.addSeparator() + stashMenu.addAction(self.gitStashApplyAct) + stashMenu.addAction(self.gitStashPopAct) + stashMenu.addSeparator() + stashMenu.addAction(self.gitStashBranchAct) + stashMenu.addSeparator() + stashMenu.addAction(self.gitStashDropAct) + stashMenu.addAction(self.gitStashClearAct) + + submodulesMenu = QMenu(self.tr("Submodules"), menu) + submodulesMenu.setTearOffEnabled(True) + submodulesMenu.addAction(self.gitSubmoduleAddAct) + submodulesMenu.addSeparator() + submodulesMenu.addAction(self.gitSubmodulesInitAct) + submodulesMenu.addAction(self.gitSubmodulesUpdateInitAct) + submodulesMenu.addAction(self.gitSubmodulesDeinitAct) + submodulesMenu.addSeparator() + submodulesMenu.addAction(self.gitSubmodulesUpdateAct) + submodulesMenu.addAction(self.gitSubmodulesUpdateRemoteAct) + submodulesMenu.addAction(self.gitSubmodulesUpdateOptionsAct) + submodulesMenu.addSeparator() + submodulesMenu.addAction(self.gitSubmodulesSyncAct) + submodulesMenu.addSeparator() + submodulesMenu.addAction(self.gitSubmodulesListAct) + submodulesMenu.addSeparator() + submodulesMenu.addAction(self.gitSubmodulesStatusAct) + submodulesMenu.addAction(self.gitSubmodulesSummaryAct) + + act = menu.addAction( + UI.PixmapCache.getIcon( + os.path.join("VcsPlugins", "vcsGit", "icons", "git.png")), + self.vcs.vcsName(), self._vcsInfoDisplay) + font = act.font() + font.setBold(True) + act.setFont(font) + menu.addSeparator() + + menu.addAction(self.gitFetchAct) + menu.addAction(self.gitPullAct) + menu.addSeparator() + menu.addAction(self.vcsCommitAct) + menu.addAction(self.gitPushAct) + menu.addSeparator() + menu.addMenu(changesMenu) + menu.addMenu(stashMenu) + menu.addSeparator() + menu.addMenu(cherrypickMenu) + menu.addSeparator() + menu.addMenu(bundleMenu) + menu.addMenu(patchMenu) + menu.addSeparator() + menu.addMenu(remotesMenu) + menu.addMenu(submodulesMenu) + menu.addSeparator() + menu.addMenu(tagsMenu) + menu.addMenu(branchesMenu) + menu.addSeparator() + menu.addAction(self.gitLogBrowserAct) + menu.addSeparator() + menu.addAction(self.vcsStatusAct) + menu.addSeparator() + menu.addAction(self.vcsDiffAct) + menu.addAction(self.gitExtDiffAct) + menu.addSeparator() + menu.addAction(self.vcsSwitchAct) + menu.addSeparator() + menu.addMenu(bisectMenu) + menu.addSeparator() + menu.addAction(self.vcsCleanupAct) + menu.addSeparator() + menu.addAction(self.vcsCommandAct) + menu.addSeparator() + menu.addMenu(adminMenu) + menu.addSeparator() + menu.addAction(self.gitEditUserConfigAct) + menu.addAction(self.gitConfigAct) + menu.addSeparator() + menu.addAction(self.vcsNewAct) + menu.addAction(self.vcsExportAct) + + def initToolbar(self, ui, toolbarManager): + """ + Public slot to initialize the VCS toolbar. + + @param ui reference to the main window (UserInterface) + @param toolbarManager reference to a toolbar manager object + (E5ToolBarManager) + """ + self.__toolbar = QToolBar(self.tr("Git"), ui) + self.__toolbar.setIconSize(UI.Config.ToolBarIconSize) + self.__toolbar.setObjectName("GitToolbar") + self.__toolbar.setToolTip(self.tr('Git')) + + self.__toolbar.addAction(self.gitLogBrowserAct) + self.__toolbar.addAction(self.vcsStatusAct) + self.__toolbar.addSeparator() + self.__toolbar.addAction(self.vcsDiffAct) + self.__toolbar.addSeparator() + self.__toolbar.addAction(self.vcsNewAct) + self.__toolbar.addAction(self.vcsExportAct) + self.__toolbar.addSeparator() + + title = self.__toolbar.windowTitle() + toolbarManager.addToolBar(self.__toolbar, title) + toolbarManager.addAction(self.gitFetchAct, title) + toolbarManager.addAction(self.gitPullAct, title) + toolbarManager.addAction(self.vcsCommitAct, title) + toolbarManager.addAction(self.gitPushAct, title) + toolbarManager.addAction(self.gitReflogBrowserAct, title) + toolbarManager.addAction(self.gitExtDiffAct, title) + toolbarManager.addAction(self.vcsSwitchAct, title) + toolbarManager.addAction(self.vcsTagAct, title) + toolbarManager.addAction(self.gitBranchAct, title) + toolbarManager.addAction(self.vcsRevertAct, title) + toolbarManager.addAction(self.gitUnstageAct, title) + toolbarManager.addAction(self.vcsMergeAct, title) + toolbarManager.addAction(self.gitCherryPickAct, title) + toolbarManager.addAction(self.gitBisectLogBrowserAct, title) + + self.__toolbar.setEnabled(False) + self.__toolbar.setVisible(False) + + ui.registerToolbar("git", self.__toolbar.windowTitle(), + self.__toolbar) + ui.addToolBar(self.__toolbar) + + def removeToolbar(self, ui, toolbarManager): + """ + Public method to remove a toolbar created by initToolbar(). + + @param ui reference to the main window (UserInterface) + @param toolbarManager reference to a toolbar manager object + (E5ToolBarManager) + """ + ui.removeToolBar(self.__toolbar) + ui.unregisterToolbar("git") + + title = self.__toolbar.windowTitle() + toolbarManager.removeCategoryActions(title) + toolbarManager.removeToolBar(self.__toolbar) + + self.__toolbar.deleteLater() + self.__toolbar = None + + def shutdown(self): + """ + Public method to perform shutdown actions. + """ + # close torn off sub menus + for menu in self.subMenus: + if menu.isTearOffMenuVisible(): + menu.hideTearOffMenu() + + def __gitTagList(self): + """ + Private slot used to list the tags of the project. + """ + self.vcs.gitListTagBranch(self.project.getProjectPath(), True) + + def __gitDescribeTag(self): + """ + Private slot to show the most recent tag. + """ + self.vcs.gitDescribe(self.project.getProjectPath(), []) + + def __gitBranchList(self): + """ + Private slot used to list the branches of the project. + """ + self.vcs.gitListTagBranch(self.project.getProjectPath(), False) + + def __gitMergedBranchList(self): + """ + Private slot used to list the merged branches of the project. + """ + self.vcs.gitListTagBranch(self.project.getProjectPath(), False, + listAll=False, merged=True) + + def __gitNotMergedBranchList(self): + """ + Private slot used to list the not merged branches of the project. + """ + self.vcs.gitListTagBranch(self.project.getProjectPath(), False, + listAll=False, merged=False) + + def __gitBranch(self): + """ + Private slot used to perform branch operations for the project. + """ + pfile = self.project.getProjectFile() + lastModified = QFileInfo(pfile).lastModified().toString() + shouldReopen = ( + self.vcs.gitBranch(self.project.getProjectPath())[1] or + QFileInfo(pfile).lastModified().toString() != lastModified + ) + if shouldReopen: + res = E5MessageBox.yesNo( + self.parent(), + self.tr("Branch"), + self.tr("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject() + + def __gitDeleteBranch(self): + """ + Private slot used to delete a branch from a remote repository. + """ + self.vcs.gitDeleteRemoteBranch(self.project.getProjectPath()) + + def __gitShowBranch(self): + """ + Private slot used to show the current branch for the project. + """ + self.vcs.gitShowBranch(self.project.getProjectPath()) + + def __gitExtendedDiff(self): + """ + Private slot used to perform a git diff with the selection of + revisions. + """ + self.vcs.gitExtendedDiff(self.project.getProjectPath()) + + def __gitFetch(self): + """ + Private slot used to fetch changes from a remote repository. + """ + self.vcs.gitFetch(self.project.getProjectPath()) + + def __gitPull(self): + """ + Private slot used to pull changes from a remote repository. + """ + pfile = self.project.getProjectFile() + lastModified = QFileInfo(pfile).lastModified().toString() + shouldReopen = ( + self.vcs.gitPull(self.project.getProjectPath()) or + QFileInfo(pfile).lastModified().toString() != lastModified + ) + if shouldReopen: + res = E5MessageBox.yesNo( + self.parent(), + self.tr("Pull"), + self.tr("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject() + + def __gitPush(self): + """ + Private slot used to push changes to a remote repository. + """ + self.vcs.gitPush(self.project.getProjectPath()) + + def __gitRevert(self): + """ + Private slot used to revert changes made to the local project. + """ + pfile = self.project.getProjectFile() + lastModified = QFileInfo(pfile).lastModified().toString() + shouldReopen = ( + self.vcs.gitRevert(self.project.getProjectPath()) or + QFileInfo(pfile).lastModified().toString() != lastModified + ) + if shouldReopen: + res = E5MessageBox.yesNo( + self.parent(), + self.tr("Revert Changes"), + self.tr("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject() + + def __gitUnstage(self): + """ + Private slot used to unstage changes made to the local project. + """ + pfile = self.project.getProjectFile() + lastModified = QFileInfo(pfile).lastModified().toString() + shouldReopen = ( + self.vcs.gitUnstage(self.project.getProjectPath()) or + QFileInfo(pfile).lastModified().toString() != lastModified + ) + if shouldReopen: + res = E5MessageBox.yesNo( + self.parent(), + self.tr("Unstage Changes"), + self.tr("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject() + + def __gitCancelMerge(self): + """ + Private slot used to cancel an uncommitted or failed merge. + """ + self.vcs.gitCancelMerge(self.project.getProjectPath()) + + def __gitCommitMerge(self): + """ + Private slot used to commit the ongoing merge. + """ + self.vcs.gitCommitMerge(self.project.getProjectPath()) + + def __gitShowRemotes(self): + """ + Private slot used to show the available remote repositories. + """ + self.vcs.gitShowRemotes(self.project.getProjectPath()) + + def __gitShowRemote(self): + """ + Private slot used to show information about a remote repository. + """ + remotes = self.vcs.gitGetRemotesList(self.project.getProjectPath()) + remote, ok = QInputDialog.getItem( + None, + self.tr("Show Remote Info"), + self.tr("Select a remote repository:"), + remotes, + 0, False) + if ok: + self.vcs.gitShowRemote(self.project.getProjectPath(), remote) + + def __gitAddRemote(self): + """ + Private slot to add a remote repository. + """ + self.vcs.gitAddRemote(self.project.getProjectPath()) + + def __gitRemoveRemote(self): + """ + Private slot to remove a remote repository. + """ + remotes = self.vcs.gitGetRemotesList(self.project.getProjectPath()) + remote, ok = QInputDialog.getItem( + None, + self.tr("Remove"), + self.tr("Select a remote repository:"), + remotes, + 0, False) + if ok: + self.vcs.gitRemoveRemote(self.project.getProjectPath(), remote) + + def __gitPruneRemote(self): + """ + Private slot to prune stale tracking branches of a remote repository. + """ + remotes = self.vcs.gitGetRemotesList(self.project.getProjectPath()) + remote, ok = QInputDialog.getItem( + None, + self.tr("Prune"), + self.tr("Select a remote repository:"), + remotes, + 0, False) + if ok: + self.vcs.gitPruneRemote(self.project.getProjectPath(), remote) + + def __gitRenameRemote(self): + """ + Private slot to rename 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.gitRenameRemote(self.project.getProjectPath(), remote) + + def __gitCherryPick(self): + """ + Private slot used to copy commits into the current branch. + """ + pfile = self.project.getProjectFile() + lastModified = QFileInfo(pfile).lastModified().toString() + shouldReopen = ( + self.vcs.gitCherryPick(self.project.getProjectPath()) or + QFileInfo(pfile).lastModified().toString() != lastModified + ) + if shouldReopen: + res = E5MessageBox.yesNo( + None, + self.tr("Copy Commits"), + self.tr("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject() + + def __gitCherryPickContinue(self): + """ + Private slot used to continue the last copying session after conflicts + were resolved. + """ + pfile = self.project.getProjectFile() + lastModified = QFileInfo(pfile).lastModified().toString() + shouldReopen = ( + self.vcs.gitCherryPickContinue(self.project.getProjectPath()) or + QFileInfo(pfile).lastModified().toString() != lastModified + ) + if shouldReopen: + res = E5MessageBox.yesNo( + None, + self.tr("Copy Commits (Continue)"), + self.tr("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject() + + def __gitCherryPickQuit(self): + """ + Private slot used to quit the current copying operation. + """ + pfile = self.project.getProjectFile() + lastModified = QFileInfo(pfile).lastModified().toString() + shouldReopen = ( + self.vcs.gitCherryPickQuit(self.project.getProjectPath()) or + QFileInfo(pfile).lastModified().toString() != lastModified + ) + if shouldReopen: + res = E5MessageBox.yesNo( + None, + self.tr("Copy Commits (Quit)"), + self.tr("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject() + + def __gitCherryPickAbort(self): + """ + Private slot used to cancel the last copying session and return to + the previous state. + """ + pfile = self.project.getProjectFile() + lastModified = QFileInfo(pfile).lastModified().toString() + shouldReopen = ( + self.vcs.gitCherryPickAbort(self.project.getProjectPath()) or + QFileInfo(pfile).lastModified().toString() != lastModified + ) + if shouldReopen: + res = E5MessageBox.yesNo( + None, + self.tr("Copy Commits (Cancel)"), + self.tr("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject() + + def __gitStashSave(self): + """ + Private slot to stash all current changes. + """ + pfile = self.project.getProjectFile() + lastModified = QFileInfo(pfile).lastModified().toString() + shouldReopen = ( + self.vcs.gitStashSave(self.project.getProjectPath()) or + QFileInfo(pfile).lastModified().toString() != lastModified + ) + if shouldReopen: + res = E5MessageBox.yesNo( + self.parent(), + self.tr("Save Stash"), + self.tr("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject() + + def __gitStashBrowser(self): + """ + Private slot used to show the stash browser dialog. + """ + self.vcs.gitStashBrowser(self.project.getProjectPath()) + + def __gitStashShow(self): + """ + Private slot to show the contents of the selected stash. + """ + self.vcs.gitStashShowPatch(self.project.getProjectPath()) + + def __gitStashApply(self): + """ + Private slot to restore a stash and keep it. + """ + pfile = self.project.getProjectFile() + lastModified = QFileInfo(pfile).lastModified().toString() + shouldReopen = ( + self.vcs.gitStashApply(self.project.getProjectPath()) or + QFileInfo(pfile).lastModified().toString() != lastModified + ) + if shouldReopen: + res = E5MessageBox.yesNo( + self.parent(), + self.tr("Restore Stash"), + self.tr("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject() + + def __gitStashPop(self): + """ + Private slot to restore a stash and delete it. + """ + pfile = self.project.getProjectFile() + lastModified = QFileInfo(pfile).lastModified().toString() + shouldReopen = ( + self.vcs.gitStashPop(self.project.getProjectPath()) or + QFileInfo(pfile).lastModified().toString() != lastModified + ) + if shouldReopen: + res = E5MessageBox.yesNo( + self.parent(), + self.tr("Restore Stash"), + self.tr("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject() + + def __gitStashBranch(self): + """ + Private slot to create a new branch and restore a stash into it. + """ + pfile = self.project.getProjectFile() + lastModified = QFileInfo(pfile).lastModified().toString() + shouldReopen = ( + self.vcs.gitStashBranch(self.project.getProjectPath()) or + QFileInfo(pfile).lastModified().toString() != lastModified + ) + if shouldReopen: + res = E5MessageBox.yesNo( + self.parent(), + self.tr("Create Branch"), + self.tr("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject() + + def __gitStashDrop(self): + """ + Private slot to drop a stash. + """ + self.vcs.gitStashDrop(self.project.getProjectPath()) + + def __gitStashClear(self): + """ + Private slot to clear all stashes. + """ + self.vcs.gitStashClear(self.project.getProjectPath()) + + def __gitConfigure(self): + """ + Private method to open the configuration dialog. + """ + e5App().getObject("UserInterface").showPreferences("zzz_gitPage") + + def __gitEditUserConfig(self): + """ + Private slot used to edit the user configuration file. + """ + self.vcs.gitEditUserConfig() + + def __gitEditRepoConfig(self): + """ + Private slot used to edit the repository configuration file. + """ + self.vcs.gitEditConfig(self.project.getProjectPath()) + + def __gitCreateIgnore(self): + """ + Private slot used to create a .gitignore file for the project. + """ + self.vcs.gitCreateIgnoreFile(self.project.getProjectPath(), + autoAdd=True) + + def __gitShowConfig(self): + """ + Private slot used to show the combined configuration. + """ + self.vcs.gitShowConfig(self.project.getProjectPath()) + + def __gitVerify(self): + """ + Private slot used to verify the connectivity and validity of objects + of the database. + """ + self.vcs.gitVerify(self.project.getProjectPath()) + + def __gitHouseKeeping(self): + """ + Private slot used to cleanup and optimize the local repository. + """ + self.vcs.gitHouseKeeping(self.project.getProjectPath()) + + def __gitStatistics(self): + """ + Private slot used to show some statistics of the local repository. + """ + self.vcs.gitStatistics(self.project.getProjectPath()) + + def __gitCreateArchive(self): + """ + Private slot used to create an archive from the local repository. + """ + self.vcs.gitCreateArchive(self.project.getProjectPath()) + + def __gitReflogBrowser(self): + """ + Private slot to show the reflog of the current project. + """ + self.vcs.gitReflogBrowser(self.project.getProjectPath()) + + def __gitBundle(self): + """ + Private slot used to create a bundle file. + """ + self.vcs.gitBundle(self.project.getProjectPath()) + + def __gitVerifyBundle(self): + """ + Private slot used to verify a bundle file. + """ + self.vcs.gitVerifyBundle(self.project.getProjectPath()) + + def __gitBundleListHeads(self): + """ + Private slot used to list the heads contained in a bundle file. + """ + self.vcs.gitBundleListHeads(self.project.getProjectPath()) + + def __gitBundleFetch(self): + """ + Private slot to apply a head of a bundle file using the fetch method. + """ + self.vcs.gitBundleFetch(self.project.getProjectPath()) + + def __gitBundlePull(self): + """ + Private slot to apply a head of a bundle file using the pull method. + """ + pfile = self.project.getProjectFile() + lastModified = QFileInfo(pfile).lastModified().toString() + shouldReopen = ( + self.vcs.gitBundlePull(self.project.getProjectPath()) or + QFileInfo(pfile).lastModified().toString() != lastModified + ) + if shouldReopen: + res = E5MessageBox.yesNo( + self.parent(), + self.tr("Apply Bundle (pull)"), + self.tr("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject() + + def __gitBisectStart(self): + """ + Private slot used to execute the bisect start command. + """ + self.vcs.gitBisect(self.project.getProjectPath(), "start") + + def __gitBisectStartExtended(self): + """ + Private slot used to execute the bisect start command with options. + """ + pfile = self.project.getProjectFile() + lastModified = QFileInfo(pfile).lastModified().toString() + shouldReopen = ( + self.vcs.gitBisect(self.project.getProjectPath(), + "start_extended") or + QFileInfo(pfile).lastModified().toString() != lastModified + ) + if shouldReopen: + res = E5MessageBox.yesNo( + self.parent(), + self.tr("Bisect"), + self.tr("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject() + + def __gitBisectGood(self): + """ + Private slot used to execute the bisect good command. + """ + pfile = self.project.getProjectFile() + lastModified = QFileInfo(pfile).lastModified().toString() + shouldReopen = ( + self.vcs.gitBisect(self.project.getProjectPath(), "good") or + QFileInfo(pfile).lastModified().toString() != lastModified + ) + if shouldReopen: + res = E5MessageBox.yesNo( + self.parent(), + self.tr("Bisect"), + self.tr("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject() + + def __gitBisectBad(self): + """ + Private slot used to execute the bisect bad command. + """ + pfile = self.project.getProjectFile() + lastModified = QFileInfo(pfile).lastModified().toString() + shouldReopen = ( + self.vcs.gitBisect(self.project.getProjectPath(), "bad") or + QFileInfo(pfile).lastModified().toString() != lastModified + ) + if shouldReopen: + res = E5MessageBox.yesNo( + self.parent(), + self.tr("Bisect"), + self.tr("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject() + + def __gitBisectSkip(self): + """ + Private slot used to execute the bisect skip command. + """ + pfile = self.project.getProjectFile() + lastModified = QFileInfo(pfile).lastModified().toString() + shouldReopen = ( + self.vcs.gitBisect(self.project.getProjectPath(), "skip") or + QFileInfo(pfile).lastModified().toString() != lastModified + ) + if shouldReopen: + res = E5MessageBox.yesNo( + self.parent(), + self.tr("Bisect"), + self.tr("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject() + + def __gitBisectReset(self): + """ + Private slot used to execute the bisect reset command. + """ + pfile = self.project.getProjectFile() + lastModified = QFileInfo(pfile).lastModified().toString() + shouldReopen = ( + self.vcs.gitBisect(self.project.getProjectPath(), "reset") or + QFileInfo(pfile).lastModified().toString() != lastModified + ) + if shouldReopen: + res = E5MessageBox.yesNo( + self.parent(), + self.tr("Bisect"), + self.tr("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject() + + def __gitBisectLogBrowser(self): + """ + Private slot used to show the bisect log browser window. + """ + self.vcs.gitBisectLogBrowser(self.project.getProjectPath()) + + def __gitBisectCreateReplay(self): + """ + Private slot used to create a replay file for the current bisect + session. + """ + self.vcs.gitBisectCreateReplayFile(self.project.getProjectPath()) + + def __gitBisectEditReplay(self): + """ + Private slot used to edit a bisect replay file. + """ + self.vcs.gitBisectEditReplayFile(self.project.getProjectPath()) + + def __gitBisectReplay(self): + """ + Private slot used to replay a bisect session. + """ + pfile = self.project.getProjectFile() + lastModified = QFileInfo(pfile).lastModified().toString() + shouldReopen = ( + self.vcs.gitBisectReplay(self.project.getProjectPath()) or + QFileInfo(pfile).lastModified().toString() != lastModified + ) + if shouldReopen: + res = E5MessageBox.yesNo( + self.parent(), + self.tr("Bisect"), + self.tr("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject() + + def __gitCheckPatches(self): + """ + Private slot to check a list of patch files, if they would apply + cleanly. + """ + self.vcs.gitApplyCheckPatches(self.project.getProjectPath(), + check=True) + + def __gitApplyPatches(self): + """ + Private slot to apply a list of patch files. + """ + pfile = self.project.getProjectFile() + lastModified = QFileInfo(pfile).lastModified().toString() + self.vcs.gitApplyCheckPatches(self.project.getProjectPath()) + if QFileInfo(pfile).lastModified().toString() != lastModified: + res = E5MessageBox.yesNo( + self.parent(), + self.tr("Apply patch files"), + self.tr("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject() + + def __gitShowPatchStatistics(self): + """ + Private slot to show some patch statistics. + """ + self.vcs.gitShowPatchesStatistics(self.project.getProjectPath()) + + def __gitSubmoduleAdd(self): + """ + Private slot to add a submodule to the current project. + """ + self.vcs.gitSubmoduleAdd(self.project.getProjectPath()) + + def __gitSubmodulesList(self): + """ + Private slot to list the submodules defined for the current project. + """ + self.vcs.gitSubmoduleList(self.project.getProjectPath()) + + def __gitSubmodulesInit(self): + """ + Private slot to initialize submodules of the project. + """ + self.vcs.gitSubmoduleInit(self.project.getProjectPath()) + + def __gitSubmodulesDeinit(self): + """ + Private slot to unregister submodules of the project. + """ + self.vcs.gitSubmoduleDeinit(self.project.getProjectPath()) + + def __gitSubmodulesUpdate(self): + """ + Private slot to update submodules of the project. + """ + self.vcs.gitSubmoduleUpdate(self.project.getProjectPath()) + + def __gitSubmodulesUpdateInit(self): + """ + Private slot to initialize and update submodules of the project. + """ + self.vcs.gitSubmoduleUpdate(self.project.getProjectPath(), + initialize=True) + + def __gitSubmodulesUpdateRemote(self): + """ + Private slot to fetch and update submodules of the project. + """ + self.vcs.gitSubmoduleUpdate(self.project.getProjectPath(), + remote=True) + + def __gitSubmodulesUpdateOptions(self): + """ + Private slot to update submodules of the project with options. + """ + self.vcs.gitSubmoduleUpdateWithOptions(self.project.getProjectPath()) + + def __gitSubmodulesSync(self): + """ + Private slot to synchronize URLs of submodules of the project. + """ + self.vcs.gitSubmoduleSync(self.project.getProjectPath()) + + def __gitSubmodulesStatus(self): + """ + Private slot to show the status of submodules of the project. + """ + self.vcs.gitSubmoduleStatus(self.project.getProjectPath()) + + def __gitSubmodulesSummary(self): + """ + Private slot to show summary information for submodules of the project. + """ + self.vcs.gitSubmoduleSummary(self.project.getProjectPath())
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/__init__.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,11 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Package implementing the vcs interface to Git. + +It consists of the git class, the project helper classes and some +Git specific dialogs. +"""
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsGit/git.py Sun Dec 10 17:42:11 2017 +0100 @@ -0,0 +1,4147 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the version control systems interface to Git. +""" + +from __future__ import unicode_literals +try: + str = unicode +except NameError: + pass + +import os +import shutil +import re + +from PyQt5.QtCore import QProcess, pyqtSignal, QFileInfo +from PyQt5.QtWidgets import QApplication, QDialog, QInputDialog, QLineEdit + +from E5Gui.E5Application import e5App +from E5Gui import E5MessageBox, E5FileDialog + +from Globals.E5ConfigParser import E5ConfigParser + +from QScintilla.MiniEditor import MiniEditor + +from VCS.VersionControl import VersionControl +from VCS.RepositoryInfoDialog import VcsRepositoryInfoDialog + +from .GitDialog import GitDialog + +import Utilities +import Preferences + + +class Git(VersionControl): + """ + Class implementing the version control systems interface to Git. + + @signal committed() emitted after the commit action has completed + """ + committed = pyqtSignal() + + IgnoreFileName = ".gitignore" + + def __init__(self, plugin, parent=None, name=None): + """ + Constructor + + @param plugin reference to the plugin object + @param parent parent widget (QWidget) + @param name name of this object (string) + """ + VersionControl.__init__(self, parent, name) + self.defaultOptions = { + 'global': [''], + 'commit': [''], + 'checkout': [''], + 'update': [''], + 'add': [''], + 'remove': [''], + 'diff': [''], + 'log': [''], + 'history': [''], + 'status': [''], + 'tag': [''], + 'export': [''] + } + + self.__plugin = plugin + self.__ui = parent + + self.options = self.defaultOptions + + self.tagTypeList = [ + 'tags', + 'branches', + ] + + self.commandHistory = [] + + self.adminDir = '.git' + + self.log = None + self.logBrowser = None + self.reflogBrowser = None + self.diff = None + self.sbsDiff = None + self.tagbranchList = None + self.status = None + self.remotesDialog = None + self.describeDialog = None + self.blame = None + self.stashBrowser = None + self.repoEditor = None + self.userEditor = None + self.bisectlogBrowser = None + self.bisectReplayEditor = None + self.patchStatisticsDialog = None + self.submoduleStatusDialog = None + + self.__lastBundlePath = None + self.__lastReplayPath = None + + self.statusCache = {} + + self.__commitData = {} + self.__commitDialog = None + + self.__patchCheckData = None + + def getPlugin(self): + """ + Public method to get a reference to the plugin object. + + @return reference to the plugin object (VcsGitPlugin) + """ + return self.__plugin + + def vcsShutdown(self): + """ + Public method used to shutdown the Git interface. + """ + if self.log is not None: + self.log.close() + if self.logBrowser is not None: + self.logBrowser.close() + if self.reflogBrowser is not None: + self.reflogBrowser.close() + if self.diff is not None: + self.diff.close() + if self.sbsDiff is not None: + self.sbsDiff.close() + if self.tagbranchList is not None: + self.tagbranchList.close() + if self.status is not None: + self.status.close() + if self.remotesDialog is not None: + self.remotesDialog.close() + if self.describeDialog is not None: + self.describeDialog.close() + if self.blame is not None: + self.blame.close() + if self.stashBrowser is not None: + self.stashBrowser.close() + if self.bisectlogBrowser is not None: + self.bisectlogBrowser.close() + if self.bisectReplayEditor is not None: + self.bisectReplayEditor.close() + if self.repoEditor is not None: + self.repoEditor.close() + if self.userEditor is not None: + self.userEditor.close() + if self.patchStatisticsDialog is not None: + self.patchStatisticsDialog.close() + if self.submoduleStatusDialog is not None: + self.submoduleStatusDialog.close() + + # shut down the project helpers + self.__projectHelper.shutdown() + + def initCommand(self, command): + """ + Public method to initialize a command arguments list. + + @param command command name (string) + @return list of command options (list of string) + """ + args = [command] + return args + + def vcsExists(self): + """ + Public method used to test for the presence of the git executable. + + @return flag indicating the existance (boolean) and an error message + (string) + """ + self.versionStr = '' + errMsg = "" + ioEncoding = Preferences.getSystem("IOEncoding") + + args = self.initCommand("version") + process = QProcess() + process.start('git', args) + procStarted = process.waitForStarted(5000) + if procStarted: + finished = process.waitForFinished(30000) + if finished and process.exitCode() == 0: + output = str(process.readAllStandardOutput(), + ioEncoding, 'replace') + self.versionStr = output.splitlines()[0].split()[-1] + v = list(re.match(r'.*?(\d+)\.(\d+)\.?(\d+)?\.?(\d+)?', + self.versionStr).groups()) + for i in range(4): + try: + v[i] = int(v[i]) + except TypeError: + v[i] = 0 + except IndexError: + v.append(0) + self.version = tuple(v) + return True, errMsg + else: + if finished: + errMsg = self.tr( + "The git process finished with the exit code {0}")\ + .format(process.exitCode()) + else: + errMsg = self.tr( + "The git process did not finish within 30s.") + else: + errMsg = self.tr("Could not start the git executable.") + + return False, errMsg + + def vcsInit(self, vcsDir, noDialog=False): + """ + Public method used to initialize the Git repository. + + The initialization is done, when a project is converted into a + Git controlled project. Therefore we always return TRUE without + doing anything. + + @param vcsDir name of the VCS directory (string) + @param noDialog flag indicating quiet operations (boolean) + @return always TRUE + """ + return True + + def vcsConvertProject(self, vcsDataDict, project): + """ + Public method to convert an uncontrolled project to a version + controlled project. + + @param vcsDataDict dictionary of data required for the conversion + @param project reference to the project object + """ + success = self.vcsImport(vcsDataDict, project.ppath)[0] + if not success: + E5MessageBox.critical( + self.__ui, + self.tr("Create project repository"), + self.tr( + """The project repository could not be created.""")) + else: + pfn = project.pfile + if not os.path.isfile(pfn): + pfn += "z" + project.closeProject() + project.openProject(pfn) + + def vcsImport(self, vcsDataDict, projectDir, noDialog=False): + """ + Public method used to import the project into the Git repository. + + @param vcsDataDict dictionary of data required for the import + @param projectDir project directory (string) + @param noDialog flag indicating quiet operations + @return flag indicating an execution without errors (boolean) + and a flag indicating the version controll status (boolean) + """ + msg = vcsDataDict["message"] + if not msg: + msg = '***' + + args = self.initCommand("init") + args.append(projectDir) + dia = GitDialog(self.tr('Creating Git repository'), self) + res = dia.startProcess(args) + if res: + dia.exec_() + status = dia.normalExit() + + if status: + ignoreName = os.path.join(projectDir, Git.IgnoreFileName) + if not os.path.exists(ignoreName): + status = self.gitCreateIgnoreFile(projectDir) + + if status: + args = self.initCommand("add") + args.append("-v") + args.append(".") + dia = GitDialog( + self.tr('Adding files to Git repository'), + self) + res = dia.startProcess(args, projectDir) + if res: + dia.exec_() + status = dia.normalExit() + + if status: + args = self.initCommand("commit") + args.append('--message={0}'.format(msg)) + dia = GitDialog( + self.tr('Initial commit to Git repository'), + self) + res = dia.startProcess(args, projectDir) + if res: + dia.exec_() + status = dia.normalExit() + + return status, False + + def vcsCheckout(self, vcsDataDict, projectDir, noDialog=False): + """ + Public method used to check the project out of a Git repository + (clone). + + @param vcsDataDict dictionary of data required for the checkout + @param projectDir project directory to create (string) + @param noDialog flag indicating quiet operations + @return flag indicating an execution without errors (boolean) + """ + noDialog = False + vcsUrl = self.gitNormalizeURL(vcsDataDict["url"]) + + args = self.initCommand("clone") + args.append(vcsUrl) + args.append(projectDir) + + if noDialog: + return self.startSynchronizedProcess(QProcess(), 'git', args) + else: + dia = GitDialog( + self.tr('Cloning project from a Git repository'), + self) + res = dia.startProcess(args) + if res: + dia.exec_() + return dia.normalExit() + + def vcsExport(self, vcsDataDict, projectDir): + """ + Public method used to export a directory from the Git repository. + + @param vcsDataDict dictionary of data required for the checkout + @param projectDir project directory to create (string) + @return flag indicating an execution without errors (boolean) + """ + status = self.vcsCheckout(vcsDataDict, projectDir) + shutil.rmtree(os.path.join(projectDir, self.adminDir), True) + if os.path.exists(os.path.join(projectDir, Git.IgnoreFileName)): + os.remove(os.path.join(projectDir, Git.IgnoreFileName)) + return status + + def vcsCommit(self, name, message="", noDialog=False, commitAll=True, + amend=False): + """ + Public method used to make the change of a file/directory permanent + in the Git repository. + + @param name file/directory name to be committed (string or list of + strings) + @param message message for this operation (string) + @param noDialog flag indicating quiet operations (boolean) + @param commitAll flag indicating to commit all local changes (boolean) + @param amend flag indicating to amend the HEAD commit (boolean) + """ + if not noDialog: + # call CommitDialog and get message from there + if self.__commitDialog is None: + from .GitCommitDialog import GitCommitDialog + self.__commitDialog = GitCommitDialog(self, message, amend, + commitAll, self.__ui) + self.__commitDialog.accepted.connect(self.__vcsCommit_Step2) + self.__commitDialog.show() + self.__commitDialog.raise_() + self.__commitDialog.activateWindow() + + self.__commitData["name"] = name + self.__commitData["msg"] = message + self.__commitData["noDialog"] = noDialog + self.__commitData["all"] = commitAll + + if noDialog: + self.__vcsCommit_Step2() + + def __vcsCommit_Step2(self): + """ + Private slot performing the second step of the commit action. + """ + name = self.__commitData["name"] + msg = self.__commitData["msg"] + noDialog = self.__commitData["noDialog"] + commitAll = self.__commitData["all"] + + if not noDialog: + # check, if there are unsaved changes, that should be committed + if isinstance(name, list): + nameList = name + else: + nameList = [name] + ok = True + for nam in nameList: + # check for commit of the project + if os.path.isdir(nam): + project = e5App().getObject("Project") + if nam == project.getProjectPath(): + ok &= \ + project.checkAllScriptsDirty( + reportSyntaxErrors=True) and \ + project.checkDirty() + continue + elif os.path.isfile(nam): + editor = \ + e5App().getObject("ViewManager").getOpenEditor(nam) + if editor: + ok &= editor.checkDirty() + if not ok: + break + + if not ok: + res = E5MessageBox.yesNo( + self.__ui, + self.tr("Commit Changes"), + self.tr( + """The commit affects files, that have unsaved""" + """ changes. Shall the commit be continued?"""), + icon=E5MessageBox.Warning) + if not res: + return + + if self.__commitDialog is not None: + msg = self.__commitDialog.logMessage() + amend = self.__commitDialog.amend() + resetAuthor = self.__commitDialog.resetAuthor() + commitAll = not self.__commitDialog.stagedOnly() + self.__commitDialog.deleteLater() + self.__commitDialog = None + else: + amend = False + resetAuthor = False + + if not msg and not amend: + msg = '***' + + args = self.initCommand("commit") + if amend: + args.append("--amend") + if resetAuthor: + args.append("--reset-author") + if msg: + args.append("--message") + args.append(msg) + + if isinstance(name, list): + dname, fnames = self.splitPathList(name) + else: + dname, fname = self.splitPath(name) + + # find the root of the repo + repodir = dname + 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 isinstance(name, list): + args.append("--") + self.addArguments(args, fnames) + else: + if dname != repodir or fname != ".": + args.append("--") + args.append(fname) + else: + if commitAll: + args.append("--all") + + if noDialog: + self.startSynchronizedProcess(QProcess(), "git", args, dname) + else: + dia = GitDialog( + self.tr('Committing changes to Git repository'), + self) + res = dia.startProcess(args, dname) + if res: + dia.exec_() + self.committed.emit() + self.checkVCSStatus() + + def vcsUpdate(self, name, noDialog=False, revision=None): + """ + Public method used to update a file/directory with the Git + repository. + + @param name file/directory name to be updated (string or list of + strings) + @param noDialog flag indicating quiet operations (boolean) + @keyparam revision revision to update to (string) + @return flag indicating, that the update contained an add + or delete (boolean) + """ + args = self.initCommand("checkout") + if revision: + res = E5MessageBox.yesNo( + None, + self.tr("Switch"), + self.tr("""<p>Do you really want to switch to <b>{0}</b>?""" + """</p>""").format(revision), + yesDefault=True) + if not res: + return False + args.append(revision) + + if isinstance(name, list): + args.append("--") + dname, fnames = self.splitPathList(name) + self.addArguments(args, fnames) + else: + dname, fname = self.splitPath(name) + if fname != ".": + args.append("--") + args.append(fname) + + # find the root of the repo + repodir = dname + 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 False + + if noDialog: + self.startSynchronizedProcess(QProcess(), 'git', args, repodir) + res = False + else: + dia = GitDialog(self.tr( + 'Synchronizing with the Git repository'), + self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + res = dia.hasAddOrDelete() + self.checkVCSStatus() + return res + + def vcsAdd(self, name, isDir=False, noDialog=False): + """ + Public method used to add a file/directory to the Git repository. + + @param name file/directory name to be added (string) + @param isDir flag indicating name is a directory (boolean) + @param noDialog flag indicating quiet operations + """ + args = self.initCommand("add") + args.append("-v") + + if isinstance(name, list): + if isDir: + dname, fname = os.path.split(name[0]) + else: + dname, fnames = self.splitPathList(name) + else: + if isDir: + dname, fname = os.path.split(name) + else: + dname, fname = self.splitPath(name) + + # find the root of the repo + repodir = dname + 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 isinstance(name, list): + self.addArguments(args, name) + else: + args.append(name) + + if noDialog: + self.startSynchronizedProcess(QProcess(), 'git', args, repodir) + else: + dia = GitDialog( + self.tr( + 'Adding files/directories to the Git repository'), + self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + + def vcsAddBinary(self, name, isDir=False): + """ + Public method used to add a file/directory in binary mode to the + Git repository. + + @param name file/directory name to be added (string) + @param isDir flag indicating name is a directory (boolean) + """ + self.vcsAdd(name, isDir) + + def vcsAddTree(self, path): + """ + Public method to add a directory tree rooted at path to the Git + repository. + + @param path root directory of the tree to be added (string or list of + strings)) + """ + self.vcsAdd(path, isDir=False) + + def vcsRemove(self, name, project=False, noDialog=False, stageOnly=False): + """ + Public method used to remove a file/directory from the Git + repository. + + The default operation is to remove the local copy as well. + + @param name file/directory name to be removed (string or list of + strings)) + @param project flag indicating deletion of a project tree (boolean) + (not needed) + @param noDialog flag indicating quiet operations (boolean) + @param stageOnly flag indicating to just remove the file from the + staging area (boolean) + @return flag indicating successful operation (boolean) + """ + args = self.initCommand("rm") + if noDialog and '--force' not in args: + args.append('--force') + if stageOnly: + args.append('--cached') + + if isinstance(name, list): + if os.path.isdir(name[0]): + args.append("-r") + dname, fnames = self.splitPathList(name) + args.append("--") + self.addArguments(args, name) + else: + if os.path.isdir(name): + args.append("-r") + dname, fname = self.splitPath(name) + args.append("--") + args.append(name) + + # find the root of the repo + repodir = dname + 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 False + + if noDialog: + res = self.startSynchronizedProcess( + QProcess(), 'git', args, repodir) + else: + dia = GitDialog( + self.tr( + 'Removing files/directories from the Git' + ' repository'), + self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + res = dia.normalExitWithoutErrors() + + return res + + def vcsMove(self, name, project, target=None, noDialog=False): + """ + Public method used to move a file/directory. + + @param name file/directory name to be moved (string) + @param project reference to the project object + @param target new name of the file/directory (string) + @param noDialog flag indicating quiet operations + @return flag indicating successful operation (boolean) + """ + isDir = os.path.isdir(name) + + res = False + if noDialog: + if target is None: + return False + force = True + accepted = True + else: + from .GitCopyDialog import GitCopyDialog + dlg = GitCopyDialog(name, None, True) + accepted = dlg.exec_() == QDialog.Accepted + if accepted: + target, force = dlg.getData() + + if accepted: + args = self.initCommand("mv") + args.append("-v") + if force: + args.append('--force') + args.append(name) + args.append(target) + + dname, fname = self.splitPath(name) + # find the root of the repo + repodir = dname + 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 False + + if noDialog: + res = self.startSynchronizedProcess( + QProcess(), 'git', args, repodir) + else: + dia = GitDialog(self.tr('Renaming {0}').format(name), self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + res = dia.normalExit() + if res: + if target.startswith(project.getProjectPath()): + if isDir: + project.moveDirectory(name, target) + else: + project.renameFileInPdata(name, target) + else: + if isDir: + project.removeDirectory(name) + else: + project.removeFile(name) + return res + + def vcsLogBrowser(self, name, isFile=False): + """ + Public method used to browse the log of a file/directory from the + Git repository. + + @param name file/directory name to show the log of (string) + @keyparam isFile flag indicating log for a file is to be shown + (boolean) + """ + if self.logBrowser is None: + from .GitLogBrowserDialog import GitLogBrowserDialog + self.logBrowser = GitLogBrowserDialog(self) + self.logBrowser.show() + self.logBrowser.raise_() + self.logBrowser.start(name, isFile=isFile) + + def gitReflogBrowser(self, projectDir): + """ + Public method used to browse the reflog of the project. + + @param projectDir name of the project directory (string) + """ + if self.reflogBrowser is None: + from .GitReflogBrowserDialog import GitReflogBrowserDialog + self.reflogBrowser = GitReflogBrowserDialog(self) + self.reflogBrowser.show() + self.reflogBrowser.raise_() + self.reflogBrowser.start(projectDir) + + def vcsDiff(self, name): + """ + Public method used to view the difference of a file/directory to the + Git repository. + + If name is a directory and is the project directory, all project files + are saved first. If name is a file (or list of files), which is/are + being edited and has unsaved modification, they can be saved or the + operation may be aborted. + + @param name file/directory name to be diffed (string) + """ + if isinstance(name, list): + names = name[:] + else: + names = [name] + for nam in names: + if os.path.isfile(nam): + editor = e5App().getObject("ViewManager").getOpenEditor(nam) + if editor and not editor.checkDirty(): + return + else: + project = e5App().getObject("Project") + if nam == project.ppath and not project.saveAllScripts(): + return + if self.diff is None: + from .GitDiffDialog import GitDiffDialog + self.diff = GitDiffDialog(self) + self.diff.show() + self.diff.raise_() + QApplication.processEvents() + self.diff.start(name, diffMode="work2stage2repo", refreshable=True) + + def vcsStatus(self, name): + """ + Public method used to view the status of files/directories in the + Git repository. + + @param name file/directory name(s) to show the status of + (string or list of strings) + """ + if self.status is None: + from .GitStatusDialog import GitStatusDialog + self.status = GitStatusDialog(self) + self.status.show() + self.status.raise_() + self.status.start(name) + + def gitUnstage(self, name): + """ + Public method used to unstage a file/directory. + + @param name file/directory name to be reverted (string) + @return flag indicating, that the update contained an add + or delete (boolean) + """ + if isinstance(name, list): + dname, fnames = self.splitPathList(name) + else: + dname, fname = self.splitPath(name) + + # find the root of the repo + repodir = dname + 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 + + args = self.initCommand("reset") + args.append("HEAD") + args.append("--") + if isinstance(name, list): + self.addArguments(args, name) + else: + args.append(name) + + dia = GitDialog( + self.tr('Unstage files/directories'), + self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + res = dia.hasAddOrDelete() + self.checkVCSStatus() + + return res + + def gitRevert(self, name): + """ + Public method used to revert changes made to a file/directory. + + @param name file/directory name to be reverted (string) + @return flag indicating, that the update contained an add + or delete (boolean) + """ + args = self.initCommand("checkout") + args.append("--") + if isinstance(name, list): + dname, fnames = self.splitPathList(name) + self.addArguments(args, name) + names = name[:] + else: + dname, fname = self.splitPath(name) + args.append(name) + names = [name] + + # find the root of the repo + repodir = dname + 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 False + + project = e5App().getObject("Project") + names = [project.getRelativePath(nam) for nam in names] + if names[0]: + from UI.DeleteFilesConfirmationDialog import \ + DeleteFilesConfirmationDialog + dlg = DeleteFilesConfirmationDialog( + self.parent(), + self.tr("Revert changes"), + self.tr( + "Do you really want to revert all changes to these files" + " or directories?"), + names) + yes = dlg.exec_() == QDialog.Accepted + else: + yes = E5MessageBox.yesNo( + None, + self.tr("Revert changes"), + self.tr("""Do you really want to revert all changes of""" + """ the project?""")) + if yes: + dia = GitDialog(self.tr('Reverting changes'), self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + res = dia.hasAddOrDelete() + self.checkVCSStatus() + else: + res = False + + return res + + def vcsMerge(self, name): + """ + Public method used to merge a URL/revision into the local project. + + @param name file/directory name to be merged (string) + """ + dname, fname = self.splitPath(name) + + # find the root of the repo + repodir = dname + 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 + + from .GitMergeDialog import GitMergeDialog + dlg = GitMergeDialog(self.gitGetTagsList(repodir), + self.gitGetBranchesList(repodir, withMaster=True), + self.gitGetCurrentBranch(repodir), + self.gitGetBranchesList(repodir, remotes=True)) + if dlg.exec_() == QDialog.Accepted: + commit, doCommit, commitMessage, addLog, diffStat = \ + dlg.getParameters() + args = self.initCommand("merge") + if doCommit: + args.append("--commit") + args.append("-m") + args.append(commitMessage) + if addLog: + args.append("--log") + else: + args.append("--no-log") + else: + args.append("--no-commit") + if diffStat: + args.append("--stat") + else: + args.append("--no-stat") + if commit: + args.append(commit) + + dia = GitDialog(self.tr('Merging').format(name), self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + self.checkVCSStatus() + + def vcsSwitch(self, name): + """ + Public method used to switch a working directory to a different + revision. + + @param name directory name to be switched (string) + @return flag indicating, that the switch contained an add + or delete (boolean) + """ + dname, fname = self.splitPath(name) + + # find the root of the repo + repodir = dname + 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 False + + from .GitRevisionSelectionDialog import GitRevisionSelectionDialog + dlg = GitRevisionSelectionDialog( + self.gitGetTagsList(repodir), + self.gitGetBranchesList(repodir), + trackingBranchesList=self.gitGetBranchesList( + repodir, remotes=True), + noneLabel=self.tr("Master branch head")) + if dlg.exec_() == QDialog.Accepted: + rev = dlg.getRevision() + return self.vcsUpdate(name, revision=rev) + + return False + + def vcsRegisteredState(self, name): + """ + Public method used to get the registered state of a file in the vcs. + + @param name filename to check (string) + @return a combination of canBeCommited and canBeAdded + """ + if name.endswith(os.sep): + name = name[:-1] + name = os.path.normcase(name) + dname, fname = self.splitPath(name) + + if fname == '.' and os.path.isdir(os.path.join(dname, self.adminDir)): + return self.canBeCommitted + + if name in self.statusCache: + return self.statusCache[name] + + # find the root of the repo + repodir = dname + 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 0 + + args = self.initCommand("status") + args.append('--porcelain') + args.append(name) + + ioEncoding = Preferences.getSystem("IOEncoding") + 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(), + ioEncoding, 'replace') + + if output: + for line in output.splitlines(): + if line and line[0] in " MADRCU!?": + flag = line[1] + path = line[3:].split(" -> ")[-1] + absname = os.path.join(repodir, os.path.normcase(path)) + if absname.endswith(("/", "\\")): + absname = absname[:-1] + if flag not in "?!": + if fname == '.': + if absname.startswith(dname + os.path.sep): + return self.canBeCommitted + if absname == dname: + return self.canBeCommitted + else: + if absname == name: + return self.canBeCommitted + else: + return self.canBeCommitted + + return self.canBeAdded + + def vcsAllRegisteredStates(self, names, dname, shortcut=True): + """ + Public method used to get the registered states of a number of files + in the vcs. + + <b>Note:</b> If a shortcut is to be taken, the code will only check, + if the named directory has been scanned already. If so, it is assumed, + that the states for all files have been populated by the previous run. + + @param names dictionary with all filenames to be checked as keys + @param dname directory to check in (string) + @param shortcut flag indicating a shortcut should be taken (boolean) + @return the received dictionary completed with a combination of + canBeCommited and canBeAdded or None in order to signal an error + """ + if dname.endswith(os.sep): + dname = dname[:-1] + dname = os.path.normcase(dname) + + # revert the logic because git status doesn't show unchanged files + for name in names: + names[name] = self.canBeCommitted + + found = False + for name in self.statusCache: + if name in names: + found = True + names[name] = self.statusCache[name] + + if not found: + # find the root of the repo + repodir = dname + 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 names + + args = self.initCommand("status") + args.append('--porcelain') + + ioEncoding = Preferences.getSystem("IOEncoding") + output = "" + process = QProcess() + process.setWorkingDirectory(dname) + process.start('git', args) + procStarted = process.waitForStarted(5000) + if procStarted: + finished = process.waitForFinished(30000) + if finished and process.exitCode() == 0: + output = str(process.readAllStandardOutput(), + ioEncoding, 'replace') + + if output: + for line in output.splitlines(): + if line and line[0] in " MADRCU!?": + flag = line[1] + path = line[3:].split(" -> ")[-1] + name = os.path.normcase(os.path.join(repodir, path)) + dirName = os.path.dirname(name) + if name.startswith(dname): + if flag in "?!": + isDir = name.endswith(("/", "\\")) + if isDir: + name = name[:-1] + if name in names: + names[name] = self.canBeAdded + if isDir: + # it's a directory + for nname in names: + if nname.startswith(name): + names[nname] = self.canBeAdded + if flag not in "?!": + self.statusCache[name] = self.canBeCommitted + self.statusCache[dirName] = self.canBeCommitted + else: + self.statusCache[name] = self.canBeAdded + if dirName not in self.statusCache: + self.statusCache[dirName] = self.canBeAdded + + return names + + def clearStatusCache(self): + """ + Public method to clear the status cache. + """ + self.statusCache = {} + + def vcsName(self): + """ + Public method returning the name of the vcs. + + @return always 'Git' (string) + """ + return "Git" + + def vcsInitConfig(self, project): + """ + Public method to initialize the VCS configuration. + + This method ensures, that an ignore file exists. + + @param project reference to the project (Project) + """ + ppath = project.getProjectPath() + if ppath: + ignoreName = os.path.join(ppath, Git.IgnoreFileName) + if not os.path.exists(ignoreName): + self.gitCreateIgnoreFile(project.getProjectPath(), + autoAdd=True) + + def vcsCleanup(self, name): + """ + Public method used to cleanup the working directory. + + @param name directory name to be cleaned up (string) + """ + patterns = self.__plugin.getPreferences("CleanupPatterns").split() + + entries = [] + for pat in patterns: + entries.extend(Utilities.direntries(name, True, pat)) + + for entry in entries: + try: + os.remove(entry) + except OSError: + pass + + def vcsCommandLine(self, name): + """ + Public method used to execute arbitrary Git commands. + + @param name directory name of the working directory (string) + """ + from .GitCommandDialog import GitCommandDialog + dlg = GitCommandDialog(self.commandHistory, name) + if dlg.exec_() == QDialog.Accepted: + command = dlg.getData() + commandList = Utilities.parseOptionString(command) + + # This moves any previous occurrence of these arguments to the head + # of the list. + if command in self.commandHistory: + self.commandHistory.remove(command) + self.commandHistory.insert(0, command) + + args = [] + self.addArguments(args, commandList) + + # find the root of the repo + repodir = name + 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 + + dia = GitDialog(self.tr('Git Command'), self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + + def vcsOptionsDialog(self, project, archive, editable=False, parent=None): + """ + Public method to get a dialog to enter repository info. + + @param project reference to the project object + @param archive name of the project in the repository (string) + @param editable flag indicating that the project name is editable + (boolean) + @param parent parent widget (QWidget) + @return reference to the instantiated options dialog (GitOptionsDialog) + """ + from .GitOptionsDialog import GitOptionsDialog + return GitOptionsDialog(self, project, parent) + + def vcsNewProjectOptionsDialog(self, parent=None): + """ + Public method to get a dialog to enter repository info for getting a + new project. + + @param parent parent widget (QWidget) + @return reference to the instantiated options dialog + (GitNewProjectOptionsDialog) + """ + from .GitNewProjectOptionsDialog import GitNewProjectOptionsDialog + return GitNewProjectOptionsDialog(self, parent) + + def vcsRepositoryInfos(self, ppath): + """ + Public method to retrieve information about the repository. + + @param ppath local path to get the repository infos (string) + @return string with ready formated info for display (string) + """ + formatTemplate = ( + 'format:' + '%h%n' + '%p%n' + '%an%n' + '%ae%n' + '%ai%n' + '%cn%n' + '%ce%n' + '%ci%n' + '%d%n' + '%s') + + args = self.initCommand("show") + args.append("--abbrev-commit") + args.append("--abbrev={0}".format( + self.__plugin.getPreferences("CommitIdLength"))) + args.append("--format={0}".format(formatTemplate)) + args.append("--no-patch") + args.append("HEAD") + + output = "" + process = QProcess() + process.setWorkingDirectory(ppath) + 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') + + if output: + info = [] + (commit, parents, author, authorMail, authorDate, + committer, committerMail, committerDate, refs, subject) = \ + output.splitlines() + tags = [] + branches = [] + for name in refs.strip()[1:-1].split(","): + name = name.strip() + if name: + if name.startswith("tag: "): + tags.append(name.split()[1]) + elif name != "HEAD": + branches.append(name) + + info.append(self.tr( + "<tr><td><b>Commit</b></td><td>{0}</td></tr>").format( + commit)) + if parents: + info.append(self.tr( + "<tr><td><b>Parents</b></td><td>{0}</td></tr>").format( + '<br/>'.join(parents.strip().split()))) + if tags: + info.append(self.tr( + "<tr><td><b>Tags</b></td><td>{0}</td></tr>").format( + '<br/>'.join(tags))) + if branches: + info.append(self.tr( + "<tr><td><b>Branches</b></td><td>{0}</td></tr>").format( + '<br/>'.join(branches))) + info.append(self.tr( + "<tr><td><b>Author</b></td><td>{0} <{1}></td></tr>") + .format(author, authorMail)) + info.append(self.tr( + "<tr><td><b>Date</b></td><td>{0}</td></tr>").format( + authorDate.rsplit(":", 1)[0])) + info.append(self.tr( + "<tr><td><b>Committer</b></td><td>{0} <{1}></td></tr>") + .format(committer, committerMail)) + info.append(self.tr( + "<tr><td><b>Committed Date</b></td><td>{0}</td></tr>").format( + committerDate.rsplit(":", 1)[0])) + info.append(self.tr( + "<tr><td><b>Subject</b></td><td>{0}</td></tr>").format( + subject)) + infoStr = "\n".join(info) + else: + infoStr = "" + + return self.tr( + """<h3>Repository information</h3>\n""" + """<p><table>\n""" + """<tr><td><b>Git V.</b></td><td>{0}</td></tr>\n""" + """<tr></tr>\n""" + """{1}""" + """</table></p>\n""" + ).format(self.versionStr, infoStr) + + def vcsSupportCommandOptions(self): + """ + Public method to signal the support of user settable command options. + + @return flag indicating the support of user settable command options + (boolean) + """ + return False + + ########################################################################### + ## Git specific methods are below. + ########################################################################### + + def gitNormalizeURL(self, url): + """ + Public method to normalize a url for Git. + + @param url url string (string) + @return properly normalized url for git (string) + """ + url = url.replace('\\', '/') + if url.endswith('/'): + url = url[:-1] + urll = url.split('//') + return "{0}//{1}".format(urll[0], '/'.join(urll[1:])) + + def gitCreateIgnoreFile(self, name, autoAdd=False): + """ + Public method to create the ignore file. + + @param name directory name to create the ignore file in (string) + @param autoAdd flag indicating to add it automatically (boolean) + @return flag indicating success + """ + status = False + ignorePatterns = [ + ".eric6project/", + "_eric6project/", + ".eric5project/", + "_eric5project/", + ".eric4project/", + "_eric4project/", + ".ropeproject/", + "_ropeproject/", + ".directory/", + "*.pyc", + "*.pyo", + "*.orig", + "*.bak", + "*.rej", + "*~", + "cur/", + "tmp/", + "__pycache__/", + "*.DS_Store", + ] + + ignoreName = os.path.join(name, Git.IgnoreFileName) + if os.path.exists(ignoreName): + res = E5MessageBox.yesNo( + self.__ui, + self.tr("Create {0} file").format(ignoreName), + self.tr("""<p>The file <b>{0}</b> exists already.""" + """ Overwrite it?</p>""").format(ignoreName), + icon=E5MessageBox.Warning) + else: + res = True + if res: + try: + # create a .gitignore file + ignore = open(ignoreName, "w") + ignore.write("\n".join(ignorePatterns)) + ignore.write("\n") + ignore.close() + status = True + except IOError: + status = False + + if status and autoAdd: + self.vcsAdd(ignoreName, noDialog=True) + project = e5App().getObject("Project") + project.appendFile(ignoreName) + + return status + + def gitCopy(self, name, project): + """ + Public method used to copy a file/directory. + + @param name file/directory name to be copied (string) + @param project reference to the project object + @return flag indicating successful operation (boolean) + """ + from .GitCopyDialog import GitCopyDialog + dlg = GitCopyDialog(name) + if dlg.exec_() == QDialog.Accepted: + target, force = dlg.getData() + + # step 1: copy the file/directory: + if os.path.isdir(name): + try: + shutil.copytree(name, target) + except (OSError, shutil.Error) as why: + E5MessageBox.critical( + self, + self.tr("Git Copy"), + self.tr("""<p>Copying the directory <b>{0}</b>""" + """ failed.</p><p>Reason: {1}</p>""").format( + name, str(why))) + return False + self.vcsAdd(target, isDir=True) + if target.startswith(project.getProjectPath()): + project.copyDirectory(name, target) + + else: + try: + shutil.copy2(name, target) + except (OSError, shutil.Error) as why: + E5MessageBox.critical( + self, + self.tr("Git Copy"), + self.tr("""<p>Copying the file <b>{0}</b>""" + """ failed.</p><p>Reason: {1}</p>""").format( + name, str(why))) + return False + self.vcsAdd(target, isDir=False) + if target.startswith(project.getProjectPath()): + project.appendFile(target) + self.checkVCSStatus() + return True + + def gitBlame(self, name): + """ + Public method to show the output of the git blame command. + + @param name file name to show the annotations for (string) + """ + if self.blame is None: + from .GitBlameDialog import GitBlameDialog + self.blame = GitBlameDialog(self) + self.blame.show() + self.blame.raise_() + self.blame.start(name) + + def gitExtendedDiff(self, name): + """ + Public method used to view the difference of a file/directory to the + Git repository. + + If name is a directory and is the project directory, all project files + are saved first. If name is a file (or list of files), which is/are + being edited and has unsaved modification, they can be saved or the + operation may be aborted. + + This method gives the chance to enter the revisions to be compared. + + @param name file/directory name to be diffed (string) + """ + if isinstance(name, list): + dname, fnames = self.splitPathList(name) + names = name[:] + else: + dname, fname = self.splitPath(name) + names = [name] + for nam in names: + if os.path.isfile(nam): + editor = e5App().getObject("ViewManager").getOpenEditor(nam) + if editor and not editor.checkDirty(): + return + else: + project = e5App().getObject("Project") + if nam == project.ppath and not project.saveAllScripts(): + return + + # find the root of the repo + repodir = dname + 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 + + from .GitRevisionsSelectionDialog import GitRevisionsSelectionDialog + dlg = GitRevisionsSelectionDialog(self.gitGetTagsList(repodir), + self.gitGetBranchesList(repodir)) + if dlg.exec_() == QDialog.Accepted: + revisions = dlg.getRevisions() + if self.diff is None: + from .GitDiffDialog import GitDiffDialog + self.diff = GitDiffDialog(self) + self.diff.show() + self.diff.raise_() + self.diff.start(name, revisions) + + def __gitGetFileForRevision(self, name, rev=""): + """ + Private method to get a file for a specific revision from the + repository. + + @param name file name to get from the repository (string) + @keyparam rev revision to retrieve (string) + @return contents of the file (string) and an error message (string) + """ + # find the root of the repo + repodir = self.splitPath(name)[0] + 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 + + args = self.initCommand("cat-file") + args.append("blob") + args.append("{0}:{1}".format(rev, name.replace(repodir + os.sep, ""))) + + output = "" + error = "" + + process = QProcess() + process.setWorkingDirectory(repodir) + process.start('git', args) + procStarted = process.waitForStarted(5000) + if procStarted: + finished = process.waitForFinished(30000) + if finished: + if process.exitCode() == 0: + output = str(process.readAllStandardOutput(), + Preferences.getSystem("IOEncoding"), + 'replace') + else: + error = str(process.readAllStandardError(), + Preferences.getSystem("IOEncoding"), + 'replace') + else: + error = self.tr( + "The git process did not finish within 30s.") + else: + error = self.tr( + 'The process {0} could not be started. ' + 'Ensure, that it is in the search path.').format('git') + + # return file contents with 'universal newlines' + return output.replace('\r\n', '\n').replace('\r', '\n'), error + + def gitSbsDiff(self, name, extended=False, revisions=None): + """ + Public method used to view the difference of a file to the Git + repository side-by-side. + + @param name file name to be diffed (string) + @keyparam extended flag indicating the extended variant (boolean) + @keyparam revisions tuple of two revisions (tuple of strings) + @exception ValueError raised to indicate an invalid name parameter + """ + if isinstance(name, list): + raise ValueError("Wrong parameter type") + + if extended: + # find the root of the repo + repodir = self.splitPath(name)[0] + 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 + + from .GitRevisionsSelectionDialog import \ + GitRevisionsSelectionDialog + dlg = GitRevisionsSelectionDialog(self.gitGetTagsList(repodir), + self.gitGetBranchesList(repodir)) + if dlg.exec_() == QDialog.Accepted: + rev1, rev2 = dlg.getRevisions() + elif revisions: + rev1, rev2 = revisions[0], revisions[1] + else: + rev1, rev2 = "", "" + + output1, error = self.__gitGetFileForRevision(name, rev=rev1) + if error: + E5MessageBox.critical( + self.__ui, + self.tr("Git Side-by-Side Difference"), + error) + return + name1 = "{0} (rev. {1})".format(name, rev1 and rev1 or "Stage") + + if rev2: + if rev2 == "Stage": + rev2 = "" + output2, error = self.__gitGetFileForRevision(name, rev=rev2) + if error: + E5MessageBox.critical( + self.__ui, + self.tr("Git Side-by-Side Difference"), + error) + return + name2 = "{0} (rev. {1})".format(name, rev2) + else: + try: + f1 = open(name, "r", encoding="utf-8") + output2 = f1.read() + f1.close() + name2 = "{0} (Work)".format(name) + except IOError: + E5MessageBox.critical( + self.__ui, + self.tr("Git Side-by-Side Difference"), + self.tr( + """<p>The file <b>{0}</b> could not be read.</p>""") + .format(name)) + return + + if self.sbsDiff is None: + from UI.CompareDialog import CompareDialog + self.sbsDiff = CompareDialog() + self.sbsDiff.show() + self.sbsDiff.raise_() + self.sbsDiff.compare(output1, output2, name1, name2) + + def gitFetch(self, name): + """ + Public method to fetch changes from a remote repository. + + @param name directory name (string) + """ + # find the root of the repo + repodir = self.splitPath(name)[0] + 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 + + from .GitFetchDialog import GitFetchDialog + dlg = GitFetchDialog(self, repodir) + if dlg.exec_() == QDialog.Accepted: + (remote, url, remoteBranches, localBranch, fetchAll, prune, + includeTags) = dlg.getData() + + args = self.initCommand("fetch") + args.append('--verbose') + if prune: + args.append('--prune') + if includeTags: + args.append("--tags") + if fetchAll: + args.append('--all') + else: + args.append(remote) if remote else args.append(url) + if len(remoteBranches) == 1 and localBranch: + args.append(remoteBranches[0] + ":" + localBranch) + else: + args.extend(remoteBranches) + + dia = GitDialog(self.tr('Fetching from a remote Git repository'), + self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + self.checkVCSStatus() + + def gitPull(self, name): + """ + Public method used to pull changes from a remote Git repository. + + @param name directory name of the project to be pulled to (string) + @return flag indicating, that the update contained an add + or delete (boolean) + """ + # find the root of the repo + repodir = self.splitPath(name)[0] + 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 False + + from .GitPullDialog import GitPullDialog + dlg = GitPullDialog(self, repodir) + if dlg.exec_() == QDialog.Accepted: + remote, url, branches, pullAll, prune = dlg.getData() + + args = self.initCommand('pull') + args.append('--no-commit') + args.append('--verbose') + if prune: + args.append('--prune') + if pullAll: + args.append('--all') + else: + args.append(remote) if remote else args.append(url) + args.extend(branches) + + dia = GitDialog(self.tr('Pulling from a remote Git repository'), + self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + res = dia.hasAddOrDelete() + self.checkVCSStatus() + return res + else: + return False + + def gitPush(self, name): + """ + Public method used to push changes to a remote Git repository. + + @param name directory name of the project to be pushed from (string) + """ + # find the root of the repo + repodir = self.splitPath(name)[0] + 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 + + from .GitPushDialog import GitPushDialog + dlg = GitPushDialog(self, repodir) + if dlg.exec_() == QDialog.Accepted: + remote, refspecs, tags, tracking, submodule = dlg.getData() + + args = self.initCommand("push") + args.append('--verbose') + args.append('--porcelain') + if tags: + args.append("--tags") + if tracking: + args.append("--set-upstream") + if submodule: + args.append("--recurse-submodules={0}".format(submodule)) + args.append(remote) + args.extend(refspecs) + + dia = GitDialog( + self.tr('Pushing to a remote Git repository'), self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + self.checkVCSStatus() + + def gitCommitMerge(self, name): + """ + Public method to commit a failed merge. + + @param name file/directory name (string) + """ + dname, fname = self.splitPath(name) + + # find the root of the repo + repodir = dname + 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 + + import sys + editor = sys.argv[0].replace(".py", "_editor.py") + env = {"GIT_EDITOR": "{0} {1}".format(sys.executable, editor)} + + args = self.initCommand("commit") + + dia = GitDialog(self.tr('Committing failed merge'), self) + res = dia.startProcess(args, repodir, environment=env) + if res: + dia.exec_() + self.committed.emit() + self.checkVCSStatus() + + def gitCancelMerge(self, name): + """ + Public method to cancel an uncommitted or failed merge. + + @param name file/directory name (string) + @return flag indicating, that the cancellation contained an add + or delete (boolean) + """ + dname, fname = self.splitPath(name) + + # find the root of the repo + repodir = dname + 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 + + args = self.initCommand("merge") + args.append("--abort") + + dia = GitDialog( + self.tr('Aborting uncommitted/failed merge'), + self) + res = dia.startProcess(args, repodir, False) + if res: + dia.exec_() + res = dia.hasAddOrDelete() + self.checkVCSStatus() + return res + + def gitApply(self, repodir, patchFile, cached=False, reverse=False, + noDialog=False): + """ + Public method to apply a patch stored in a given file. + + @param repodir directory name of the repository (string) + @param patchFile name of the patch file (string) + @param cached flag indicating to apply the patch to the staging area + (boolean) + @param reverse flag indicating to apply the patch in reverse (boolean) + @param noDialog flag indicating quiet operations (boolean) + """ + args = self.initCommand("apply") + if cached: + args.append("--index") + args.append("--cached") + if reverse: + args.append("--reverse") + args.append(patchFile) + + if noDialog: + self.startSynchronizedProcess(QProcess(), "git", args, repodir) + else: + dia = GitDialog( + self.tr('Applying patch'), + self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + + def gitApplyCheckPatches(self, projectDir, check=False): + """ + Public method to apply a list of patch files or check, if they would + apply cleanly. + + @param projectDir directory name of the project (string) + @param check flag indicating to perform a check operation (boolean) + """ + # 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 + + from .GitPatchFilesDialog import GitPatchFilesDialog + dlg = GitPatchFilesDialog(repodir, self.__patchCheckData) + if dlg.exec_() == QDialog.Accepted: + patchFilesList, stripCount, inaccurateEof, recount = dlg.getData() + if patchFilesList: + args = self.initCommand("apply") + if check: + args.append("--check") + self.__patchCheckData = ( + patchFilesList, stripCount, inaccurateEof, recount) + title = self.tr('Check patch files') + else: + self.__patchCheckData = None + title = self.tr('Apply patch files') + if inaccurateEof: + args.append("--inaccurate-eof") + if recount: + args.append("--recount") + args.append("-p{0}".format(stripCount)) + args.extend(patchFilesList) + + dia = GitDialog( + title, + self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + if not check: + self.checkVCSStatus() + + def gitShowPatchesStatistics(self, projectDir): + """ + Public method to show statistics for a set of patch files. + + @param projectDir directory name of the project (string) + """ + if self.patchStatisticsDialog is None: + from .GitPatchStatisticsDialog import GitPatchStatisticsDialog + self.patchStatisticsDialog = GitPatchStatisticsDialog(self) + self.patchStatisticsDialog.show() + self.patchStatisticsDialog.raise_() + self.patchStatisticsDialog.start(projectDir, self.__patchCheckData) + self.__patchCheckData = self.patchStatisticsDialog.getData() + + ########################################################################### + ## Methods for tag handling. + ########################################################################### + + def vcsTag(self, name, revision=None, tagName=None): + """ + Public method used to set/remove a tag in the Git repository. + + @param name file/directory name to determine the repo root from + (string) + @param revision revision to set tag for (string) + @param tagName name of the tag (string) + @return flag indicating a performed tag action (boolean) + """ + dname, fname = self.splitPath(name) + + # find the root of the repo + repodir = dname + 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 + + from .GitTagDialog import GitTagDialog + dlg = GitTagDialog(self.gitGetTagsList(repodir), revision, tagName) + if dlg.exec_() == QDialog.Accepted: + tag, revision, tagOp, tagType, force = dlg.getParameters() + else: + return False + + args = self.initCommand("tag") + if tagOp == GitTagDialog.CreateTag: + msg = "Created tag <{0}>.".format(tag) + if tagType == GitTagDialog.AnnotatedTag: + args.append("--annotate") + args.append("--message={0}".format(msg)) + elif tagType == GitTagDialog.SignedTag: + args.append("--sign") + args.append("--message={0}".format(msg)) + if force: + args.append("--force") + elif tagOp == GitTagDialog.DeleteTag: + args.append("--delete") + elif tagOp == GitTagDialog.VerifyTag: + args.append("--verify") + else: + return False + args.append(tag) + if tagOp == GitTagDialog.CreateTag and revision: + args.append(revision) + + dia = GitDialog(self.tr('Tagging in the Git repository'), + self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + + return True + + def gitGetTagsList(self, repodir, withType=False): + """ + Public method to get the list of tags. + + @param repodir directory name of the repository (string) + @param withType flag indicating to get the tag type as well (boolean) + @return list of tags (list of string) or list of tuples of + tag name and flag indicating a local tag (list of tuple of string + and boolean), if withType is True + """ + args = self.initCommand("tag") + args.append('--list') + + 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') + + tagsList = [] + if output: + for line in output.splitlines(): + name = line.strip() + tagsList.append(name) + + return tagsList + + def gitListTagBranch(self, path, tags=True, listAll=True, merged=True): + """ + Public method used to list the available tags or branches. + + @param path directory name of the project (string) + @param tags flag indicating listing of branches or tags + (False = branches, True = tags) + @param listAll flag indicating to show all tags or branches (boolean) + @param merged flag indicating to show only merged or non-merged + branches (boolean) + """ + if self.tagbranchList is None: + from .GitTagBranchListDialog import GitTagBranchListDialog + self.tagbranchList = GitTagBranchListDialog(self) + self.tagbranchList.show() + self.tagbranchList.raise_() + if tags: + self.tagbranchList.start(path, tags) + else: + self.tagbranchList.start(path, tags, listAll, merged) + + ########################################################################### + ## Methods for branch handling. + ########################################################################### + + def gitGetBranchesList(self, repodir, withMaster=False, allBranches=False, + remotes=False): + """ + Public method to get the list of branches. + + @param repodir directory name of the repository (string) + @param withMaster flag indicating to get 'master' as well (boolean) + @param allBranches flag indicating to return all branches (boolean) + @param remotes flag indicating to return remote branches only (boolean) + @return list of branches (list of string) + """ + args = self.initCommand("branch") + args.append('--list') + if allBranches: + args.append("--all") + elif remotes: + args.append("--remotes") + + 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') + + branchesList = [] + if output: + for line in output.splitlines(): + name = line[2:].strip() + if ( + (name != "master" or withMaster) and + "->" not in name and + not name.startswith("(") and + not name.endswith(")") + ): + branchesList.append(name) + + return branchesList + + def gitGetCurrentBranch(self, repodir): + """ + Public method used to show the current branch of the working directory. + + @param repodir directory name of the repository (string) + @return name of the current branch (string) + """ + args = self.initCommand("branch") + args.append('--list') + + branchName = "" + 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') + + if output: + for line in output.splitlines(): + if line.startswith("* "): + branchName = line[2:].strip() + if branchName.startswith("(") and branchName.endswith(")"): + # not a valid branch name, probably detached head + branchName = "" + break + + return branchName + + def gitBranch(self, name, revision=None, branchName=None, branchOp=None): + """ + Public method used to create, delete or move a branch in the Git + repository. + + @param name file/directory name to be branched (string) + @param revision revision to set tag for (string) + @param branchName name of the branch (string) + @param branchOp desired branch operation (integer) + @return flag indicating a performed branch action (boolean) and + a flag indicating, that the branch operation contained an add + or delete (boolean) + """ + dname, fname = self.splitPath(name) + + # find the root of the repo + repodir = dname + 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 False, False + + from .GitBranchDialog import GitBranchDialog + dlg = GitBranchDialog( + self.gitGetBranchesList(repodir, allBranches=True), + revision, branchName, branchOp) + if dlg.exec_() == QDialog.Accepted: + branchOp, branch, revision, newBranch, remoteBranch, force = \ + dlg.getParameters() + else: + return False, False + + if branchOp in [GitBranchDialog.CreateBranch, + GitBranchDialog.DeleteBranch, + GitBranchDialog.RenameBranch, + GitBranchDialog.SetTrackingBranch, + GitBranchDialog.UnsetTrackingBranch]: + args = self.initCommand("branch") + if branchOp == GitBranchDialog.CreateBranch: + if force: + args.append("--force") + args.append(branch) + if revision: + args.append(revision) + elif branchOp == GitBranchDialog.DeleteBranch: + if force: + args.append("-D") + else: + args.append("-d") + args.append(branch) + elif branchOp == GitBranchDialog.RenameBranch: + if force: + args.append("-M") + else: + args.append("-m") + args.append(branch) + args.append(newBranch) + elif branchOp == GitBranchDialog.SetTrackingBranch: + args.append("--set-upstream-to={0}".format(remoteBranch)) + if branch: + args.append(branch) + elif branchOp == GitBranchDialog.UnsetTrackingBranch: + args.append("--unset-upstream") + if branch: + args.append(branch) + elif branchOp in [GitBranchDialog.CreateSwitchBranch, + GitBranchDialog.CreateTrackingBranch]: + args = self.initCommand("checkout") + if branchOp == GitBranchDialog.CreateSwitchBranch: + if force: + args.append("-B") + else: + args.append("-b") + args.append(branch) + if revision: + args.append(revision) + elif branchOp == GitBranchDialog.CreateTrackingBranch: + args.append("--track") + args.append(branch) + else: + return False, False + + dia = GitDialog(self.tr('Branching in the Git repository'), + self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + if branchOp in [GitBranchDialog.CreateSwitchBranch, + GitBranchDialog.CreateTrackingBranch]: + update = dia.hasAddOrDelete() + self.checkVCSStatus() + else: + update = False + + return True, update + + def gitDeleteRemoteBranch(self, name): + """ + Public method to delete a branch from a remote repository. + + @param name file/directory name (string) + """ + dname, fname = self.splitPath(name) + + # find the root of the repo + repodir = dname + 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 + + from .GitBranchPushDialog import GitBranchPushDialog + dlg = GitBranchPushDialog(self.gitGetBranchesList(repodir), + self.gitGetRemotesList(repodir), + delete=True) + if dlg.exec_() == QDialog.Accepted: + branchName, remoteName = dlg.getData()[:2] + + args = self.initCommand("push") + args.append(remoteName) + args.append(":{0}".format(branchName)) + + dia = GitDialog(self.tr('Delete Remote Branch'), self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + + def gitShowBranch(self, name): + """ + Public method used to show the current branch of the working directory. + + @param name file/directory name (string) + """ + dname, fname = self.splitPath(name) + + # find the root of the repo + repodir = dname + 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 + + branchName = self.gitGetCurrentBranch(repodir) + E5MessageBox.information( + None, + self.tr("Current Branch"), + self.tr("""<p>The current branch is <b>{0}</b>.""" + """</p>""").format(branchName)) + + ########################################################################### + ## Methods for bundles handling. + ########################################################################### + + def gitBundle(self, projectDir): + """ + Public method to create a bundle file. + + @param projectDir name of the project directory (string) + """ + # 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 + + from .GitBundleDialog import GitBundleDialog + dlg = GitBundleDialog(self.gitGetTagsList(repodir), + self.gitGetBranchesList(repodir)) + if dlg.exec_() == QDialog.Accepted: + revs = dlg.getData() + + fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter( + None, + self.tr("Create Bundle"), + self.__lastBundlePath or repodir, + self.tr("Git Bundle Files (*.bundle)"), + None, + E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite)) + + if not fname: + return # user aborted + + ext = QFileInfo(fname).suffix() + if not ext: + ex = selectedFilter.split("(*")[1].split(")")[0] + if ex: + fname += ex + if QFileInfo(fname).exists(): + res = E5MessageBox.yesNo( + self.__ui, + self.tr("Create Bundle"), + self.tr("<p>The Git bundle file <b>{0}</b> " + "already exists. Overwrite it?</p>") + .format(fname), + icon=E5MessageBox.Warning) + if not res: + return + fname = Utilities.toNativeSeparators(fname) + self.__lastBundlePath = os.path.dirname(fname) + + args = self.initCommand("bundle") + args.append("create") + args.append(fname) + for rev in revs: + args.append(rev) + + dia = GitDialog(self.tr('Create Bundle'), self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + + def gitVerifyBundle(self, projectDir): + """ + Public method to verify a bundle file. + + @param projectDir name of the project directory (string) + """ + # 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 + + fname = E5FileDialog.getOpenFileName( + None, + self.tr("Verify Bundle"), + self.__lastBundlePath or repodir, + self.tr("Git Bundle Files (*.bundle);;All Files (*)")) + if fname: + self.__lastBundlePath = os.path.dirname(fname) + + args = self.initCommand("bundle") + args.append("verify") + args.append(fname) + + dia = GitDialog(self.tr('Verify Bundle'), self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + + def gitBundleListHeads(self, projectDir): + """ + Public method to list the heads contained in a bundle file. + + @param projectDir name of the project directory (string) + """ + # 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 + + fname = E5FileDialog.getOpenFileName( + None, + self.tr("List Bundle Heads"), + self.__lastBundlePath or repodir, + self.tr("Git Bundle Files (*.bundle);;All Files (*)")) + if fname: + self.__lastBundlePath = os.path.dirname(fname) + + args = self.initCommand("bundle") + args.append("list-heads") + args.append(fname) + + dia = GitDialog(self.tr('List Bundle Heads'), self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + + def gitGetBundleHeads(self, repodir, bundleFile): + """ + Public method to get a list of heads contained in a bundle file. + + @param repodir directory name of the repository (string) + @param bundleFile file name of a git bundle file (string) + @return list of heads (list of strings) + """ + args = self.initCommand("bundle") + args.append("list-heads") + args.append(bundleFile) + + 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') + + heads = [] + if output: + for line in output.splitlines(): + head = line.strip().split(None, 1)[1] # commit id, head + heads.append(head.replace("refs/heads/", "")) + + return heads + + def gitBundleFetch(self, projectDir): + """ + Public method to fetch a head of a bundle file into the local + repository. + + @param projectDir name of the project directory (string) + """ + # 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 + + fname = E5FileDialog.getOpenFileName( + None, + self.tr("Apply Bundle"), + self.__lastBundlePath or repodir, + self.tr("Git Bundle Files (*.bundle);;All Files (*)")) + if fname: + self.__lastBundlePath = os.path.dirname(fname) + + from .GitApplyBundleDataDialog import GitApplyBundleDataDialog + dlg = GitApplyBundleDataDialog( + self.gitGetBundleHeads(repodir, fname), + self.gitGetBranchesList(repodir)) + if dlg.exec_() == QDialog.Accepted: + bundleHead, branch = dlg.getData() + + args = self.initCommand("fetch") + args.append('--verbose') + args.append(fname) + if branch: + args.append(bundleHead + ":" + branch) + else: + args.append(bundleHead) + + dia = GitDialog(self.tr('Applying a bundle file (fetch)'), + self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + res = dia.hasAddOrDelete() + self.checkVCSStatus() + + def gitBundlePull(self, projectDir): + """ + Public method to pull a head of a bundle file into the local + repository and working area. + + @param projectDir name of the project directory (string) + @return flag indicating, that the update contained an add + or delete (boolean) + """ + # 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 False + + res = False + fname = E5FileDialog.getOpenFileName( + None, + self.tr("Apply Bundle"), + self.__lastBundlePath or repodir, + self.tr("Git Bundle Files (*.bundle);;All Files (*)")) + if fname: + self.__lastBundlePath = os.path.dirname(fname) + + from .GitApplyBundleDataDialog import GitApplyBundleDataDialog + dlg = GitApplyBundleDataDialog( + self.gitGetBundleHeads(repodir, fname), + self.gitGetBranchesList(repodir)) + if dlg.exec_() == QDialog.Accepted: + bundleHead, branch = dlg.getData() + + args = self.initCommand("pull") + args.append('--verbose') + args.append(fname) + if branch: + args.append(bundleHead + ":" + branch) + else: + args.append(bundleHead) + + dia = GitDialog(self.tr('Applying a bundle file (fetch)'), + self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + res = dia.hasAddOrDelete() + self.checkVCSStatus() + + return res + + ########################################################################### + ## Methods for bisect handling. + ########################################################################### + + def gitBisect(self, projectDir, subcommand): + """ + Public method to perform bisect commands. + + @param projectDir name of the project directory (string) + @param subcommand name of the subcommand (string, one of 'start', + 'start_extended', 'good', 'bad', 'skip' or 'reset') + @return flag indicating, that the update contained an add + or delete (boolean) + @exception ValueError raised to indicate an invalid bisect subcommand + """ + if subcommand not in ("start", "start_extended", "good", "bad", + "skip", "reset"): + raise ValueError( + self.tr("Bisect subcommand ({0}) invalid.") + .format(subcommand)) + + # 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 False + + res = False + rev = "" + if subcommand in ("good", "bad", "skip", "reset"): + showBranches = subcommand == "reset" + showHead = subcommand == "reset" + from .GitRevisionSelectionDialog import GitRevisionSelectionDialog + dlg = GitRevisionSelectionDialog(self.gitGetTagsList(repodir), + self.gitGetBranchesList(repodir), + showBranches=showBranches, + showHead=showHead) + if dlg.exec_() == QDialog.Accepted: + rev = dlg.getRevision() + else: + return False + + args = self.initCommand("bisect") + if subcommand == "start_extended": + from .GitBisectStartDialog import GitBisectStartDialog + dlg = GitBisectStartDialog() + if dlg.exec_() == QDialog.Accepted: + bad, good, noCheckout = dlg.getData() + args.append("start") + if noCheckout: + args.append("--no-checkout") + args.append(bad) + args.extend(good) + args.append("--") + else: + return False + else: + args.append(subcommand) + if rev: + args.extend(rev.split()) + # treat rev as a list separated by whitespace + + dia = GitDialog( + self.tr('Git Bisect ({0})').format(subcommand), self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + res = dia.hasAddOrDelete() + self.checkVCSStatus() + + return res + + def gitBisectLogBrowser(self, projectDir): + """ + Public method used to browse the bisect log of the project. + + @param projectDir name of the project directory (string) + """ + if self.bisectlogBrowser is None: + from .GitBisectLogBrowserDialog import GitBisectLogBrowserDialog + self.bisectlogBrowser = GitBisectLogBrowserDialog(self) + self.bisectlogBrowser.show() + self.bisectlogBrowser.raise_() + self.bisectlogBrowser.start(projectDir) + + def gitBisectCreateReplayFile(self, projectDir): + """ + Public method used to create a bisect replay file for the project. + + @param projectDir name of the project directory (string) + """ + # 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 + + args = self.initCommand("bisect") + args.append("log") + + 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') + else: + E5MessageBox.critical( + self, + self.tr('Process Generation Error'), + self.tr( + 'The process {0} could not be started. ' + 'Ensure, that it is in the search path.' + ).format('git')) + return + + if output: + fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter( + None, + self.tr("Create Bisect Replay File"), + self.__lastBundlePath or repodir, + self.tr("Git Bisect Replay Files (*.replay)"), + None, + E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite)) + + if not fname: + return # user aborted + + ext = QFileInfo(fname).suffix() + if not ext: + ex = selectedFilter.split("(*")[1].split(")")[0] + if ex: + fname += ex + if QFileInfo(fname).exists(): + res = E5MessageBox.yesNo( + self.__ui, + self.tr("Create Bisect Replay File"), + self.tr("<p>The Git bisect replay file <b>{0}</b> " + "already exists. Overwrite it?</p>") + .format(fname), + icon=E5MessageBox.Warning) + if not res: + return + fname = Utilities.toNativeSeparators(fname) + self.__lastReplayPath = os.path.dirname(fname) + + try: + f = open(fname, "w") + f.write(output) + f.close() + except (OSError, IOError) as err: + E5MessageBox.critical( + self.__ui, + self.tr("Create Bisect Replay File"), + self.tr( + """<p>The file <b>{0}</b> could not be written.</p>""" + """<p>Reason: {1}</p>""") + .format(fname, str(err))) + + def gitBisectEditReplayFile(self, projectDir): + """ + Public method used to edit a bisect replay file. + + @param projectDir name of the project directory (string) + """ + # 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 + + fname = E5FileDialog.getOpenFileName( + None, + self.tr("Edit Bisect Replay File"), + self.__lastReplayPath or repodir, + self.tr("Git Bisect Replay Files (*.replay);;All Files (*)")) + if fname: + self.__lastReplayPath = os.path.dirname(fname) + + self.bisectReplayEditor = MiniEditor(fname) + self.bisectReplayEditor.show() + + def gitBisectReplay(self, projectDir): + """ + Public method to replay a bisect session. + + @param projectDir name of the project directory (string) + @return flag indicating, that the update contained an add + or delete (boolean) + """ + # 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 False + + res = False + fname = E5FileDialog.getOpenFileName( + None, + self.tr("Bisect Replay"), + self.__lastReplayPath or repodir, + self.tr("Git Bisect Replay Files (*.replay);;All Files (*)")) + if fname: + self.__lastReplayPath = os.path.dirname(fname) + + args = self.initCommand("bisect") + args.append("replay") + args.append(fname) + + dia = GitDialog( + self.tr('Git Bisect ({0})').format("replay"), self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + res = dia.hasAddOrDelete() + self.checkVCSStatus() + + return res + + ########################################################################### + ## Methods for remotes handling. + ########################################################################### + + def gitGetRemotesList(self, repodir): + """ + Public method to get the list of remote repos. + + @param repodir directory name of the repository (string) + @return list of remote repos (list of string) + """ + args = self.initCommand("remote") + + 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') + + remotesList = [] + if output: + for line in output.splitlines(): + name = line.strip() + remotesList.append(name) + + return remotesList + + def gitGetRemoteUrlsList(self, repodir, forFetch=True): + """ + Public method to get the list of remote repos and their URLs. + + @param repodir directory name of the repository (string) + @param forFetch flag indicating to get Fetch info (string) + @return list of tuples of remote repo name and repo URL (list of + tuple of two strings) + """ + args = self.initCommand("remote") + args.append("--verbose") + + 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') + + remotesList = [] + if output: + for line in output.splitlines(): + name, urlmode = line.strip().split(None, 1) + url, mode = urlmode.rsplit(None, 1) + if forFetch and mode == "(fetch)" or \ + (not forFetch) and mode == "(push)": + remotesList.append((name, url)) + + return remotesList + + def gitGetRemoteBranchesList(self, repodir, remote): + """ + Public method to get the list of a remote repository branches. + + @param repodir directory name of the repository (string) + @param remote remote repository name (string) + @return list of remote repository branches (list of string) + """ + args = self.initCommand("ls-remote") + args.append("--heads") + args.append(remote) + + 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') + + remoteBranches = [] + if output: + for line in output.splitlines(): + branch = line.strip().split()[-1].split("/")[-1] + remoteBranches.append(branch) + + return remoteBranches + + def gitShowRemote(self, projectDir, remoteName): + """ + Public method to show information about a remote repository. + + @param projectDir name of the project directory (string) + @param remoteName name of the remote repository (string) + """ + # 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 + + args = self.initCommand("remote") + args.append("show") + args.append(remoteName) + + dia = GitDialog(self.tr('Show Remote Info'), self) + res = dia.startProcess(args, repodir, showArgs=False) + if res: + dia.exec_() + + def gitShowRemotes(self, projectDir): + """ + Public method to show available remote repositories. + + @param projectDir name of the project directory (string) + """ + if self.remotesDialog is None: + from .GitRemoteRepositoriesDialog import \ + GitRemoteRepositoriesDialog + self.remotesDialog = GitRemoteRepositoriesDialog(self) + self.remotesDialog.show() + self.remotesDialog.raise_() + self.remotesDialog.start(projectDir) + + def gitAddRemote(self, projectDir): + """ + Public method to add a remote repository. + + @param projectDir name of the project directory (string) + """ + # 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 + + from .GitAddRemoteDialog import GitAddRemoteDialog + dlg = GitAddRemoteDialog() + if dlg.exec_() == QDialog.Accepted: + name, url = dlg.getData() + args = self.initCommand("remote") + args.append("add") + args.append(name) + args.append(url) + + self.startSynchronizedProcess(QProcess(), "git", args, + workingDir=repodir) + + def gitRenameRemote(self, projectDir, remoteName): + """ + Public method to rename a remote repository. + + @param projectDir name of the project directory (string) + @param remoteName name of the remote repository (string) + """ + # 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 + + newName, ok = QInputDialog.getText( + None, + self.tr("Rename Remote Repository"), + self.tr("Enter new name for remote repository:"), + QLineEdit.Normal) + if ok and newName and newName != remoteName: + args = self.initCommand("remote") + args.append("rename") + args.append(remoteName) + args.append(newName) + + self.startSynchronizedProcess(QProcess(), "git", args, + workingDir=repodir) + + def gitRemoveRemote(self, projectDir, remoteName): + """ + Public method to remove a remote repository. + + @param projectDir name of the project directory (string) + @param remoteName name of the remote repository (string) + """ + # 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 + + args = self.initCommand("remote") + args.append("remove") + args.append(remoteName) + + self.startSynchronizedProcess(QProcess(), "git", args, + workingDir=repodir) + + def gitPruneRemote(self, projectDir, remoteName): + """ + Public method to prune stale remote-tracking branches. + + @param projectDir name of the project directory (string) + @param remoteName name of the remote repository (string) + """ + # 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 + + args = self.initCommand("remote") + args.append("prune") + args.append(remoteName) + + dia = GitDialog(self.tr('Show Remote Info'), self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + + def gitShortlog(self, projectDir, commit): + """ + Public method to show a short log suitable for inclusion in release + announcements. + + @param projectDir name of the project directory (string) + @param commit commit to start the log at (strings) + """ + # 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 + + args = self.initCommand("shortlog") + args.append("-w") + args.append(commit) + + dia = GitDialog(self.tr('Show Shortlog'), self) + res = dia.startProcess(args, repodir, showArgs=False) + if res: + dia.exec_() + + def gitDescribe(self, projectDir, commits): + """ + Public method to find the most recent tag reachable from each commit. + + @param projectDir name of the project directory (string) + @param commits list of commits to start the search from + (list of strings) + """ + if self.describeDialog is None: + from .GitDescribeDialog import GitDescribeDialog + self.describeDialog = GitDescribeDialog(self) + self.describeDialog.show() + self.describeDialog.raise_() + self.describeDialog.start(projectDir, commits) + + ########################################################################### + ## Methods for cherry-pick handling. + ########################################################################### + + def gitCherryPick(self, projectDir, commits=None): + """ + Public method to cherry pick commits and apply them to the current + branch. + + @param projectDir name of the project directory (string) + @param commits list of commits to be applied (list of strings) + @return flag indicating that the project should be reread (boolean) + """ + # 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 False + + res = False + + from .GitCherryPickDialog import GitCherryPickDialog + dlg = GitCherryPickDialog(commits) + if dlg.exec_() == QDialog.Accepted: + commits, cherrypickInfo, signoff, nocommit = \ + dlg.getData() + + args = self.initCommand("cherry-pick") + args.append("-Xpatience") + if cherrypickInfo: + args.append("-x") + if signoff: + args.append("--signoff") + if nocommit: + args.append("--no-commit") + args.extend(commits) + + dia = GitDialog(self.tr('Cherry-pick'), self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + res = dia.hasAddOrDelete() + self.checkVCSStatus() + return res + + def gitCherryPickContinue(self, projectDir): + """ + Public method to continue the last copying session after conflicts + were resolved. + + @param projectDir name of the project directory (string) + @return flag indicating that the project should be reread (boolean) + """ + # 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 False + + import sys + editor = sys.argv[0].replace(".py", "_editor.py") + env = {"GIT_EDITOR": "{0} {1}".format(sys.executable, editor)} + + args = self.initCommand("cherry-pick") + args.append("--continue") + + dia = GitDialog(self.tr('Copy Changesets (Continue)'), self) + res = dia.startProcess(args, repodir, environment=env) + if res: + dia.exec_() + res = dia.hasAddOrDelete() + self.checkVCSStatus() + return res + + def gitCherryPickQuit(self, projectDir): + """ + Public method to quit the current copying operation. + + @param projectDir name of the project directory (string) + @return flag indicating that the project should be reread (boolean) + """ + # 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 False + + args = self.initCommand("cherry-pick") + args.append("--quit") + + dia = GitDialog(self.tr('Copy Changesets (Quit)'), self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + res = dia.hasAddOrDelete() + self.checkVCSStatus() + return res + + def gitCherryPickAbort(self, projectDir): + """ + Public method to cancel the last copying session and return to + the previous state. + + @param projectDir name of the project directory (string) + @return flag indicating that the project should be reread (boolean) + """ + # 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 False + + args = self.initCommand("cherry-pick") + args.append("--abort") + + dia = GitDialog(self.tr('Copy Changesets (Cancel)'), self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + res = dia.hasAddOrDelete() + self.checkVCSStatus() + return res + + ########################################################################### + ## Methods for stash handling. + ########################################################################### + + def __gitGetStashesList(self, projectDir): + """ + Private method to get a list of stash names. + + @param projectDir name of the project directory (string) + @return list of available stashes (list of string) + """ + # 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 [] + + args = self.initCommand("stash") + args.append("list") + args.append("--format=format:%gd") + + stashesList = [] + 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') + + if output: + stashesList = output.strip().splitlines() + + return stashesList + + def gitStashSave(self, projectDir): + """ + Public method to save the current changes to a new stash. + + @param projectDir name of the project directory (string) + @return flag indicating, that the save contained an add + or delete (boolean) + """ + # 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 False + + res = False + from .GitStashDataDialog import GitStashDataDialog + dlg = GitStashDataDialog() + if dlg.exec_() == QDialog.Accepted: + message, keepIndex, untracked = dlg.getData() + args = self.initCommand("stash") + args.append("save") + if keepIndex: + args.append("--keep-index") + if untracked == GitStashDataDialog.UntrackedOnly: + args.append("--include-untracked") + elif untracked == GitStashDataDialog.UntrackedAndIgnored: + args.append("--all") + if message: + args.append(message) + + dia = GitDialog(self.tr('Saving stash'), self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + res = dia.hasAddOrDelete() + self.checkVCSStatus() + return res + + def gitStashBrowser(self, projectDir): + """ + Public method used to browse the stashed changes. + + @param projectDir name of the project directory (string) + """ + if self.stashBrowser is None: + from .GitStashBrowserDialog import GitStashBrowserDialog + self.stashBrowser = GitStashBrowserDialog(self) + self.stashBrowser.show() + self.stashBrowser.raise_() + self.stashBrowser.start(projectDir) + + def gitStashShowPatch(self, projectDir, stashName=""): + """ + Public method to show the contents of a stash. + + @param projectDir name of the project directory (string) + @param stashName name of a stash (string) + """ + # 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 stashName: + availableStashes = self.__gitGetStashesList(repodir) + stashName, ok = QInputDialog.getItem( + None, + self.tr("Show Stash"), + self.tr("Select a stash (empty for latest stash):"), + [""] + availableStashes, + 0, False) + if not ok: + return + + if self.diff is None: + from .GitDiffDialog import GitDiffDialog + self.diff = GitDiffDialog(self) + self.diff.show() + self.diff.raise_() + self.diff.start(repodir, diffMode="stash", stashName=stashName) + + def gitStashApply(self, projectDir, stashName=""): + """ + Public method to apply a stash but keep it. + + @param projectDir name of the project directory (string) + @param stashName name of a stash (string) + @return flag indicating, that the restore contained an add + or delete (boolean) + """ + # 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 False + + if not stashName: + availableStashes = self.__gitGetStashesList(repodir) + stashName, ok = QInputDialog.getItem( + None, + self.tr("Restore Stash"), + self.tr("Select a stash (empty for latest stash):"), + [""] + availableStashes, + 0, False) + if not ok: + return False + + args = self.initCommand("stash") + args.append("apply") + if stashName: + args.append(stashName) + + dia = GitDialog(self.tr('Restoring stash'), self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + res = dia.hasAddOrDelete() + self.checkVCSStatus() + return res + + def gitStashPop(self, projectDir, stashName=""): + """ + Public method to apply a stash and delete it. + + @param projectDir name of the project directory (string) + @param stashName name of a stash (string) + @return flag indicating, that the restore contained an add + or delete (boolean) + """ + # 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 False + + if not stashName: + availableStashes = self.__gitGetStashesList(repodir) + stashName, ok = QInputDialog.getItem( + None, + self.tr("Restore Stash"), + self.tr("Select a stash (empty for latest stash):"), + [""] + availableStashes, + 0, False) + if not ok: + return False + + args = self.initCommand("stash") + args.append("pop") + if stashName: + args.append(stashName) + + dia = GitDialog(self.tr('Restoring stash'), self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + res = dia.hasAddOrDelete() + self.checkVCSStatus() + return res + + def gitStashBranch(self, projectDir, stashName=""): + """ + Public method to create a branch from a stash. + + @param projectDir name of the project directory (string) + @param stashName name of a stash (string) + @return flag indicating, that the restore contained an add + or delete (boolean) + """ + # 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 False + + branchName, ok = QInputDialog.getText( + None, + self.tr("Create Branch"), + self.tr("Enter a branch name to restore a stash to:"), + QLineEdit.Normal) + if not ok or branchName == "": + return False + + if not stashName: + availableStashes = self.__gitGetStashesList(repodir) + stashName, ok = QInputDialog.getItem( + None, + self.tr("Create Branch"), + self.tr("Select a stash (empty for latest stash):"), + [""] + availableStashes, + 0, False) + if not ok: + return False + + args = self.initCommand("stash") + args.append("branch") + args.append(branchName) + if stashName: + args.append(stashName) + + dia = GitDialog(self.tr('Creating branch'), self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + res = dia.hasAddOrDelete() + self.checkVCSStatus() + return res + + def gitStashDrop(self, projectDir, stashName=""): + """ + Public method to delete a stash. + + @param projectDir name of the project directory (string) + @param stashName name of a stash (string) + @return flag indicating a successful deletion (boolean) + """ + # 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 False + + if not stashName: + availableStashes = self.__gitGetStashesList(repodir) + stashName, ok = QInputDialog.getItem( + None, + self.tr("Show Stash"), + self.tr("Select a stash (empty for latest stash):"), + [""] + availableStashes, + 0, False) + if not ok: + return False + + res = E5MessageBox.yesNo( + None, + self.tr("Delete Stash"), + self.tr("""Do you really want to delete the stash <b>{0}</b>?""") + .format(stashName)) + if res: + args = self.initCommand("stash") + args.append("drop") + if stashName: + args.append(stashName) + + dia = GitDialog(self.tr('Deleting stash'), self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + return res + + def gitStashClear(self, projectDir): + """ + Public method to delete all stashes. + + @param projectDir name of the project directory (string) + @return flag indicating a successful deletion (boolean) + """ + # 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 False + + res = E5MessageBox.yesNo( + None, + self.tr("Delete All Stashes"), + self.tr("""Do you really want to delete all stashes?""")) + if res: + args = self.initCommand("stash") + args.append("clear") + + dia = GitDialog(self.tr('Deleting all stashes'), self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + return res + + def gitEditConfig(self, projectDir): + """ + Public method used to edit the repository configuration file. + + @param projectDir name of the project directory (string) + """ + # 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 + + cfgFile = os.path.join(repodir, self.adminDir, "config") + if not os.path.exists(cfgFile): + # create an empty one + try: + cfg = open(cfgFile, "w") + cfg.close() + except IOError: + pass + self.repoEditor = MiniEditor(cfgFile, "Properties") + self.repoEditor.show() + + def gitEditUserConfig(self): + """ + Public method used to edit the user configuration file. + """ + from .GitUtilities import getConfigPath + cfgFile = getConfigPath() + if not os.path.exists(cfgFile): + from .GitUserConfigDataDialog import GitUserConfigDataDialog + dlg = GitUserConfigDataDialog() + if dlg.exec_() == QDialog.Accepted: + firstName, lastName, email = dlg.getData() + else: + firstName, lastName, email = ( + "Firstname", "Lastname", "email_address") + try: + f = open(cfgFile, "w") + f.write("[user]\n") + f.write(" name = {0} {1}\n".format(firstName, lastName)) + f.write(" email = {0}\n".format(email)) + f.close() + except (IOError, OSError): + # ignore these + pass + self.userEditor = MiniEditor(cfgFile, "Properties") + self.userEditor.show() + + def gitShowConfig(self, projectDir): + """ + Public method to show the combined configuration. + + @param projectDir name of the project directory (string) + """ + # 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 + + args = self.initCommand("config") + args.append("--list") + + dia = GitDialog( + self.tr('Showing the combined configuration settings'), + self) + res = dia.startProcess(args, repodir, False) + if res: + dia.exec_() + + def gitVerify(self, projectDir): + """ + Public method to verify the connectivity and validity of objects + of the database. + + @param projectDir name of the project directory (string) + """ + # 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 + + args = self.initCommand("fsck") + args.append("--strict") + args.append("--full") + args.append("--cache") + + dia = GitDialog( + self.tr('Verifying the integrity of the Git repository'), + self) + res = dia.startProcess(args, repodir, False) + if res: + dia.exec_() + + def gitHouseKeeping(self, projectDir): + """ + Public method to cleanup and optimize the local repository. + + @param projectDir name of the project directory (string) + """ + # 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 + + args = self.initCommand("gc") + args.append("--prune") + if self.__plugin.getPreferences("AggressiveGC"): + args.append("--aggressive") + + dia = GitDialog( + self.tr('Performing Repository Housekeeping'), + self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + + def gitStatistics(self, projectDir): + """ + Public method to show some statistics of the local repository. + + @param projectDir name of the project directory (string) + """ + # 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 + + args = self.initCommand("count-objects") + args.append("-v") + + 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') + + info = [] + if output: + statistics = {} + for line in output.splitlines(): + key, value = line.strip().split(": ", 1) + statistics[key] = value + + info.append("""<p><table>""") + info.append(self.tr("""<tr><td><b>Statistics</b></td></tr>""")) + info.append( + self.tr("""<tr><td>Number of loose objects: </td>""" + """<td>{0}</td></tr>""") + .format(statistics["count"])) + info.append( + self.tr("""<tr><td>Disk space used by loose objects: </td>""" + """<td>{0} KiB</td></tr>""") + .format(statistics["size"])) + info.append( + self.tr("""<tr><td>Number of packed objects: </td>""" + """<td>{0}</td></tr>""") + .format(statistics["in-pack"])) + info.append( + self.tr("""<tr><td>Number of packs: </td>""" + """<td>{0}</td></tr>""") + .format(statistics["packs"])) + info.append( + self.tr("""<tr><td>Disk space used by packed objects: </td>""" + """<td>{0} KiB</td></tr>""") + .format(statistics["size-pack"])) + info.append( + self.tr("""<tr><td>Packed objects waiting for pruning: </td>""" + """<td>{0}</td></tr>""") + .format(statistics["prune-packable"])) + info.append( + self.tr("""<tr><td>Garbage files: </td>""" + """<td>{0}</td></tr>""") + .format(statistics["garbage"])) + info.append( + self.tr("""<tr><td>Disk space used by garbage files: </td>""" + """<td>{0} KiB</td></tr>""") + .format(statistics["size-garbage"])) + info.append("""</table></p>""") + else: + info.append(self.tr("<p><b>No statistics available.</b></p>")) + dlg = VcsRepositoryInfoDialog(None, "\n".join(info)) + dlg.exec_() + + def gitGetArchiveFormats(self, repodir): + """ + Public method to get a list of supported archive formats. + + @param repodir directory name of the repository (string) + @return list of supported archive formats (list of strings) + """ + args = self.initCommand("archive") + args.append("--list") + + 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') + + archiveFormats = [] + if output: + for line in output.splitlines(): + archiveFormat = line.strip() + archiveFormats.append(archiveFormat) + + return archiveFormats + + def gitCreateArchive(self, projectDir): + """ + Public method to show some statistics of the local repository. + + @param projectDir name of the project directory (string) + """ + # 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 + + from .GitArchiveDataDialog import GitArchiveDataDialog + dlg = GitArchiveDataDialog( + self.gitGetTagsList(repodir), + self.gitGetBranchesList(repodir, withMaster=True), + self.gitGetArchiveFormats(repodir) + ) + if dlg.exec_() == QDialog.Accepted: + commit, archiveFormat, fileName, prefix = dlg.getData() + args = self.initCommand("archive") + args.append("--format={0}".format(archiveFormat)) + args.append("--output={0}".format(fileName)) + if prefix: + prefix = Utilities.fromNativeSeparators(prefix) + if not prefix.endswith("/"): + prefix += "/" + args.append("--prefix={0}".format(prefix)) + args.append(commit) + + dia = GitDialog( + self.tr('Creating Archive'), + self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + + ########################################################################### + ## Methods related to submodules. + ########################################################################### + + def gitSubmoduleAdd(self, projectDir): + """ + Public method to add a submodule to the project. + + @param projectDir name of the project directory + @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 + + from .GitSubmoduleAddDialog import GitSubmoduleAddDialog + dlg = GitSubmoduleAddDialog(self, repodir) + if dlg.exec_() == QDialog.Accepted: + repo, branch, name, path, force = dlg.getData() + args = self.initCommand("submodule") + args.append("add") + if branch: + args.append("--branch") + args.append(branch) + if force: + args.append("--force") + if name: + args.append("--name") + args.append(name) + args.append(repo) + if path: + args.append(path) + + dia = GitDialog( + self.tr("Add Submodule"), + self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + + def __gitSubmodulesList(self, repodir): + """ + Private method to get the data of defined submodules. + + @param repodir name of the directory containing the repo subdirectory + @type str + @return list of dictionaries with submodule name, path, URL and branch + @rtype list of dict + """ + submodulesFile = os.path.join(repodir, ".gitmodules") + if not os.path.exists(submodulesFile): + return [] + + configParser = E5ConfigParser() + if configParser.read(submodulesFile): + submodules = [] + for submodule in configParser: + if submodule.startswith("submodule"): + submoduleDict = {"name": submodule.split(None, 1)[1][1:-1]} + section = configParser[submodule] + submoduleDict["path"] = section["path"] + submoduleDict["url"] = section["url"] + if "branch" in section: + submoduleDict["branch"] = section["branch"] + else: + submoduleDict["branch"] = "" + submodules.append(submoduleDict) + return submodules + + return [] + + def gitSubmoduleList(self, projectDir): + """ + Public method to show a list of all submodules of the project. + + @param projectDir name of the project directory + @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 + + submodulesList = self.__gitSubmodulesList(repodir) + if submodulesList: + from .GitSubmodulesListDialog import GitSubmodulesListDialog + dlg = GitSubmodulesListDialog(submodulesList) + dlg.exec_() + else: + E5MessageBox.information( + None, + self.tr("List Submodules"), + self.tr("""No submodules defined for the project.""")) + + def __selectSubmodulePath(self, repodir): + """ + Private method to select a submodule path. + + @param repodir name of the directory containing the repo subdirectory + @type str + @return tuple of selected submodule path and flag indicating + a cancellation + @rtype tuple of (str, bool) + """ + allEntry = self.tr("All") + paths = [submodule["path"] + for submodule in self.__gitSubmodulesList(repodir)] + submodulePath, ok = QInputDialog.getItem( + None, + self.tr("Submodule Path"), + self.tr("Select a submodule path:"), + [allEntry] + sorted(paths), + 0, False) + if submodulePath == allEntry: + submodulePath = "" + + return submodulePath, ok + + def __selectSubmodulePaths(self, repodir): + """ + Private method to select a list of submodule paths. + + @param repodir name of the directory containing the repo subdirectory + @type str + @return tuple of selected submodule paths and flag indicating + a cancellation + @rtype tuple of (list of str, bool) + """ + paths = [submodule["path"] + for submodule in self.__gitSubmodulesList(repodir)] + + from .GitListDialog import GitListDialog + dlg = GitListDialog(sorted(paths)) + if dlg.exec_() == QDialog.Accepted: + selectedPaths = dlg.getSelection() + return selectedPaths, True + else: + return [], False + + def gitSubmoduleInit(self, projectDir): + """ + Public method to initialize one or all submodules. + + @param projectDir name of the project directory + @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 + + submodulePaths, ok = self.__selectSubmodulePaths(repodir) + if ok: + args = self.initCommand("submodule") + args.append("init") + args.extend(submodulePaths) + + dia = GitDialog( + self.tr("Initialize Submodules"), + self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + + def gitSubmoduleDeinit(self, projectDir): + """ + Public method to unregister submodules. + + @param projectDir name of the project directory + @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 + + paths = [submodule["path"] + for submodule in self.__gitSubmodulesList(repodir)] + + from .GitSubmodulesDeinitDialog import GitSubmodulesDeinitDialog + dlg = GitSubmodulesDeinitDialog(paths) + if dlg.exec_() == QDialog.Accepted: + all, submodulePaths, force = dlg.getData() + args = self.initCommand("submodule") + args.append("deinit") + if all: + args.append("--all") + else: + args.extend(submodulePaths) + if force: + args.append("--force") + + dia = GitDialog( + self.tr("Unregister Submodules"), + self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + + def gitSubmoduleUpdate(self, projectDir, initialize=False, remote=False): + """ + Public method to update submodules. + + @param projectDir name of the project directory + @type str + @param initialize flag indicating an initialize and update operation + @type bool + @param remote flag indicating a fetch and update operation + @type bool + """ + # 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 + + submodulePaths, ok = self.__selectSubmodulePaths(repodir) + if ok: + args = self.initCommand("submodule") + args.append("update") + if initialize: + args.append("--init") + if remote: + args.append("--remote") + args.extend(submodulePaths) + + dia = GitDialog( + self.tr("Update Submodules"), + self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + + def gitSubmoduleUpdateWithOptions(self, projectDir): + """ + Public method to update submodules offering a dialog to select the + update options. + + @param projectDir name of the project directory + @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 + + paths = [submodule["path"] + for submodule in self.__gitSubmodulesList(repodir)] + + from .GitSubmodulesUpdateOptionsDialog import \ + GitSubmodulesUpdateOptionsDialog + dlg = GitSubmodulesUpdateOptionsDialog(paths) + if dlg.exec_() == QDialog.Accepted: + procedure, init, remote, noFetch, force, submodulePaths = \ + dlg.getData() + + args = self.initCommand("submodule") + args.append("update") + args.append(procedure) + if init: + args.append("--init") + if remote: + args.append("--remote") + if noFetch: + args.append("--no-fetch") + if force: + args.append("--force") + args.extend(submodulePaths) + + dia = GitDialog( + self.tr("Update Submodules"), + self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + + def gitSubmoduleSync(self, projectDir): + """ + Public method to synchronize submodules. + + @param projectDir name of the project directory + @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 + + paths = [submodule["path"] + for submodule in self.__gitSubmodulesList(repodir)] + + from .GitSubmodulesSyncDialog import GitSubmodulesSyncDialog + dlg = GitSubmodulesSyncDialog(paths) + if dlg.exec_() == QDialog.Accepted: + submodulePaths, recursive = dlg.getData() + args = self.initCommand("submodule") + args.append("sync") + if recursive: + args.append("--recursive") + args.extend(submodulePaths) + + dia = GitDialog( + self.tr("Synchronize Submodules"), + self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + + def gitSubmoduleStatus(self, projectDir): + """ + Public method to show the status of the submodules. + + @param projectDir name of the project directory + @type str + """ + if self.submoduleStatusDialog is None: + from .GitSubmodulesStatusDialog import GitSubmodulesStatusDialog + self.submoduleStatusDialog = GitSubmodulesStatusDialog(self) + self.submoduleStatusDialog.show() + self.submoduleStatusDialog.raise_() + self.submoduleStatusDialog.start(projectDir) + + def gitSubmoduleSummary(self, projectDir): + """ + Public method to show the status of the submodules. + + @param projectDir name of the project directory + @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 + + paths = [submodule["path"] + for submodule in self.__gitSubmodulesList(repodir)] + + from .GitSubmodulesSummaryOptionsDialog import \ + GitSubmodulesSummaryOptionsDialog + dlg = GitSubmodulesSummaryOptionsDialog(paths) + if dlg.exec_() == QDialog.Accepted: + submodulePaths, superProject, index, commit, limit = dlg.getData() + args = self.initCommand("submodule") + args.append("summary") + if superProject: + args.append("--files") + if index: + args.append("--cached") + if limit > -1: + args.append("--summary-limit") + args.append(str(limit)) + if commit: + args.append(commit) + if submodulePaths: + args.append("--") + args.extend(submodulePaths) + + dia = GitDialog( + self.tr("Submodules Summary"), + self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + + ########################################################################### + ## Methods to get the helper objects are below. + ########################################################################### + + def vcsGetProjectBrowserHelper(self, browser, project, + isTranslationsBrowser=False): + """ + Public method to instantiate a helper object for the different + project browsers. + + @param browser reference to the project browser object + @param project reference to the project object + @param isTranslationsBrowser flag indicating, the helper is requested + for the translations browser (this needs some special treatment) + @return the project browser helper object + """ + from .ProjectBrowserHelper import GitProjectBrowserHelper + return GitProjectBrowserHelper(self, browser, project, + isTranslationsBrowser) + + def vcsGetProjectHelper(self, project): + """ + Public method to instantiate a helper object for the project. + + @param project reference to the project object + @return the project helper object + """ + self.__projectHelper = self.__plugin.getProjectHelper() + self.__projectHelper.setObjects(self, project) + return self.__projectHelper + + ########################################################################### + ## Status Monitor Thread methods + ########################################################################### + + def _createStatusMonitorThread(self, interval, project): + """ + Protected method to create an instance of the VCS status monitor + thread. + + @param interval check interval for the monitor thread in seconds + (integer) + @param project reference to the project object (Project) + @return reference to the monitor thread (QThread) + """ + from .GitStatusMonitorThread import GitStatusMonitorThread + return GitStatusMonitorThread(interval, project, self)
--- a/changelog Sun Dec 10 16:43:11 2017 +0100 +++ b/changelog Sun Dec 10 17:42:11 2017 +0100 @@ -12,6 +12,7 @@ -- added the eric plug-in wizard plug-in to the core plug-ins -- added the .desktop wizard plug-in to the core plug-ins -- added the translator plug-in to the core plug-ins + -- added the git plug-in to the core plug-ins **Note**: These plug-ins should be deinstalled via the plug-in uninstallation dialog of eric before upgrading eric. A reconfiguration of these plug-ins may
--- a/eric6.e4p Sun Dec 10 16:43:11 2017 +0100 +++ b/eric6.e4p Sun Dec 10 17:42:11 2017 +0100 @@ -512,6 +512,7 @@ <Source>Plugins/PluginSyntaxChecker.py</Source> <Source>Plugins/PluginTabnanny.py</Source> <Source>Plugins/PluginTranslator.py</Source> + <Source>Plugins/PluginVcsGit.py</Source> <Source>Plugins/PluginVcsMercurial.py</Source> <Source>Plugins/PluginVcsPySvn.py</Source> <Source>Plugins/PluginVcsSubversion.py</Source> @@ -563,6 +564,61 @@ <Source>Plugins/UiExtensionPlugins/VirtualenvInterface/__init__.py</Source> <Source>Plugins/UiExtensionPlugins/__init__.py</Source> <Source>Plugins/VcsPlugins/__init__.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/Config.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/ConfigurationPage/__init__.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitBlameDialog.py</Source> + <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/GitCherryPickDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitCommandDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitCommitDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitCopyDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitDiffDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitDiffGenerator.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitDiffHighlighter.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitDiffParser.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitFetchDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitListDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitMergeDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitOptionsDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py</Source> + <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/GitRemoteRepositoriesDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitStashDataDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitStatusDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitTagDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/GitUtilities.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/ProjectHelper.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/__init__.py</Source> + <Source>Plugins/VcsPlugins/vcsGit/git.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/Config.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/__init__.py</Source> @@ -1736,6 +1792,50 @@ <Form>Plugins/UiExtensionPlugins/Translator/TranslatorWidget.ui</Form> <Form>Plugins/UiExtensionPlugins/VirtualenvInterface/VirtualenvConfigurationDialog.ui</Form> <Form>Plugins/UiExtensionPlugins/VirtualenvInterface/VirtualenvExecDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui</Form> + <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/GitCherryPickDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitListDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui</Form> + <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/GitRemoteRepositoriesDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitTagDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui</Form> @@ -2217,6 +2317,10 @@ <Other>Plugins/UiExtensionPlugins/Translator/icons/pronounce.png</Other> <Other>Plugins/UiExtensionPlugins/Translator/icons/swap.png</Other> <Other>Plugins/UiExtensionPlugins/Translator/icons/translate.png</Other> + <Other>Plugins/VcsPlugins/vcsGit/icons/conflict.png</Other> + <Other>Plugins/VcsPlugins/vcsGit/icons/git.png</Other> + <Other>Plugins/VcsPlugins/vcsGit/icons/git92.png</Other> + <Other>Plugins/VcsPlugins/vcsGit/icons/preferences-git.png</Other> <Other>Plugins/VcsPlugins/vcsMercurial/icons/mercurial.png</Other> <Other>Plugins/VcsPlugins/vcsMercurial/icons/preferences-mercurial.png</Other> <Other>Plugins/VcsPlugins/vcsMercurial/icons/startServer.png</Other>
--- a/i18n/eric6_cs.ts Sun Dec 10 16:43:11 2017 +0100 +++ b/i18n/eric6_cs.ts Sun Dec 10 17:42:11 2017 +0100 @@ -17847,6 +17847,6576 @@ </message> </context> <context> + <name>Git</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="211"/> + <source>The git process finished with the exit code {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1565"/> + <source>The git process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="218"/> + <source>Could not start the git executable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="246"/> + <source>Create project repository</source> + <translation type="unfinished">Vytvořit repozitář projektu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="246"/> + <source>The project repository could not be created.</source> + <translation type="unfinished">Úložiště projektu nelze vytvořit.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="274"/> + <source>Creating Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="289"/> + <source>Adding files to Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="300"/> + <source>Initial commit to Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="330"/> + <source>Cloning project from a Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="419"/> + <source>Commit Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="419"/> + <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="478"/> + <source>Committing changes to Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="501"/> + <source>Switch</source> + <translation type="unfinished">Přepnout</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="501"/> + <source><p>Do you really want to switch to <b>{0}</b>?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="532"/> + <source>Synchronizing with the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="579"/> + <source>Adding files/directories to the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="653"/> + <source>Removing files/directories from the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="710"/> + <source>Renaming {0}</source> + <translation type="unfinished">Přejmenování {0}</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="833"/> + <source>Unstage files/directories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="884"/> + <source>Revert changes</source> + <translation type="unfinished">Vrátit změny</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="875"/> + <source>Do you really want to revert all changes to these files or directories?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="884"/> + <source>Do you really want to revert all changes of the project?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="890"/> + <source>Reverting changes</source> + <translation type="unfinished">Navrácení změn</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="942"/> + <source>Merging</source> + <translation type="unfinished">Merging</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="967"/> + <source>Master branch head</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1200"/> + <source>Git Command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1287"/> + <source><tr><td><b>Commit</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1291"/> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Rodiče</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1295"/> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Tagy</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1299"/> + <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Větve</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1302"/> + <source><tr><td><b>Author</b></td><td>{0} &lt;{1}&gt;</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1305"/> + <source><tr><td><b>Date</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1308"/> + <source><tr><td><b>Committer</b></td><td>{0} &lt;{1}&gt;</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1311"/> + <source><tr><td><b>Committed Date</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1314"/> + <source><tr><td><b>Subject</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1322"/> + <source><h3>Repository information</h3> +<p><table> +<tr><td><b>Git V.</b></td><td>{0}</td></tr> +<tr></tr> +{1}</table></p> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1390"/> + <source>Create {0} file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1390"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation type="unfinished"><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1449"/> + <source>Git Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1434"/> + <source><p>Copying the directory <b>{0}</b> failed.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1449"/> + <source><p>Copying the file <b>{0}</b> failed.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2634"/> + <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/git.py" line="1636"/> + <source>Git Side-by-Side Difference</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1636"/> + <source><p>The file <b>{0}</b> could not be read.</p></source> + <translation type="unfinished"><p>Soubor <b>{0}</b> nelze přečíst.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1685"/> + <source>Fetching from a remote Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1723"/> + <source>Pulling from a remote Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1764"/> + <source>Pushing to a remote Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1792"/> + <source>Committing failed merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1819"/> + <source>Aborting uncommitted/failed merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1852"/> + <source>Applying patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1884"/> + <source>Check patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1887"/> + <source>Apply patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1969"/> + <source>Tagging in the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2200"/> + <source>Branching in the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2240"/> + <source>Delete Remote Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2261"/> + <source>Current Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2261"/> + <source><p>The current branch is <b>{0}</b>.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2325"/> + <source>Create Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2290"/> + <source>Git Bundle Files (*.bundle)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2307"/> + <source><p>The Git bundle file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2355"/> + <source>Verify Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2485"/> + <source>Git Bundle Files (*.bundle);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2385"/> + <source>List Bundle Heads</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2485"/> + <source>Apply Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2508"/> + <source>Applying a bundle file (fetch)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2535"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation type="unfinished">Neplatný bisect podpříkaz ({0}).</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2738"/> + <source>Git Bisect ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2634"/> + <source>Process Generation Error</source> + <translation type="unfinished">Chyba v procesu generování</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2678"/> + <source>Create Bisect Replay File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2644"/> + <source>Git Bisect Replay Files (*.replay)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2661"/> + <source><p>The Git bisect replay file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2678"/> + <source><p>The file <b>{0}</b> could not be written.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2699"/> + <source>Edit Bisect Replay File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2726"/> + <source>Git Bisect Replay Files (*.replay);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2726"/> + <source>Bisect Replay</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2980"/> + <source>Show Remote Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2927"/> + <source>Rename Remote Repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2927"/> + <source>Enter new name for remote repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3004"/> + <source>Show Shortlog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3062"/> + <source>Cherry-pick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3092"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3117"/> + <source>Copy Changesets (Quit)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3143"/> + <source>Copy Changesets (Cancel)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3223"/> + <source>Saving stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3422"/> + <source>Show Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3422"/> + <source>Select a stash (empty for latest stash):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3334"/> + <source>Restore Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3348"/> + <source>Restoring stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3382"/> + <source>Create Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3372"/> + <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="3397"/> + <source>Creating branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3431"/> + <source>Delete Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3431"/> + <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="3442"/> + <source>Deleting stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> + <source>Delete All Stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> + <source>Do you really want to delete all stashes?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3470"/> + <source>Deleting all stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3542"/> + <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="3568"/> + <source>Verifying the integrity of the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3593"/> + <source>Performing Repository Housekeeping</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3637"/> + <source><tr><td><b>Statistics</b></td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3638"/> + <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="3642"/> + <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="3646"/> + <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="3650"/> + <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="3654"/> + <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="3658"/> + <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="3662"/> + <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="3666"/> + <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="3672"/> + <source><p><b>No statistics available.</b></p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3738"/> + <source>Creating Archive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3781"/> + <source>Add Submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3840"/> + <source>List Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3840"/> + <source>No submodules defined for the project.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3855"/> + <source>All</source> + <translation type="unfinished">Vše</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <source>Submodule Path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <source>Select a submodule path:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3911"/> + <source>Initialize Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3948"/> + <source>Unregister Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4028"/> + <source>Update Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4062"/> + <source>Synchronize Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4120"/> + <source>Submodules Summary</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitAddRemoteDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="14"/> + <source>Git Add Remote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished">Jméno:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="30"/> + <source>Enter the remote name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="37"/> + <source>URL:</source> + <translation type="unfinished">URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="44"/> + <source>Enter the remote URL</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitApplyBundleDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="14"/> + <source>Git Apply Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="23"/> + <source>Bundle Head:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="36"/> + <source>Select a head to apply</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="43"/> + <source>Local Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="56"/> + <source>Enter a local branch</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitArchiveDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="14"/> + <source>Git Archive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Revize</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="29"/> + <source>Select to specify a revision by a revision expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="32"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="42"/> + <source>Enter a commit id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished">Vybrat pro specifikaci revize tagem</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="52"/> + <source>Tag:</source> + <translation type="unfinished">Tag:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="68"/> + <source>Enter a tag name</source> + <translation type="unfinished">Zadejte jméno tagu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="78"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished">Vybrat pro specifikaci revize přes větev</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="81"/> + <source>Branch:</source> + <translation type="unfinished">Větev:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="97"/> + <source>Enter a branch name</source> + <translation type="unfinished">Zadejte jméno větve</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="107"/> + <source>Select HEAD revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="110"/> + <source>HEAD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="125"/> + <source>Format:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="132"/> + <source>Select the archive format</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="139"/> + <source>File Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="146"/> + <source>Enter the name of the archive file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="153"/> + <source>Select the archive file via a file selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="160"/> + <source>Prefix:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="167"/> + <source>Enter a prefix to be prepended to each file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.py" line="88"/> + <source>Select Archive File</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBisectLogBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="14"/> + <source>Git Bisect Log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="42"/> + <source>Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="47"/> + <source>Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="52"/> + <source>Subject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="66"/> + <source>Errors</source> + <translation type="unfinished">Chyby</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="72"/> + <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/GitBisectLogBrowserDialog.ui" line="88"/> + <source>Input</source> + <translation type="unfinished">Vstup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="110"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="113"/> + <source>&Send</source> + <translation type="unfinished">Ode&slat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="116"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="123"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="130"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="133"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="136"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="57"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="59"/> + <source>Press to refresh the list of commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="175"/> + <source>Process Generation Error</source> + <translation type="unfinished">Chyba v procesu generování</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="175"/> + <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> +</context> +<context> + <name>GitBisectStartDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="14"/> + <source>Git Bisect Start</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="23"/> + <source>Bad Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="30"/> + <source>Enter a bad commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="37"/> + <source>Good Commits:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="44"/> + <source>Enter a list of good commits separated by space</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="51"/> + <source>Select to not checkout the working tree</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="54"/> + <source>Don't checkout working tree</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBlameDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="14"/> + <source>Git Blame</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="45"/> + <source>Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="50"/> + <source>Author</source> + <translation type="unfinished">Autor</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="55"/> + <source>Date</source> + <translation type="unfinished">Datum</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="60"/> + <source>Time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="65"/> + <source>Line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="79"/> + <source>Errors</source> + <translation type="unfinished">Chyby</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="98"/> + <source>Input</source> + <translation type="unfinished">Vstup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="120"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="123"/> + <source>&Send</source> + <translation type="unfinished">Ode&slat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="126"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="133"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="140"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="143"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="146"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="119"/> + <source>Process Generation Error</source> + <translation type="unfinished">Chyba v procesu generování</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="119"/> + <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> +</context> +<context> + <name>GitBranchDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="14"/> + <source>Git Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="23"/> + <source>Branch Action</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="29"/> + <source>Select to create a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="32"/> + <source><b>Create Branch</b> +<p>Select this entry in order to create a branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="36"/> + <source>Create</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="46"/> + <source>Select to rename a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="49"/> + <source><b>Rename</b> +<p>Select this entry in order to rename the selected branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="53"/> + <source>Rename</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="60"/> + <source>Select to delete a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="63"/> + <source><b>Delete Branch</b> +<p>Select this entry in order to delete the selected branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="67"/> + <source>Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="74"/> + <source>Select to create a new branch and switch to it</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="77"/> + <source><b>Create &amp; Switch</b>\n<p>Select this entry in order to create a new branch and switch the working tree to it.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="80"/> + <source>Create && Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="87"/> + <source>Select to create a tracking branch and switch to it</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="90"/> + <source><b>Create Tracking Branch &amp; Switch</b>\n<p>Select this entry in order to create a new branch tracking a remote repository branch. The working tree is switched to it.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="93"/> + <source>Create Tracking Branch && Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="100"/> + <source>Select to associate a remote branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="209"/> + <source>Set Tracking Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="110"/> + <source>Select to de-associate a remote branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="113"/> + <source>Unset Tracking Branch Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="125"/> + <source>Name:</source> + <translation type="unfinished">Jméno:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="138"/> + <source>Enter the name of the branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="141"/> + <source><b>Branch Name</b> +<p>Enter the name of the branch to be created, deleted or moved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="157"/> + <source>Create Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="163"/> + <source>Revision:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="170"/> + <source>Enter a revision at which to start the branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="183"/> + <source>Rename Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="189"/> + <source>New Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="196"/> + <source>Enter a new name for the selected branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="215"/> + <source>Remote Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="228"/> + <source>Select the remote branch to associate</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="238"/> + <source>Select to enforce the create operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="241"/> + <source>Enforce Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBranchPushDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="14"/> + <source>Git Push Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="23"/> + <source>Branch Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="36"/> + <source>Select the branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="43"/> + <source>Remote Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="56"/> + <source>Select the remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.py" line="36"/> + <source><all branches></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBundleDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="14"/> + <source>Git Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Revize</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="29"/> + <source>Select to specify a revision or revision range</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="32"/> + <source>Revisions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="42"/> + <source>Enter revisions or revision range expressions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished">Vybrat pro specifikaci revize tagem</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="52"/> + <source>Tag:</source> + <translation type="unfinished">Tag:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="62"/> + <source>Enter a tag name</source> + <translation type="unfinished">Zadejte jméno tagu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="72"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished">Vybrat pro specifikaci revize přes větev</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="75"/> + <source>Branch:</source> + <translation type="unfinished">Větev:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="85"/> + <source>Enter a branch name</source> + <translation type="unfinished">Zadejte jméno větve</translation> + </message> +</context> +<context> + <name>GitCherryPickDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="14"/> + <source>Git Cherry-pick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="23"/> + <source>Commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="29"/> + <source>Enter commits by id, branch or tag one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="45"/> + <source>Select to append cherry-pick info to the commit message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="48"/> + <source>Append Cherry-pick &Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="58"/> + <source>Select to add a 'Signed-off-by' line to the commit message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="61"/> + <source>Append '&Signed-off-by' line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="68"/> + <source>Select to not commit the cherry-pick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="71"/> + <source>Don't &commit</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitCommandDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="14"/> + <source>Git Command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="23"/> + <source>Git Command:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="36"/> + <source>Enter the Git command to be executed with all necessary parameters</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="39"/> + <source><b>Git Command</b> +<p>Enter the Git command to be executed including all necessary +parameters. If a parameter of the commandline includes a space you have to +surround this parameter by single or double quotes. Do not include the name +of the Git client executable (i.e. git).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="65"/> + <source>Project Directory:</source> + <translation type="unfinished">Projekt adresář:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="78"/> + <source>This shows the root directory of the current project.</source> + <translation type="unfinished">Toto zobrazí kořenový adresář aktuálního projektu.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="81"/> + <source>project directory</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitCommitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="14"/> + <source>Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="20"/> + <source>Commit Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="26"/> + <source>Enter the log message.</source> + <translation type="unfinished">Zadání log zprávy.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="29"/> + <source><b>Log Message</b> +<p>Enter the log message for the commit action.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="43"/> + <source>Recent commit messages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="50"/> + <source>Select a recent commit message to use</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="60"/> + <source>Select to commit only staged changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="63"/> + <source>Commit staged changes only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="70"/> + <source>Select to amend the last commit (leave message empty to keep it)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="73"/> + <source>Amend the last commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="80"/> + <source>Select to reset the author information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="83"/> + <source>Reset Author Info</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitCopyDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="14"/> + <source>Git Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="25"/> + <source>Source:</source> + <translation type="unfinished">Zdroj:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="32"/> + <source>Shows the name of the source</source> + <translation type="unfinished">Zobrazuje jméno zdroje</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="35"/> + <source><b>Source name</b> +<p>This field shows the name of the source.</p></source> + <translation type="unfinished"><b>Jméno zdroje</b> +<p>Toto pole zobrazuje jméno zdroje.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="46"/> + <source>Enter the target name</source> + <translation type="unfinished">Zadejte jméno cíle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="49"/> + <source><b>Target name</b> +<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="57"/> + <source>Target:</source> + <translation type="unfinished">Cíl:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="64"/> + <source>Press to open a selection dialog</source> + <translation type="unfinished">Stisknout pro otevření dialogu výběru</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="67"/> + <source><b>Target directory</b> +<p>Select the target name for the operation via a selection dialog.</p></source> + <translation type="unfinished"><b>Cílový adresář</b><p>Výběr cílového adresáře přes dialogové okno výběru adresáře.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="77"/> + <source>Select to force the operation</source> + <translation type="unfinished">Vybrat pro vynucení operace</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="80"/> + <source>Enforce operation</source> + <translation type="unfinished">Vynutit operaci</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.py" line="51"/> + <source>Git Move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.py" line="89"/> + <source>Select target</source> + <translation type="unfinished">Vybrat cíl</translation> + </message> +</context> +<context> + <name>GitDescribeDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="14"/> + <source>Git Tag List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="42"/> + <source>Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="47"/> + <source>Tag Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="61"/> + <source>Errors</source> + <translation type="unfinished">Chyby</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="80"/> + <source>Input</source> + <translation type="unfinished">Vstup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="102"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="105"/> + <source>&Send</source> + <translation type="unfinished">Ode&slat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="108"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="115"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="122"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="125"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="128"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py" line="117"/> + <source>Process Generation Error</source> + <translation type="unfinished">Chyba v procesu generování</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py" line="117"/> + <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> +</context> +<context> + <name>GitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="14"/> + <source>Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="29"/> + <source>Output</source> + <translation type="unfinished">Výstup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="57"/> + <source>Errors</source> + <translation type="unfinished">Chyby</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="76"/> + <source>Input</source> + <translation type="unfinished">Vstup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="98"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="101"/> + <source>&Send</source> + <translation type="unfinished">Ode&slat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="104"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="111"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="118"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="121"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="124"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="88"/> + <source>Additional Output</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="104"/> + <source>Process canceled.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="116"/> + <source>Process finished successfully.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="118"/> + <source>Process crashed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="120"/> + <source>Proces finished with exit code {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/> + <source>Process Generation Error</source> + <translation type="unfinished">Chyba v procesu generování</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/> + <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> +</context> +<context> + <name>GitDiffDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="14"/> + <source>Git Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="26"/> + <source>Difference</source> + <translation type="unfinished">Odlišnosti</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="39"/> + <source><b>Git Diff</b><p>This shows the output of the git diff command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="56"/> + <source><b>Git Diff</b><p>This shows the output of the git diff command (stage to repo) if the dialog was asked to show separate diffs.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="85"/> + <source>Errors</source> + <translation type="unfinished">Chyby</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="48"/> + <source>Refresh</source> + <translation type="unfinished">Obnovit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="50"/> + <source>Press to refresh the display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="96"/> + <source>Working Tree to Staging Area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="97"/> + <source>Staging Area to HEAD Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="98"/> + <source>Working Tree to HEAD Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="99"/> + <source>Working to Staging (top) and Staging to HEAD (bottom)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="101"/> + <source>Stash Contents</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="102"/> + <source>Stash Contents of {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="171"/> + <source>Difference ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="179"/> + <source>Process Generation Error</source> + <translation type="unfinished">Chyba v procesu generování</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="179"/> + <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/GitDiffDialog.py" line="206"/> + <source>There is no difference.</source> + <translation type="unfinished">Žádné rozdíly nebyly nalezeny.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="227"/> + <source><Start></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="228"/> + <source><End></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="356"/> + <source>Save Diff</source> + <translation type="unfinished">Uložit Diff</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="322"/> + <source>Patch Files (*.diff)</source> + <translation type="unfinished">Patch soubory (*.diff)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="339"/> + <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="356"/> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation type="unfinished"><p>Patch soubor <b>{0}</b> nelze uložit.<br />Důvod: {1}</p></translation> + </message> +</context> +<context> + <name>GitFetchDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="14"/> + <source>Git Fetch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="23"/> + <source>Remote Repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="30"/> + <source>Select the remote repository to fetch from</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="46"/> + <source>Remote Branches:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="56"/> + <source>Press to update the list of remote branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="59"/> + <source>Update</source> + <translation type="unfinished">Obnovit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="81"/> + <source>Select the remote branches to be fetched</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="94"/> + <source>Local Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="101"/> + <source>Select the local branch to fetch into</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="111"/> + <source>Select to remove non-existing tracking references </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="114"/> + <source>Prune obsolete tracking references</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="121"/> + <source>Select to fetch tags as well</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="124"/> + <source>Include tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.py" line="36"/> + <source><All></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.py" line="37"/> + <source><Custom></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitListDialog.ui" line="14"/> + <source>Git Select</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitListDialog.ui" line="23"/> + <source>Select from the list:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitLogBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="14"/> + <source>Git Log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="22"/> + <source>Select action from menu</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="45"/> + <source>Select the mode (find or filter)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="65"/> + <source>From:</source> + <translation type="unfinished">Od:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="72"/> + <source>Enter the start date</source> + <translation type="unfinished">Zadejte počáteční datum</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="82"/> + <source>To:</source> + <translation type="unfinished">Do:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="89"/> + <source>Enter the end date</source> + <translation type="unfinished">Zadejte koncové datum</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="112"/> + <source>Select the field to filter on</source> + <translation type="unfinished">Vybrat pole pro filtrování</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="119"/> + <source>Enter the regular expression to filter on or search for</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="126"/> + <source>Press to find the previous occurrence</source> + <translation type="unfinished">Stisknout pro vyhledání předchozího výskytu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="133"/> + <source>Press to find the next occurrence</source> + <translation type="unfinished">Stisknout pro vyhledání následujícího výskytu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="174"/> + <source>Graph</source> + <translation type="unfinished">Graf</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="101"/> + <source>Commit ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="102"/> + <source>Author</source> + <translation type="unfinished">Autor</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="189"/> + <source>Date</source> + <translation type="unfinished">Datum</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="103"/> + <source>Committer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="199"/> + <source>Commit Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="104"/> + <source>Subject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="209"/> + <source>Branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="214"/> + <source>Tags</source> + <translation type="unfinished">Tagy</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="224"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="234"/> + <source>Press to move down in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="257"/> + <source>Press to get the next bunch of log entries</source> + <translation type="unfinished">Stisknout pro získání další části log údajů</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="260"/> + <source>&Next</source> + <translation type="unfinished">&Další</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="267"/> + <source>Enter the limit of entries to fetch</source> + <translation type="unfinished">Zadejte max. počet, ke stažení</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="286"/> + <source>Select to stop listing log messages at a copy or move</source> + <translation type="unfinished">Vybrat pro zastavení výpisu zpráv pro kopírování neobo přesun</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="289"/> + <source>Stop on Copy/Move</source> + <translation type="unfinished">Zatavit kopírování/přesun</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="378"/> + <source>Action</source> + <translation type="unfinished">Akce</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="383"/> + <source>Path</source> + <translation type="unfinished">Cesta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="388"/> + <source>Additions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="393"/> + <source>Deletions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="398"/> + <source>Copy from</source> + <translation type="unfinished">Kopírovat z</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2119"/> + <source>Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="445"/> + <source><a href="save:me">Save</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="491"/> + <source>Errors</source> + <translation type="unfinished">Chyby</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="497"/> + <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/GitLogBrowserDialog.ui" line="513"/> + <source>Input</source> + <translation type="unfinished">Vstup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="535"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="538"/> + <source>&Send</source> + <translation type="unfinished">Ode&slat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="541"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="548"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="555"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="558"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="561"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="88"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="90"/> + <source>Press to refresh the list of commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="98"/> + <source>Find</source> + <translation type="unfinished">Hledat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="99"/> + <source>Filter</source> + <translation type="unfinished">Filtr</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="105"/> + <source>File</source> + <translation type="unfinished">Soubor</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="122"/> + <source><table><tr><td><b>Commit ID</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2} &lt;{3}&gt;</td></tr><tr><td><b>Commit Date</b></td><td>{4}</td></tr><tr><td><b>Committer</b></td><td>{5} &lt;{6}&gt;</td></tr>{7}<tr><td><b>Subject</b></td><td>{8}</td></tr>{9}</table></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="134"/> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Rodiče</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="137"/> + <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="140"/> + <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Větve</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="143"/> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Tagy</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="146"/> + <source><tr><td><b>Message</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="198"/> + <source>Added</source> + <translation type="unfinished">Přidáno</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="199"/> + <source>Deleted</source> + <translation type="unfinished">Smazáno</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="200"/> + <source>Modified</source> + <translation type="unfinished">Změněno</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="201"/> + <source>Copied</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="202"/> + <source>Renamed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="203"/> + <source>Type changed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="204"/> + <source>Unmerged</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="205"/> + <source>Unknown</source> + <translation type="unfinished">Neznámý</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="241"/> + <source>Show Commit ID Column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="243"/> + <source>Press to show the commit ID column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="251"/> + <source>Show Author Columns</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="253"/> + <source>Press to show the author columns</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="261"/> + <source>Show Committer Columns</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="263"/> + <source>Press to show the committer columns</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="271"/> + <source>Show Branches Column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="273"/> + <source>Press to show the branches column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="281"/> + <source>Show Tags Column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="283"/> + <source>Press to show the Tags column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="313"/> + <source>Copy Commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="315"/> + <source>Cherry-pick the selected commits to the current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="320"/> + <source>Tag</source> + <translation type="unfinished">Tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="322"/> + <source>Tag the selected commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1812"/> + <source>Branch</source> + <translation type="unfinished">Větev</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="326"/> + <source>Create a new branch at the selected commit.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="328"/> + <source>Branch && Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="330"/> + <source>Create a new branch at the selected commit and switch the work tree to it.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1864"/> + <source>Switch</source> + <translation type="unfinished">Přepnout</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="336"/> + <source>Switch the working directory to the selected commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1890"/> + <source>Show Short Log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="342"/> + <source>Show a dialog with a log output for release notes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="345"/> + <source>Describe</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="347"/> + <source>Show the most recent tag reachable from a commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="648"/> + <source>The git process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="651"/> + <source>Could not start the git executable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="654"/> + <source>Git Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="769"/> + <source>{0} ({1}%)</source> + <comment>action, confidence</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="835"/> + <source>Process Generation Error</source> + <translation type="unfinished">Chyba v procesu generování</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="835"/> + <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/GitLogBrowserDialog.py" line="1275"/> + <source>Side-by-Side Diff to Parent {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1287"/> + <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1725"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1864"/> + <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/GitLogBrowserDialog.py" line="1890"/> + <source>Select a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/> + <source>Select a default branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/> + <source>Branch & Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2073"/> + <source>Find Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2073"/> + <source>'{0}' was not found.</source> + <translation type="unfinished">'{0}' nebyl nalezen.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2133"/> + <source>Differences to Parent {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2148"/> + <source>Diff to Parent {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2174"/> + <source>There is no difference.</source> + <translation type="unfinished">Žádné rozdíly nebyly nalezeny.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2337"/> + <source>Save Diff</source> + <translation type="unfinished">Uložit Diff</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2303"/> + <source>Patch Files (*.diff)</source> + <translation type="unfinished">Patch soubory (*.diff)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2320"/> + <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2337"/> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation type="unfinished"><p>Patch soubor <b>{0}</b> nelze uložit.<br />Důvod: {1}</p></translation> + </message> +</context> +<context> + <name>GitMergeDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="14"/> + <source>Git Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Revize</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="29"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished">Vybrat pro zadání revize přes id množiny změn</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="32"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="42"/> + <source>Enter a commit id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished">Vybrat pro specifikaci revize tagem</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="52"/> + <source>Tag:</source> + <translation type="unfinished">Tag:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="62"/> + <source>Enter a tag name</source> + <translation type="unfinished">Zadejte jméno tagu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="72"/> + <source>Select to specify a revision by a local branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="75"/> + <source>Local Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="85"/> + <source>Enter a local branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="95"/> + <source>Select to specify a revision by a remote branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="98"/> + <source>Remote Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="108"/> + <source>Enter a remote branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="118"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="121"/> + <source>No commit selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="134"/> + <source>Select to commit the merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="137"/> + <source>Commit Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="146"/> + <source>Commit Message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="153"/> + <source>Enter a message for the merge commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="163"/> + <source>Select to append the log summaries of merged commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="166"/> + <source>Add Log Message Summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="176"/> + <source>Select to show diff statistics at the end of the merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="179"/> + <source>Show diff statistics</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitNewProjectOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="14"/> + <source>New Project from Repository</source> + <translation type="unfinished">Nový projekt z repozitáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="17"/> + <source><b>New Project from Repository Dialog</b> +<p>Enter the various repository infos into the entry fields. These values are used, when the new project is retrieved from the repository.</p> +<p>For remote repositories the URL must contain the hostname.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="28"/> + <source>&URL:</source> + <translation type="unfinished">&URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="44"/> + <source>Enter the URL of the repository</source> + <translation type="unfinished">Zadejte URL repozitáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="60"/> + <source>Select the repository url via a directory selection dialog</source> + <translation type="unfinished">Výběr repozitáře přes dialog výběru adresáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="67"/> + <source>Press to clear the history of entered repository URLs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="74"/> + <source>Project &Directory:</source> + <translation type="unfinished">A&dresář projektu:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="84"/> + <source>Enter the directory of the new project.</source> + <translation type="unfinished">Zadejte adresář nového projektu.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="87"/> + <source><b>Project Directory</b> +<p>Enter the directory of the new project. It will be retrieved from +the repository and be placed in this directory.</p></source> + <translation type="unfinished"><b>Adresář projektu</b><p>Zadání adresáře nového projektu. Ten bude stažen z repozitáře a umístěn do tohoto adresáře.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py" line="87"/> + <source>Select Repository-Directory</source> + <translation type="unfinished">Vyberte adresář repozitáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py" line="102"/> + <source>Select Project Directory</source> + <translation type="unfinished">Vyberte adresář projektu</translation> + </message> +</context> +<context> + <name>GitOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="14"/> + <source>Initial Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="17"/> + <source><b>Initial Commit Dialog</b> +<p>Enter the message for the initial commit.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="29"/> + <source>Commit &Message:</source> + <translation type="unfinished">Zpráva pro zapsání z&měn:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="39"/> + <source>Enter the log message for the new project.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="42"/> + <source><b>Log Message</b> +<p>Enter the log message to be used for the new project.</p></source> + <translation type="unfinished"><b>Log popisek</b><p>Zadání log popisku, který bude použit při založení nového projektu.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="46"/> + <source>new project started</source> + <translation type="unfinished">nový projekt spuštěn</translation> + </message> +</context> +<context> + <name>GitPage</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="14"/> + <source>Select to perform an expensive copy detection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="20"/> + <source><b>Configure Git Interface</b></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="40"/> + <source>Log</source> + <translation type="unfinished">Log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="46"/> + <source>No. of log messages shown:</source> + <translation type="unfinished">Počet zobrazených log zpráv:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="53"/> + <source>Enter the number of log messages to be shown</source> + <translation type="unfinished">Zadejte číslo log zpráv, které mají být zobrazeny</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="82"/> + <source>No. of subject characters shown in list:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="89"/> + <source>Enter the number of characters of the commit subject to be shown in the list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="95"/> + <source>All</source> + <translation type="unfinished">Vše</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="105"/> + <source>Select to perform expensive copy detection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="108"/> + <source>Find copies harder</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="118"/> + <source>Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="124"/> + <source>No. of commit messages to remember:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="131"/> + <source>Enter the number of commit messages to remember</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="160"/> + <source>Commit ID length:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="167"/> + <source>Enter the number of character to show for the commit ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="199"/> + <source>Cleanup</source> + <translation type="unfinished">Vyčistit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="205"/> + <source>Pattern:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="212"/> + <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="222"/> + <source>Repository Optimization</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="228"/> + <source>Select this to use the '--aggressive' option for garbage collection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="231"/> + <source>Perform aggressive repository optimization</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="241"/> + <source>Edit the Git configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="244"/> + <source>Edit configuration file</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitPatchFilesDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py" line="83"/> + <source>Patch Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="37"/> + <source>Press to add patch files to the list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="44"/> + <source>Press to delete the selected patch files from the list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="58"/> + <source>Press to move the selected file up</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="65"/> + <source>Press to move the selected file down</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="91"/> + <source>Strip Count:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="98"/> + <source>Enter number of leading directories to strip off (default 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="129"/> + <source>Select, if the patch has inaccurate end-of-file markers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="132"/> + <source>Patch has inaccurate end-of-file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="139"/> + <source>Select, if the line counts of the patch header may be wrong</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="142"/> + <source>Don't trust line counts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py" line="83"/> + <source>Patch Files (*.diff *.patch);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitPatchStatisticsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="14"/> + <source>Patch Statistics</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="23"/> + <source>Insertions and Deletions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="52"/> + <source># Insertions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="57"/> + <source># Deletions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="62"/> + <source>File</source> + <translation type="unfinished">Soubor</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="70"/> + <source>Summary Information:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="122"/> + <source>Process Generation Error</source> + <translation type="unfinished">Chyba v procesu generování</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="122"/> + <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> +</context> +<context> + <name>GitProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="488"/> + <source>Version Control</source> + <translation type="unfinished">Kontrola verzí</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="499"/> + <source>Commit changes to repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="505"/> + <source>Add/Stage to repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="508"/> + <source>Unstage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="514"/> + <source>Remove from repository (and disk)</source> + <translation type="unfinished">Odebrat z repozitáře (a z disku)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="588"/> + <source>Remove from repository only</source> + <translation type="unfinished">Odebrat jen z repozitáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="430"/> + <source>Copy</source> + <translation type="unfinished">Kopírovat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="432"/> + <source>Move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="435"/> + <source>Show log browser</source> + <translation type="unfinished">Zobrazit log prohlížeč</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="520"/> + <source>Show status</source> + <translation type="unfinished">Zobrazit status</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="525"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="229"/> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="529"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="238"/> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="244"/> + <source>Show annotated file</source> + <translation type="unfinished">Zobrazit komentované soubory</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="535"/> + <source>Revert changes</source> + <translation type="unfinished">Vrátit změny</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="542"/> + <source>Select all local file entries</source> + <translation type="unfinished">Vybrat všechny lokální soubory</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="544"/> + <source>Select all versioned file entries</source> + <translation type="unfinished">Vybrat všechny soubory ve správě verzí</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="546"/> + <source>Select all local directory entries</source> + <translation type="unfinished">Vybrat všechny lokální adresáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="548"/> + <source>Select all versioned directory entries</source> + <translation type="unfinished">Vybrat všechny adresáře ve správě verzí</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="551"/> + <source>Configure...</source> + <translation type="unfinished">Konfigurovat...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="588"/> + <source>Do you really want to remove these files from the repository?</source> + <translation type="unfinished">Opravdu chcete odebrat tyto soubory z repozitáře?</translation> + </message> +</context> +<context> + <name>GitProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="73"/> + <source>New from repository</source> + <translation type="unfinished">Nový z repozitáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="73"/> + <source>&New from repository...</source> + <translation type="unfinished">&Nový z repozitáře...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="78"/> + <source>Create (clone) a new project from a Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="81"/> + <source><b>New from repository</b><p>This creates (clones) a new local project from a Git repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="89"/> + <source>Fetch changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="94"/> + <source>Fetch changes from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="97"/> + <source><b>Fetch changes</b><p>This fetches changes from a remote repository into the local repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="105"/> + <source>Pull changes</source> + <translation type="unfinished">Stáhnout změny</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="110"/> + <source>Pull changes from a remote repository and update the work area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="113"/> + <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository and updates the work area.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="121"/> + <source>Commit changes to repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="121"/> + <source>Commit changes to repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="126"/> + <source>Commit changes of the local project to the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="129"/> + <source><b>Commit changes to repository</b><p>This commits changes of the local project to the Git repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="137"/> + <source>Push changes</source> + <translation type="unfinished">Předat změny</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="142"/> + <source>Push changes to a remote repository</source> + <translation type="unfinished">Předat změny do vzdáleného repozitáře (push)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="145"/> + <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> + <translation type="unfinished"><b>Předat změny (push)</b><p>Přikaz push předá změny z lokálního repozitáře do vzdáleného repozitáře.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="153"/> + <source>Export from repository</source> + <translation type="unfinished">Exportovat z repozitáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="153"/> + <source>&Export from repository...</source> + <translation type="unfinished">&Exportovat z repozitáře...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="158"/> + <source>Export a project from the repository</source> + <translation type="unfinished">Export projekt z repozitáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="161"/> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation type="unfinished"><b>Exportovat z repozitáře</b><p>Exportuje projekt z repozitáře.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="168"/> + <source>Show log browser</source> + <translation type="unfinished">Zobrazit log prohlížeč</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="173"/> + <source>Show a dialog to browse the log of the local project</source> + <translation type="unfinished">Zobrazit dialog pro procházení logů lokálního projektu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="176"/> + <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation type="unfinished"><b>Zobrazit log prohlížeč</b><p>Zobrazí se dialogové okno pro procházení logů lokálního projektu. Jako první je zobrazen limit maximálního přenosu. Více záznamů může být zobrazeno později.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="185"/> + <source>Show reflog browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="190"/> + <source>Show a dialog to browse the reflog of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="193"/> + <source><b>Show reflog browser</b><p>This shows a dialog to browse the reflog of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="202"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="202"/> + <source>Show &differences...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="207"/> + <source>Show the differences of the local project to the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="210"/> + <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="218"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="218"/> + <source>Show differences (extended) ...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="223"/> + <source>Show the difference of revisions of the project to the repository</source> + <translation type="unfinished">Zobrazí odlišnosti mezi revizemi projektu v repozitáři</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="226"/> + <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="234"/> + <source>Show status</source> + <translation type="unfinished">Zobrazit status</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="234"/> + <source>Show &status...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="239"/> + <source>Show the status of the local project</source> + <translation type="unfinished">Zobrazit status lokálního projektu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="242"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation type="unfinished"><b>Zobrazit status</b><p>Zobrazí status lokálního projektu.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="249"/> + <source>Switch</source> + <translation type="unfinished">Přepnout</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="249"/> + <source>S&witch...</source> + <translation type="unfinished">&Přepnout...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="254"/> + <source>Switch the working directory to another revision</source> + <translation type="unfinished">Přepnout pracovní adresář do jiné revize</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="257"/> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation type="unfinished"><b>Přepnout</b><p>Přepne pracovní adresář do jiné revize.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="265"/> + <source>Tag in repository</source> + <translation type="unfinished">Vytvořit tag v repozitáři</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="265"/> + <source>&Tag in repository...</source> + <translation type="unfinished">Vytvořit &tag v repozitáři...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="270"/> + <source>Perform tag operations for the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="273"/> + <source><b>Tag in repository</b><p>This performs selectable tag operations for the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="281"/> + <source>List tags</source> + <translation type="unfinished">Seznam tagů</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="281"/> + <source>&List tags...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="285"/> + <source>List tags of the project</source> + <translation type="unfinished">Seznam tagů projektu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="288"/> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation type="unfinished"><b>Seznam tagů</b><p>Zobrazí seznam tagů projektu.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="295"/> + <source>Show most recent tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="299"/> + <source>Show the most recent tag reachable from the work tree</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="302"/> + <source><b>Show most recent tag</b><p>This shows the most recent tag reachable from the work tree.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="310"/> + <source>List branches</source> + <translation type="unfinished">Seznam větví</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="310"/> + <source>&List branches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="314"/> + <source>List branches of the project</source> + <translation type="unfinished">Seznam větví projektu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="317"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation type="unfinished"><b>Seznam větví</b><p>Zobrazí seznam větví projektu.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="324"/> + <source>List merged branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="324"/> + <source>List &merged branches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="328"/> + <source>List merged branches of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="331"/> + <source><b>List merged branches</b><p>This lists the merged branches of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="339"/> + <source>List non-merged branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="339"/> + <source>List &non-merged branches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="343"/> + <source>List non-merged branches of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="346"/> + <source><b>List non-merged branches</b><p>This lists the non-merged branches of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="354"/> + <source>Branch in repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="354"/> + <source>&Branch in repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="359"/> + <source>Perform branch operations for the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="362"/> + <source><b>Branch in repository</b><p>This performs selectable branch operations for the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="370"/> + <source>Delete Remote Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="370"/> + <source>&Delete Remote Branch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="374"/> + <source>Delete a branch from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="377"/> + <source><b>Delete Remote Branch</b><p>This deletes a branch from a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="384"/> + <source>Show current branch</source> + <translation type="unfinished">Zobrazit aktuální větev</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="388"/> + <source>Show the current branch of the project</source> + <translation type="unfinished">Zobrazit aktuální větev projektu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="391"/> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation type="unfinished"><b>Zobrazit aktuální větev</b><p>Zobrazí se aktuální větev projektu.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="398"/> + <source>Revert changes</source> + <translation type="unfinished">Vrátit změny</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="398"/> + <source>Re&vert changes</source> + <translation type="unfinished">&Vrátit změny</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="403"/> + <source>Revert all changes made to the local project</source> + <translation type="unfinished">Vrátit všechny změny, které byly provedeny v lokálním projektu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="406"/> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> + <translation type="unfinished"><b>Vrátit změny</b><p>Vrátí se všechny změny, které byly provedeny v lokálním projektu.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="413"/> + <source>Unstage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="413"/> + <source>&Unstage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="418"/> + <source>Unstage all changes made to the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="421"/> + <source><b>Unstage changes</b><p>This unstages all changes made to the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="428"/> + <source>Merge</source> + <translation type="unfinished">Sloučit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="428"/> + <source>Mer&ge changes...</source> + <translation type="unfinished">&Sloučit změny...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="433"/> + <source>Merge changes into the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="436"/> + <source><b>Merge</b><p>This merges changes into the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="443"/> + <source>Cancel uncommitted/failed merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="447"/> + <source>Cancel an uncommitted or failed merge and lose all changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="450"/> + <source><b>Cancel uncommitted/failed merge</b><p>This cancels an uncommitted or failed merge causing all changes to be lost.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="458"/> + <source>Commit failed merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="462"/> + <source>Commit a failed merge after conflicts have been resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="465"/> + <source><b>Commit failed merge</b><p>This commits a failed merge after conflicts have been resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="473"/> + <source>Cleanup</source> + <translation type="unfinished">Vyčistit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="473"/> + <source>Cleanu&p</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="477"/> + <source>Cleanup the local project</source> + <translation type="unfinished">Vyčistit lokální projekt</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="480"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation type="unfinished"><b>Vyčistit</b><p>Provede úklid lokálního projektu.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="487"/> + <source>Execute command</source> + <translation type="unfinished">Provést příkaz</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="487"/> + <source>E&xecute command...</source> + <translation type="unfinished">P&rovést příkaz...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="491"/> + <source>Execute an arbitrary Git command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="494"/> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Git command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="502"/> + <source>Configure</source> + <translation type="unfinished">Konfigurovat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="502"/> + <source>Configure...</source> + <translation type="unfinished">Konfigurovat...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="506"/> + <source>Show the configuration dialog with the Git page selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="509"/> + <source><b>Configure</b><p>Show the configuration dialog with the Git page selected.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="517"/> + <source>Show Remotes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="517"/> + <source>Show Remotes...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="521"/> + <source>Show the available remote repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="539"/> + <source><b>Show Remotes</b><p>This shows the remote repositories available for pulling, fetching and pushing.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1765"/> + <source>Show Remote Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="532"/> + <source>Show Remote Info...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="536"/> + <source>Show information about a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1161"/> + <source>Add</source> + <translation type="unfinished">Přidat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="547"/> + <source>Add...</source> + <translation type="unfinished">Přidat...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="551"/> + <source>Add a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="554"/> + <source><b>Add</b><p>This adds a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1785"/> + <source>Remove</source> + <translation type="unfinished">Odebrat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="561"/> + <source>Remove...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="565"/> + <source>Remove a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="568"/> + <source><b>Remove</b><p>This removes a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1799"/> + <source>Prune</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="575"/> + <source>Prune...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="579"/> + <source>Prune stale remote-tracking branches of a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="582"/> + <source><b>Prune</b><p>This prunes stale remote-tracking branches of a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <source>Rename</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="590"/> + <source>Rename...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="594"/> + <source>Rename a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="597"/> + <source><b>Rename</b><p>This renames a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1833"/> + <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> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="649"/> + <source>Cancel 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> + <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> + <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> + <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> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> + <source>Show stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> + <source>Show stash...</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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="702"/> + <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"/> + <source>Restore && Keep</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="714"/> + <source>Restore a stash but keep it</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="717"/> + <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"/> + <source>Restore && Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="728"/> + <source>Restore a stash and delete it</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="731"/> + <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"/> + <source>Create Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="742"/> + <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"/> + <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"/> + <source>Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="757"/> + <source>Delete a stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="760"/> + <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"/> + <source>Delete All</source> + <translation type="unfinished">Smazat vše</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="771"/> + <source>Delete all stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="774"/> + <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"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="785"/> + <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"/> + <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"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="799"/> + <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> + <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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="844"/> + <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="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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="862"/> + <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"/> + <source>Repository Statistics</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <source>Repository Statistics...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="873"/> + <source>Show some statistics of the local repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="876"/> + <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"/> + <source>Create Archive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="887"/> + <source>Create an archive from the local repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="890"/> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> + <source>List bundle heads...</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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="934"/> + <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"/> + <source>Apply Bundle (fetch)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <source>Apply Bundle (fetch)...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="945"/> + <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"/> + <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"/> + <source>Apply Bundle (pull)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="955"/> + <source>Apply Bundle (pull)...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="959"/> + <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"/> + <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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1003"/> + <source>Mark a selectable revision as good</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> + <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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1017"/> + <source>Mark a selectable revision as bad</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1020"/> + <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"/> + <source>Skip</source> + <translation type="unfinished">Přeskočit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <source>Skip...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1031"/> + <source>Skip a selectable revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1034"/> + <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"/> + <source>Reset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <source>Reset...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1045"/> + <source>Reset the bisect session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1048"/> + <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"/> + <source>Show bisect log browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1060"/> + <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"/> + <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"/> + <source>Create replay file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1076"/> + <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"/> + <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"/> + <source>Edit replay file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1092"/> + <source>Edit a bisect replay file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1095"/> + <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"/> + <source>Replay session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1107"/> + <source>Replay a bisect session from file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1110"/> + <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"/> + <source>Check patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1121"/> + <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"/> + <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"/> + <source>Apply patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1136"/> + <source>Apply a list of patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1139"/> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1180"/> + <source>List the submodule of the current project</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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1195"/> + <source>Initialize the submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1198"/> + <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> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1244"/> + <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"/> + <source>Fetch and Update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1257"/> + <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>Synchronize URLs of submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1293"/> + <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"/> + <source>Show Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1306"/> + <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"/> + <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"/> + <source>Show Summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1322"/> + <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"/> + <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"/> + <source>Administration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1360"/> + <source>Bundle Management</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="2237"/> + <source>Bisect</source> + <translation type="unfinished">Bisect</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1397"/> + <source>Tags</source> + <translation type="unfinished">Tagy</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1405"/> + <source>Branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1418"/> + <source>Manage Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1426"/> + <source>Remote Repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1436"/> + <source>Cherry-pick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1444"/> + <source>Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1459"/> + <source>Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1541"/> + <source>Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1646"/> + <source>Branch</source> + <translation type="unfinished">Větev</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <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"/> + <source>Pull</source> + <translation type="unfinished">Stáhnout</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1715"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1734"/> + <source>Unstage Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <source>Select a remote repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1853"/> + <source>Copy Commits (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1872"/> + <source>Copy Commits (Quit)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1892"/> + <source>Copy Commits (Cancel)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1911"/> + <source>Save Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1961"/> + <source>Restore Stash</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitPullDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="14"/> + <source>Git Pull</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="23"/> + <source>Remote Repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="30"/> + <source>Select the remote repository to pull from</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="46"/> + <source>Remote Branches:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="56"/> + <source>Press to update the list of remote branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="59"/> + <source>Update</source> + <translation type="unfinished">Obnovit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="81"/> + <source>Select the remote branches to be pulled</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="94"/> + <source>Select to remove non-existing tracking references </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="97"/> + <source>Prune obsolete tracking references</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.py" line="36"/> + <source><All></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.py" line="37"/> + <source><Custom></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitPushDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="14"/> + <source>Git Push</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="25"/> + <source>Remote Repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="32"/> + <source>Select the remote repository to push to</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="48"/> + <source>Branches to be pushed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="70"/> + <source>Push?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="75"/> + <source>Local</source> + <translation type="unfinished">Lokální</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="80"/> + <source>Remote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="85"/> + <source>Force?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="93"/> + <source>Press to select all branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="96"/> + <source>Select All</source> + <translation type="unfinished">Vybrat vše</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="106"/> + <source><b>WARNING: The "Force" option can result in dangling branches in the remote repository.</b></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="119"/> + <source>Select to push tags as well</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="122"/> + <source>Include tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="129"/> + <source>Select this to associate a remote tracking branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="132"/> + <source>Set tracking information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="139"/> + <source>Push Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="145"/> + <source>Select to push submodules automatically</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="148"/> + <source>on-demand</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="158"/> + <source>Select to check, if submodules were pushed already</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="161"/> + <source>check</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="168"/> + <source>Select to push submodules only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="171"/> + <source>only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="178"/> + <source>Select to not push any submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="181"/> + <source>no</source> + <translation type="unfinished">ne</translation> + </message> +</context> +<context> + <name>GitReflogBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="14"/> + <source>Git Reflog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="42"/> + <source>Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="47"/> + <source>Selector</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="52"/> + <source>Name</source> + <translation type="unfinished">Jméno</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="57"/> + <source>Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="62"/> + <source>Subject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="72"/> + <source>Press to get the next bunch of log entries</source> + <translation type="unfinished">Stisknout pro získání další části log údajů</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="75"/> + <source>&Next</source> + <translation type="unfinished">&Další</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="82"/> + <source>Enter the limit of entries to fetch</source> + <translation type="unfinished">Zadejte max. počet, ke stažení</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="122"/> + <source>Errors</source> + <translation type="unfinished">Chyby</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="128"/> + <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/GitReflogBrowserDialog.ui" line="144"/> + <source>Input</source> + <translation type="unfinished">Vstup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="166"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="169"/> + <source>&Send</source> + <translation type="unfinished">Ode&slat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="172"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="179"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="186"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="189"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="192"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="59"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="61"/> + <source>Press to refresh the list of commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="200"/> + <source>Process Generation Error</source> + <translation type="unfinished">Chyba v procesu generování</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="200"/> + <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> +</context> +<context> + <name>GitRemoteRepositoriesDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="14"/> + <source>Git Remote Repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="17"/> + <source><b>Git Remote Repositories</b> +<p>This dialog shows the available remote repositories.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="30"/> + <source>Remote Repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="46"/> + <source>Name</source> + <translation type="unfinished">Jméno</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="51"/> + <source>URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="56"/> + <source>Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="82"/> + <source>Press to add a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="85"/> + <source>&Add</source> + <translation type="unfinished">Přid&at</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="92"/> + <source>Press to rename the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="95"/> + <source>&Rename</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="102"/> + <source>Press to remove 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"/> + <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"/> + <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>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="217"/> + <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"/> + <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"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="230"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="51"/> + <source>Refresh</source> + <translation type="unfinished">Obnovit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="53"/> + <source>Press to refresh the repositories display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="148"/> + <source>Process Generation Error</source> + <translation type="unfinished">Chyba v procesu generování</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="148"/> + <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> +</context> +<context> + <name>GitRevisionSelectionDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="14"/> + <source>Git Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Revize</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="29"/> + <source>Select to specify a revision by a revision expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="32"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="42"/> + <source>Enter a commit id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished">Vybrat pro specifikaci revize tagem</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="52"/> + <source>Tag:</source> + <translation type="unfinished">Tag:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="68"/> + <source>Enter a tag name</source> + <translation type="unfinished">Zadejte jméno tagu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="78"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished">Vybrat pro specifikaci revize přes větev</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="81"/> + <source>Branch:</source> + <translation type="unfinished">Větev:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="97"/> + <source>Enter a branch name</source> + <translation type="unfinished">Zadejte jméno větve</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="107"/> + <source>Select to specify a revision by a remote branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="110"/> + <source>Remote Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="126"/> + <source>Enter a remote branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="136"/> + <source>Select HEAD revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="139"/> + <source>HEAD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="146"/> + <source>No revision selected</source> + <translation type="unfinished">Nebyla vybrána revize</translation> + </message> +</context> +<context> + <name>GitRevisionsSelectionDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="14"/> + <source>Git Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="23"/> + <source>Revision &1</source> + <translation type="unfinished">Revize &1</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="137"/> + <source>Select to specify a revision by a revision expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="140"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="150"/> + <source>Enter a commit id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="157"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished">Vybrat pro specifikaci revize tagem</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="160"/> + <source>Tag:</source> + <translation type="unfinished">Tag:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="170"/> + <source>Enter a tag name</source> + <translation type="unfinished">Zadejte jméno tagu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="180"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished">Vybrat pro specifikaci revize přes větev</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="183"/> + <source>Branch:</source> + <translation type="unfinished">Větev:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="193"/> + <source>Enter a branch name</source> + <translation type="unfinished">Zadejte jméno větve</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="203"/> + <source>Select HEAD revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="206"/> + <source>HEAD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="216"/> + <source>Select revision before HEAD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="219"/> + <source>HEAD^</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="226"/> + <source>No revision selected</source> + <translation type="unfinished">Nebyla vybrána revize</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="131"/> + <source>Revision &2</source> + <translation type="unfinished">Revize &2</translation> + </message> +</context> +<context> + <name>GitStashBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="14"/> + <source>Git Stash Browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="42"/> + <source>Name</source> + <translation type="unfinished">Jméno</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="47"/> + <source>Date</source> + <translation type="unfinished">Datum</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="52"/> + <source>Message</source> + <translation type="unfinished">Zpráva</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="66"/> + <source>Statistics</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="91"/> + <source>File</source> + <translation type="unfinished">Soubor</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="96"/> + <source>Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="101"/> + <source>Lines added</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="106"/> + <source>Lines deleted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="153"/> + <source>Errors</source> + <translation type="unfinished">Chyby</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="159"/> + <source><b>Git stash errors</b><p>This shows possible error messages of the git stash command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="175"/> + <source>Input</source> + <translation type="unfinished">Vstup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="197"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="200"/> + <source>&Send</source> + <translation type="unfinished">Ode&slat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="203"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="210"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="217"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="220"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="223"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="65"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="67"/> + <source>Press to refresh the list of stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="82"/> + <source>Show</source> + <translation type="unfinished">Zobrazit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="85"/> + <source>Restore && Keep</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="87"/> + <source>Restore && Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="90"/> + <source>Create Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="93"/> + <source>Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="95"/> + <source>Delete All</source> + <translation type="unfinished">Smazat vše</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="182"/> + <source>Process Generation Error</source> + <translation type="unfinished">Chyba v procesu generování</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="182"/> + <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 numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="369"/> + <source>%n file(s) changed</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="371"/> + <source>%n line(s) inserted</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="373"/> + <source>%n line(s) deleted</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> +</context> +<context> + <name>GitStashDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="14"/> + <source>Git Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="23"/> + <source>Message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="33"/> + <source>Enter a message for the stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="40"/> + <source>Keep changes in staging area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="47"/> + <source>Untracked/Ignored Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="53"/> + <source>Select to not stash untracked or ignored files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="56"/> + <source>Don't stash untracked or ignored files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="66"/> + <source>Select to stash untracked files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="69"/> + <source>Stash untracked files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="76"/> + <source>Select to stash untracked and ignored files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="79"/> + <source>Stash untracked and ignored files</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitStatusDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="395"/> + <source>Git Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="17"/> + <source><b>Git Status</b> +<p>This dialog shows the status of the selected file or project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="26"/> + <source>Select action from menu</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="49"/> + <source>&Filter on Status:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="59"/> + <source>Select the status of entries to be shown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="662"/> + <source>Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="105"/> + <source>Status (Work)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="110"/> + <source>Status (Staging)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="115"/> + <source>Path</source> + <translation type="unfinished">Cesta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="155"/> + <source>Difference Working to Staging</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="209"/> + <source>Difference Staging to HEAD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="252"/> + <source>Errors</source> + <translation type="unfinished">Chyby</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="271"/> + <source>Input</source> + <translation type="unfinished">Vstup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="293"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="296"/> + <source>&Send</source> + <translation type="unfinished">Ode&slat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="299"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="306"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="313"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="316"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="319"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="65"/> + <source>Refresh</source> + <translation type="unfinished">Obnovit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="67"/> + <source>Press to refresh the status display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="105"/> + <source>Stage Selected Lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="109"/> + <source>Revert Selected Lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="113"/> + <source>Stage Hunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="117"/> + <source>Revert Hunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="123"/> + <source>Unstage Selected Lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="127"/> + <source>Unstage Hunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="169"/> + <source>added</source> + <translation type="unfinished">přidáno</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="170"/> + <source>copied</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="171"/> + <source>deleted</source> + <translation type="unfinished">smazáno</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="172"/> + <source>modified</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="173"/> + <source>renamed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="175"/> + <source>not tracked</source> + <translation type="unfinished">nesledováno</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="174"/> + <source>unmerged</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="168"/> + <source>unmodified</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="176"/> + <source>ignored</source> + <translation type="unfinished">ignorováno</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="197"/> + <source>Commit the selected changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="198"/> + <source>Amend</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="200"/> + <source>Amend the latest commit with the selected changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="202"/> + <source>Select all for commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="204"/> + <source>Unselect all from commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="703"/> + <source>Add</source> + <translation type="unfinished">Přidat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="210"/> + <source>Add the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="211"/> + <source>Stage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="213"/> + <source>Stages all changes of the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="215"/> + <source>Unstage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="217"/> + <source>Unstages all changes of the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="839"/> + <source>Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="224"/> + <source>Shows the differences of the selected entry in a separate dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="227"/> + <source>Differences Side-By-Side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="229"/> + <source>Shows the differences of the selected entry side-by-side in a separate dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="786"/> + <source>Revert</source> + <translation type="unfinished">Vrátit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="237"/> + <source>Reverts the changes of the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="242"/> + <source>Forget missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="244"/> + <source>Forgets about the selected missing files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="246"/> + <source>Restore missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="248"/> + <source>Restores the selected missing files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="253"/> + <source>Edit file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="255"/> + <source>Edit the selected conflicting file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="260"/> + <source>Adjust column sizes</source> + <translation type="unfinished">Přizpůsobit šířky sloupců</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="262"/> + <source>Adjusts the width of all columns to their contents</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="423"/> + <source>Process Generation Error</source> + <translation type="unfinished">Chyba v procesu generování</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="423"/> + <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/GitStatusDialog.py" line="596"/> + <source>all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="662"/> + <source>There are no entries selected to be committed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="703"/> + <source>There are no unversioned entries available/selected.</source> + <translation type="unfinished">Položky mimo verzi nejsou dostupné/vybrány.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="725"/> + <source>Stage</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="725"/> + <source>There are no stageable entries available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="747"/> + <source>Unstage</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="747"/> + <source>There are no unstageable entries available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="769"/> + <source>Forget Missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="810"/> + <source>There are no missing entries available/selected.</source> + <translation type="unfinished">Chybějící záznamy nejsou dostupné/vybrány.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="786"/> + <source>There are no uncommitted, unstaged changes available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="810"/> + <source>Restore Missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="839"/> + <source>There are no uncommitted changes available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="891"/> + <source>Working Tree to Staging Area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="870"/> + <source>Staging Area to HEAD Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="892"/> + <source>Working Tree to HEAD Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="894"/> + <source>Side-by-Side Difference</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="894"/> + <source>Select the compare method.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1201"/> + <source>Revert selected lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1203"/> + <source>Revert hunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1204"/> + <source>Are you sure you want to revert the selected changes?</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitStatusMonitorThread</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py" line="93"/> + <source>Could not start the Git process.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py" line="133"/> + <source>Git status checked successfully</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmoduleAddDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="14"/> + <source>Add Submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="23"/> + <source>&URL:</source> + <translation type="unfinished">&URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="39"/> + <source>Enter the URL of the repository</source> + <translation type="unfinished">Zadejte URL repozitáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="55"/> + <source>Select the repository URL via a directory selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="62"/> + <source>Press to clear the history of entered repository URLs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="69"/> + <source>Submodule &Directory:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="79"/> + <source>Enter the directory for the submodule (leave empty to use default).</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="89"/> + <source>&Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="99"/> + <source>Enter a branch name</source> + <translation type="unfinished">Zadejte jméno větve</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="106"/> + <source>&Logical Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="116"/> + <source>Enter a logical name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="123"/> + <source>Select to enforce the operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="126"/> + <source>&Force Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="92"/> + <source>Select Submodule Repository Directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="118"/> + <source>Select Submodule Directory</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesDeinitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="14"/> + <source>Unregister Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="23"/> + <source>Select to unregister all submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="26"/> + <source>Unregister All Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="33"/> + <source>Selected Submodules:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="40"/> + <source>Select the submodules to be unregistered</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="53"/> + <source>Select to enforce unregistering</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="56"/> + <source>Enforce Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="14"/> + <source>Defined Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="39"/> + <source>Name</source> + <translation type="unfinished">Jméno</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="44"/> + <source>Path</source> + <translation type="unfinished">Cesta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="49"/> + <source>URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="54"/> + <source>Branch</source> + <translation type="unfinished">Větev</translation> + </message> +</context> +<context> + <name>GitSubmodulesStatusDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="14"/> + <source>Submodules Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="33"/> + <source>Submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="38"/> + <source>Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="43"/> + <source>Commit ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="48"/> + <source>Info</source> + <translation type="unfinished">Info</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="58"/> + <source>Select to show the status for the index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="61"/> + <source>Show Status for Index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="68"/> + <source>Perform a recursive operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="71"/> + <source>Recursive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="99"/> + <source>Errors</source> + <translation type="unfinished">Chyby</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="46"/> + <source>up-to-date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="47"/> + <source>not initialized</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="48"/> + <source>different to index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="49"/> + <source>merge conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="55"/> + <source>Refresh</source> + <translation type="unfinished">Obnovit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="57"/> + <source>Press to refresh the status display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="105"/> + <source>The process {0} did not finish within 30 seconds.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="109"/> + <source>The process {0} finished with an error. +Error: {1}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="115"/> + <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/GitSubmodulesStatusDialog.py" line="134"/> + <source>unknown</source> + <translation type="unfinished">neznámý</translation> + </message> +</context> +<context> + <name>GitSubmodulesSummaryOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="14"/> + <source>Submodule Summary Options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="23"/> + <source>Selected Submodules:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="30"/> + <source>Select the submodules to show the summary for</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="43"/> + <source>Select to show summary information for the index of the superproject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="46"/> + <source>Show Summary for Superproject Index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="53"/> + <source>Select to show summary information for the index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="56"/> + <source>Show Summary for Index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="63"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="70"/> + <source>Enter a commit ID to show summary information for</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="73"/> + <source>Enter Commit ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="80"/> + <source>Limit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="87"/> + <source>Enter the maximum number of entries to be shown per submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="93"/> + <source>No Limit</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesSyncDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="14"/> + <source>Synchronize Submodule URLs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="23"/> + <source>Selected Submodules:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="30"/> + <source>Select the submodules to be synchronized</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="43"/> + <source>Select to perform a recursive synchronization</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="46"/> + <source>Recursive Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesUpdateOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="14"/> + <source>Submodule Update Options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="23"/> + <source>Update Procedure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="29"/> + <source>Select to perform a 'checkout' procedure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="32"/> + <source>checkout</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="42"/> + <source>Select to perform a 'rebase' procedure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="45"/> + <source>rebase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="52"/> + <source>Select to perform a 'merge' procedure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="55"/> + <source>merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="65"/> + <source>Select to initialize submodules before the update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="68"/> + <source>Initialize before Update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="75"/> + <source>Fetch remote changes before updating</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="78"/> + <source>Synchronize with remote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="88"/> + <source>Select to not fetch the remote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="91"/> + <source>Don't Fetch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="98"/> + <source>Selected Submodules:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="105"/> + <source>Select the submodules to be updated</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="118"/> + <source>Select to enforce the update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="121"/> + <source>Enforce Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitTagBranchListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="14"/> + <source>Git Tag List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="17"/> + <source><b>Git Tag/Branch List</b> +<p>This dialog shows a list of the projects tags or branches.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="33"/> + <source><b>Tag/Branches List</b> +<p>This shows a list of the projects tags or branches.</p></source> + <translation type="unfinished"><b>Tag/větev seznam</b><p>Tento dialog zobrazuje seznam tagů hlavní části projektu nebo jeho větví.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="99"/> + <source>Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="99"/> + <source>Name</source> + <translation type="unfinished">Jméno</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="69"/> + <source>Errors</source> + <translation type="unfinished">Chyby</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="88"/> + <source>Input</source> + <translation type="unfinished">Vstup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="110"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="113"/> + <source>&Send</source> + <translation type="unfinished">Ode&slat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="116"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="123"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="130"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="133"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="136"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="94"/> + <source>Annotation Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="98"/> + <source>Git Branches List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="135"/> + <source>Process Generation Error</source> + <translation type="unfinished">Chyba v procesu generování</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="135"/> + <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> +</context> +<context> + <name>GitTagDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="14"/> + <source>Git Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished">Jméno:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="36"/> + <source>Enter the name of the tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="39"/> + <source><b>Tag Name</b> +<p>Enter the name of the tag to be created, deleted or verified.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="53"/> + <source>Revision:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="60"/> + <source>Enter a revision to set a tag for</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="67"/> + <source>Tag Action</source> + <translation type="unfinished">Tag akce</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="73"/> + <source>Select to create a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="76"/> + <source><b>Create Tag</b> +<p>Select this entry in order to create a tag.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="80"/> + <source>Create Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="90"/> + <source>Select to delete a tag</source> + <translation type="unfinished">Vybrat pro smazání tagu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="93"/> + <source><b>Delete Tag</b> +<p>Select this entry in order to delete the selected tag.</p></source> + <translation type="unfinished"><b>Smazat tag</b><p>Vyberze tuto položku pro smazání tagu.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="97"/> + <source>Delete Tag</source> + <translation type="unfinished">Smazat tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="104"/> + <source>Select to verify a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="107"/> + <source><b>Verify Tag</b> +<p>Select this entry in order to verify the selected tag.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="111"/> + <source>Verify Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="121"/> + <source>Tag Type</source> + <translation type="unfinished">Typ tagu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="127"/> + <source>Select to create/delete/verify a global tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="130"/> + <source>Global Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="140"/> + <source>Select to create/delete/verify a signed tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="143"/> + <source>Signed Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="150"/> + <source>Select to create/delete/verify a local tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="153"/> + <source>Local Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="163"/> + <source>Select to enforce the create operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="166"/> + <source>Enforce Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitUserConfigDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="14"/> + <source>Git User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="23"/> + <source>User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="29"/> + <source>First Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="36"/> + <source>Enter the first name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="43"/> + <source>Last Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="50"/> + <source>Enter the last name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="57"/> + <source>Email:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="64"/> + <source>Enter the email address</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GlosbeEngine</name> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/GlosbeEngine.py" line="88"/> @@ -70719,6 +77289,19 @@ </message> </context> <context> + <name>VcsGitPlugin</name> + <message> + <location filename="../Plugins/PluginVcsGit.py" line="60"/> + <source>Version Control - Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/PluginVcsGit.py" line="135"/> + <source>Git</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>VcsMercurialPlugin</name> <message> <location filename="../Plugins/PluginVcsMercurial.py" line="60"/>
--- a/i18n/eric6_de.ts Sun Dec 10 16:43:11 2017 +0100 +++ b/i18n/eric6_de.ts Sun Dec 10 17:42:11 2017 +0100 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.1" language="de"> +<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage=""> <context> <name>AboutDialog</name> <message> @@ -1973,8 +1972,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="145"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>In neuem &Register öffnen Strg+LMK</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksMenu.py" line="163"/> @@ -1983,8 +1982,8 @@ </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksMenu.py" line="166"/> - <source>Open in New Tab Ctrl+LMB</source> - <translation>In neuem Register öffnen Strg+LMK</translation> + <source>Open in New Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>In neuem Register öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksMenu.py" line="169"/> @@ -2072,8 +2071,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="93"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>In neuem &Register öffnen Strg+LMK</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksToolBar.py" line="87"/> @@ -2082,8 +2081,8 @@ </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksToolBar.py" line="90"/> - <source>Open in New Tab Ctrl+LMB</source> - <translation>In neuem Register öffnen Strg+LMK</translation> + <source>Open in New Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>In neuem Register öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksToolBar.py" line="93"/> @@ -17352,6 +17351,6604 @@ </message> </context> <context> + <name>Git</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="211"/> + <source>The git process finished with the exit code {0}</source> + <translation>Der git-Prozess endete mit dem Code {0}</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1565"/> + <source>The git process did not finish within 30s.</source> + <translation>Der git-Prozess endete nicht innerhalb von 30s.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="218"/> + <source>Could not start the git executable.</source> + <translation>Das git Programm konnte nicht gestartet werden.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="246"/> + <source>Create project repository</source> + <translation>Projektrepository anlegen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="246"/> + <source>The project repository could not be created.</source> + <translation>Das Projektrepository konnte nicht erzeugt werden.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="274"/> + <source>Creating Git repository</source> + <translation>Erzeuge Git Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="289"/> + <source>Adding files to Git repository</source> + <translation>Füge Dateien dem Git-Repository hinzu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="300"/> + <source>Initial commit to Git repository</source> + <translation>Erstes Commit für das Git-Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="330"/> + <source>Cloning project from a Git repository</source> + <translation>Klone das Projekt aus dem Git-Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="419"/> + <source>Commit Changes</source> + <translation>Änderungen einpflegen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="419"/> + <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> + <translation>Das Einpflegen von Änderungen betrifft Dateien mit ungesicherten Änderungen. Soll die Aktion fortgesetzt werden?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="478"/> + <source>Committing changes to Git repository</source> + <translation>Änderungen in Git-Repository einpflegen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="532"/> + <source>Synchronizing with the Git repository</source> + <translation>Gleiche mit dem Git-Repository ab</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="579"/> + <source>Adding files/directories to the Git repository</source> + <translation>Füge Dateien/Verzeichnisse dem Git-Repository hinzu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="653"/> + <source>Removing files/directories from the Git repository</source> + <translation>Lösche Dateien/Verzeichnisse aus dem Git-Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="710"/> + <source>Renaming {0}</source> + <translation>Benenne {0} um</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="833"/> + <source>Unstage files/directories</source> + <translation>Vormerkung rückgängig machen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="884"/> + <source>Revert changes</source> + <translation>Änderungen rückgängig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="875"/> + <source>Do you really want to revert all changes to these files or directories?</source> + <translation>Wollen Sie wirklich alle Änderungen an den folgenden Datein oder Verzeichnissen rückgängig machen?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="884"/> + <source>Do you really want to revert all changes of the project?</source> + <translation>Wollen Sie wirklich alle Änderungen des Projektes rückgängig machen?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="890"/> + <source>Reverting changes</source> + <translation>Mache Änderungen rückgängig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="942"/> + <source>Merging</source> + <translation>Zusammenführen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="967"/> + <source>Master branch head</source> + <translation>Kopf des Hauptzweiges</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1200"/> + <source>Git Command</source> + <translation>Git Befehl</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1287"/> + <source><tr><td><b>Commit</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Änderungs ID</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1291"/> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Vorgänger</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1295"/> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Marken</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1299"/> + <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Zweige</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1302"/> + <source><tr><td><b>Author</b></td><td>{0} &lt;{1}&gt;</td></tr></source> + <translation><tr><td><b>Autor</b></td><td>{0} &lt;{1}&gt;</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1305"/> + <source><tr><td><b>Date</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Datum</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1308"/> + <source><tr><td><b>Committer</b></td><td>{0} &lt;{1}&gt;</td></tr></source> + <translation><tr><td><b>Bereitsteller</b></td><td>{0} &lt;{1}&gt;</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1311"/> + <source><tr><td><b>Committed Date</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Bereitstellungsdatum</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1314"/> + <source><tr><td><b>Subject</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Betreff</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1322"/> + <source><h3>Repository information</h3> +<p><table> +<tr><td><b>Git V.</b></td><td>{0}</td></tr> +<tr></tr> +{1}</table></p> +</source> + <translation><h3>Repositoryinformationen</h3> +<p><table> +<tr><td><b>Git V.</b></td><td>{0}</td></tr> +<tr></tr> +{1}</table></p> +</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1390"/> + <source>Create {0} file</source> + <translation>Erzeuge {0}-Datei</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1390"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1449"/> + <source>Git Copy</source> + <translation>Git Kopiere</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1434"/> + <source><p>Copying the directory <b>{0}</b> failed.</p><p>Reason: {1}</p></source> + <translation><p>Das Kopieren des Verzeichnisses <b>{0}</b> ist fehlgeschlagen.</p><p>Ursache: {1}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1449"/> + <source><p>Copying the file <b>{0}</b> failed.</p><p>Reason: {1}</p></source> + <translation><p>Das Kopieren der Datei <b>{0}</b> ist fehlgeschlagen.</p><p>Ursache: {1}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2634"/> + <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/git.py" line="1636"/> + <source>Git Side-by-Side Difference</source> + <translation>Git Unterschiede nebeneinander anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1636"/> + <source><p>The file <b>{0}</b> could not be read.</p></source> + <translation><p>Die Datei <b>{0}</b> konnte nicht gelesen werden.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1685"/> + <source>Fetching from a remote Git repository</source> + <translation>Änderungen von einem entfernten Git Repository abholen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1723"/> + <source>Pulling from a remote Git repository</source> + <translation>Pull von einem entfernten Git-Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1764"/> + <source>Pushing to a remote Git repository</source> + <translation>Push in ein entferntes Git-Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1792"/> + <source>Committing failed merge</source> + <translation>Fehlgeschlagene Zusammenführung abschließen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1819"/> + <source>Aborting uncommitted/failed merge</source> + <translation>Zusammenführung abbrechen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1969"/> + <source>Tagging in the Git repository</source> + <translation>Marke im Git-Repository setzen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2200"/> + <source>Branching in the Git repository</source> + <translation>Zweig im Git-Repository erzeugen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2240"/> + <source>Delete Remote Branch</source> + <translation>Entfernten Zweig löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2261"/> + <source>Current Branch</source> + <translation>Aktueller Zweig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2261"/> + <source><p>The current branch is <b>{0}</b>.</p></source> + <translation><p>Der aktuelle Zweig ist <b>{0}</b>.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2325"/> + <source>Create Bundle</source> + <translation>Paket erzeugen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2290"/> + <source>Git Bundle Files (*.bundle)</source> + <translation>Git Paketdateien (*.bundle)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2307"/> + <source><p>The Git bundle file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation><p>Die Git Paketdatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2355"/> + <source>Verify Bundle</source> + <translation>Paket verifizieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2485"/> + <source>Git Bundle Files (*.bundle);;All Files (*)</source> + <translation>Git Paketdateien (*.bundle);;Alle Dateien (*)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2385"/> + <source>List Bundle Heads</source> + <translation>Köpfe des Pakets anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2485"/> + <source>Apply Bundle</source> + <translation>Paket anwenden</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2508"/> + <source>Applying a bundle file (fetch)</source> + <translation>Paketdatei anwenden (fetch)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2535"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2738"/> + <source>Git Bisect ({0})</source> + <translation>Git-Bisect ({0})</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2634"/> + <source>Process Generation Error</source> + <translation>Fehler beim Prozessstart</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2678"/> + <source>Create Bisect Replay File</source> + <translation>Erzeuge Bisect Wiederholungsdatei</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2644"/> + <source>Git Bisect Replay Files (*.replay)</source> + <translation>Git Bisect Wiederholungsdateien (*.replay)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2661"/> + <source><p>The Git bisect replay file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation><p>Die Git Wiederholungsdatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2678"/> + <source><p>The file <b>{0}</b> could not be written.</p><p>Reason: {1}</p></source> + <translation><p>Die Datei <b>{0}</b> konnte nicht gespeichert werden.<br/>Grund: {1}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2699"/> + <source>Edit Bisect Replay File</source> + <translation>Bisect Wiederholungsdatei bearbeiten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2726"/> + <source>Git Bisect Replay Files (*.replay);;All Files (*)</source> + <translation>Git Bisect Wiederholungsdateien (*.replay);;Alle Dateien (*)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2726"/> + <source>Bisect Replay</source> + <translation>Bisect wiederholen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2980"/> + <source>Show Remote Info</source> + <translation>Zeige entfernte Informationen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2927"/> + <source>Rename Remote Repository</source> + <translation>Entferntes Repository umbenennen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2927"/> + <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="3004"/> + <source>Show Shortlog</source> + <translation>Kurzbeschreibungen anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3062"/> + <source>Cherry-pick</source> + <translation>Aussuchen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3092"/> + <source>Copy Changesets (Continue)</source> + <translation>Änderungssätze kopieren (Fortsetzung)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3117"/> + <source>Copy Changesets (Quit)</source> + <translation>Änderungssätze kopieren (Beenden)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3143"/> + <source>Copy Changesets (Cancel)</source> + <translation>Änderungssätze kopieren (Abbrechen)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3223"/> + <source>Saving stash</source> + <translation>Ablage sichern</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3422"/> + <source>Show Stash</source> + <translation>Ablage anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3422"/> + <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="3334"/> + <source>Restore Stash</source> + <translation>Ablage wiederherstellen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3348"/> + <source>Restoring stash</source> + <translation>Stelle Ablage wieder her</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3382"/> + <source>Create Branch</source> + <translation>Zweig erzeugen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3372"/> + <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="3397"/> + <source>Creating branch</source> + <translation>Erzeuge Zweig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3431"/> + <source>Delete Stash</source> + <translation>Ablage löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3431"/> + <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="3442"/> + <source>Deleting stash</source> + <translation>Lösche Ablage</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> + <source>Delete All Stashes</source> + <translation>Alle Ablagen löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> + <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="3470"/> + <source>Deleting all stashes</source> + <translation>Lösche alle Ablagen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3542"/> + <source>Showing the combined configuration settings</source> + <translation>Zeige die kombinierten Einstellungen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3568"/> + <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="3593"/> + <source>Performing Repository Housekeeping</source> + <translation>Führe Repository Reorganisation durch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3637"/> + <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="3638"/> + <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="3642"/> + <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="3646"/> + <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="3650"/> + <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="3654"/> + <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="3658"/> + <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="3662"/> + <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="3666"/> + <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="3672"/> + <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="3738"/> + <source>Creating Archive</source> + <translation>Erzeuge Archiv</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="501"/> + <source>Switch</source> + <translation>Umschalten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="501"/> + <source><p>Do you really want to switch to <b>{0}</b>?</p></source> + <translation><p>Soll wirklich auf <b>{0}</b> umgeschaltet werden?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1852"/> + <source>Applying patch</source> + <translation>Patch anwenden</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1884"/> + <source>Check patch files</source> + <translation>Patchdateien prüfen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1887"/> + <source>Apply patch files</source> + <translation>Patchdateien anwenden</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3781"/> + <source>Add Submodule</source> + <translation>Submodul hinzufügen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3840"/> + <source>List Submodules</source> + <translation>Submodule auflisten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3840"/> + <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="3855"/> + <source>All</source> + <translation>Alle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <source>Submodule Path</source> + <translation>Submodulpfad</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <source>Select a submodule path:</source> + <translation>Wähle einen Submodulpfad:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3911"/> + <source>Initialize Submodules</source> + <translation>Submodule initialisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3948"/> + <source>Unregister Submodules</source> + <translation>Submodule deregistrieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4028"/> + <source>Update Submodules</source> + <translation>Submodule aktualisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4062"/> + <source>Synchronize Submodules</source> + <translation>Submodule synchronisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4120"/> + <source>Submodules Summary</source> + <translation>Submodulüberblick</translation> + </message> +</context> +<context> + <name>GitAddRemoteDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="14"/> + <source>Git Add Remote</source> + <translation>Git Entferntes Repository hinzufügen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="23"/> + <source>Name:</source> + <translation>Name:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="30"/> + <source>Enter the remote name</source> + <translation>Gib einen Namen für entferntes Repository ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="37"/> + <source>URL:</source> + <translation>URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="44"/> + <source>Enter the remote URL</source> + <translation>Gib die Repository URL ein</translation> + </message> +</context> +<context> + <name>GitApplyBundleDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="14"/> + <source>Git Apply Data</source> + <translation>Git Paket anwenden</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="23"/> + <source>Bundle Head:</source> + <translation>Paketkopf:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="36"/> + <source>Select a head to apply</source> + <translation>Wähle den anzuwendenden Kopf</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="43"/> + <source>Local Branch:</source> + <translation>Lokaler Zweig:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="56"/> + <source>Enter a local branch</source> + <translation>Gib einen lokalen Zweig ein</translation> + </message> +</context> +<context> + <name>GitArchiveDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="14"/> + <source>Git Archive</source> + <translation>Git Archiv</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="23"/> + <source>Revision</source> + <translation>Revision</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="29"/> + <source>Select to specify a revision by a revision expression</source> + <translation>Auswählen, um eine Revision durch einen Revisionsausdruck anzugeben</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="32"/> + <source>Commit:</source> + <translation>Commit:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="42"/> + <source>Enter a commit id</source> + <translation>Gib eine Commit ID ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation>Auswählen, um eine Revision per Marke zu wählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="52"/> + <source>Tag:</source> + <translation>Marke:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="68"/> + <source>Enter a tag name</source> + <translation>Gib den Namen der Marke ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="78"/> + <source>Select to specify a revision by a branch</source> + <translation>Auswählen, um eine Revision per Zweig zu wählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="81"/> + <source>Branch:</source> + <translation>Zweig:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="97"/> + <source>Enter a branch name</source> + <translation>Gib einen Zweignamen ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="107"/> + <source>Select HEAD revision</source> + <translation>Wähle 'HEAD' Revision</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="110"/> + <source>HEAD</source> + <translation>HEAD</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="125"/> + <source>Format:</source> + <translation>Format:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="132"/> + <source>Select the archive format</source> + <translation>Wähle das Archivformat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="139"/> + <source>File Name:</source> + <translation>Dateiname:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="146"/> + <source>Enter the name of the archive file</source> + <translation>Gib den Dateinamen des Archivs ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="153"/> + <source>Select the archive file via a file selection dialog</source> + <translation>Wähle die Archivdatei mittels eines Dateiauswahldialoges</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="160"/> + <source>Prefix:</source> + <translation>Vorsatz:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="167"/> + <source>Enter a prefix to be prepended to each file</source> + <translation>Gib eine Vorsatz, der jeder Datei hinzugefügt wird, ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.py" line="88"/> + <source>Select Archive File</source> + <translation>Archivdatei auswählen</translation> + </message> +</context> +<context> + <name>GitBisectLogBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="14"/> + <source>Git Bisect Log</source> + <translation>Git Bisect Protokoll</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="42"/> + <source>Commit</source> + <translation>Revision</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="47"/> + <source>Operation</source> + <translation>Operation</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="52"/> + <source>Subject</source> + <translation>Betreff</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="66"/> + <source>Errors</source> + <translation>Fehler</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="72"/> + <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/GitBisectLogBrowserDialog.ui" line="88"/> + <source>Input</source> + <translation>Eingabe</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="110"/> + <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/GitBisectLogBrowserDialog.ui" line="113"/> + <source>&Send</source> + <translation>Sen&den</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="116"/> + <source>Alt+S</source> + <translation>Alt+D</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="123"/> + <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/GitBisectLogBrowserDialog.ui" line="130"/> + <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/GitBisectLogBrowserDialog.ui" line="133"/> + <source>&Password Mode</source> + <translation>&Kennwortmodus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="136"/> + <source>Alt+P</source> + <translation>Alt+K</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="57"/> + <source>&Refresh</source> + <translation>&Aktualisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="59"/> + <source>Press to refresh the list of commits</source> + <translation>Drücken, um die Protokollliste zu aktualisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="175"/> + <source>Process Generation Error</source> + <translation>Fehler beim Prozessstart</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="175"/> + <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> +</context> +<context> + <name>GitBisectStartDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="14"/> + <source>Git Bisect Start</source> + <translation>Git Bisect Start</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="23"/> + <source>Bad Commit:</source> + <translation>Fehlerhafte Revision:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="30"/> + <source>Enter a bad commit</source> + <translation>Gib eine fehlerhafte Revision ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="37"/> + <source>Good Commits:</source> + <translation>Korrekte Revisionen:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="44"/> + <source>Enter a list of good commits separated by space</source> + <translation>Gib eine Liste korrekter Revisionen durch Leerzeichen getrennt ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="51"/> + <source>Select to not checkout the working tree</source> + <translation>Auswählen, um das Arbeitsverzeichnis nicht auszuchecken</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="54"/> + <source>Don't checkout working tree</source> + <translation>Arbeitsverzeichnis nicht auschecken</translation> + </message> +</context> +<context> + <name>GitBlameDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="14"/> + <source>Git Blame</source> + <translation>Git Blame</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="45"/> + <source>Commit</source> + <translation>Revision</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="50"/> + <source>Author</source> + <translation>Autor</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="55"/> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="60"/> + <source>Time</source> + <translation>Zeit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="65"/> + <source>Line</source> + <translation>Zeile</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="79"/> + <source>Errors</source> + <translation>Fehler</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="98"/> + <source>Input</source> + <translation>Eingabe</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="120"/> + <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/GitBlameDialog.ui" line="123"/> + <source>&Send</source> + <translation>Sen&den</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="126"/> + <source>Alt+S</source> + <translation>Alt+D</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="133"/> + <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/GitBlameDialog.ui" line="140"/> + <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/GitBlameDialog.ui" line="143"/> + <source>&Password Mode</source> + <translation>&Kennwortmodus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="146"/> + <source>Alt+P</source> + <translation>Alt+K</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="119"/> + <source>Process Generation Error</source> + <translation>Fehler beim Prozessstart</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="119"/> + <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> +</context> +<context> + <name>GitBranchDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="14"/> + <source>Git Branch</source> + <translation>Git Branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="23"/> + <source>Branch Action</source> + <translation>Zweigaktion</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="29"/> + <source>Select to create a branch</source> + <translation>Wähle eine Zweigaktion</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="32"/> + <source><b>Create Branch</b> +<p>Select this entry in order to create a branch.</p></source> + <translation><b>Zweig erzeugen</b> +<p>Wähle diesen Eintrag, um einen Zweig zu erzeugen.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="36"/> + <source>Create</source> + <translation>Erzeugen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="46"/> + <source>Select to rename a branch</source> + <translation>Auswählen, um einen Zweig umzubenennen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="49"/> + <source><b>Rename</b> +<p>Select this entry in order to rename the selected branch.</p></source> + <translation><b>Umbenennen</b> +<p>Wähle diesen Eintrag, um den ausgewählten Zweig umzubenennen.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="53"/> + <source>Rename</source> + <translation>Umbenennen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="60"/> + <source>Select to delete a branch</source> + <translation>Auswählen, um einen Zweig zu löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="63"/> + <source><b>Delete Branch</b> +<p>Select this entry in order to delete the selected branch.</p></source> + <translation><b>Zweig löschen</b> +<p>Wähle diesen Eintrag, um den ausgewählten Zweig zu löschen.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="67"/> + <source>Delete</source> + <translation>Löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="74"/> + <source>Select to create a new branch and switch to it</source> + <translation>Auswählen, um einen neuen Zweig zu erzeugen und zu ihm umzuschalten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="77"/> + <source><b>Create &amp; Switch</b>\n<p>Select this entry in order to create a new branch and switch the working tree to it.</p></source> + <translation><b>Erzeugen &amp; Umschalten</b>\n<p>Wähle diesen Eintrag, um einen neuen Zweig zu erzeugen und das Arbeitsverzeichnis umzuschalten.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="80"/> + <source>Create && Switch</source> + <translation>Erzeugen && Umschalten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="87"/> + <source>Select to create a tracking branch and switch to it</source> + <translation>Auswählen, um einen Verfolgungszweig zu erzeugen und zu ihm umzuschalten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="90"/> + <source><b>Create Tracking Branch &amp; Switch</b>\n<p>Select this entry in order to create a new branch tracking a remote repository branch. The working tree is switched to it.</p></source> + <translation><b>Verfolgungszweig erzeugen &amp; Umschalten</b>\n<p>Wähle diesen Eintrag, um einen neuen Zweig, der ein entferntes Repository verfolgt, zu erzeugen und das Arbeitsverzeichnis umzuschalten.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="93"/> + <source>Create Tracking Branch && Switch</source> + <translation>Verfolgungszweig erzeugen && Umschalten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="125"/> + <source>Name:</source> + <translation>Name:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="138"/> + <source>Enter the name of the branch</source> + <translation>Gib den Namen des Zweiges ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="141"/> + <source><b>Branch Name</b> +<p>Enter the name of the branch to be created, deleted or moved.</p></source> + <translation><b>Zweigname</b> +<p>Gib den Namen des zu erzeugenden, zu löschenden oder umzubenennden Zweiges ein.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="157"/> + <source>Create Branch</source> + <translation>Zweig erzeugen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="163"/> + <source>Revision:</source> + <translation>Revision:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="170"/> + <source>Enter a revision at which to start the branch</source> + <translation>Gib die Startrevision für den Zweig ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="183"/> + <source>Rename Branch</source> + <translation>Zweig umbenennen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="189"/> + <source>New Name:</source> + <translation>Neuer Name:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="196"/> + <source>Enter a new name for the selected branch</source> + <translation>Gib den neuen Namen für den Zweig ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="238"/> + <source>Select to enforce the create operation</source> + <translation>Auswählen, um die Aktion zu erzwingen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="241"/> + <source>Enforce Operation</source> + <translation>Aktion erzwingen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="100"/> + <source>Select to associate a remote branch</source> + <translation>Auswählen, um mit einem entfernten Zweig zu verbinden</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="209"/> + <source>Set Tracking Branch</source> + <translation>Verfolgungszweig setzen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="110"/> + <source>Select to de-associate a remote branch</source> + <translation>Auswählen, um Verbindung mit einem entfernten Zweig zu lösen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="113"/> + <source>Unset Tracking Branch Information</source> + <translation>Verfolgungszweig lösen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="215"/> + <source>Remote Branch:</source> + <translation>Entfernter Zweig:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="228"/> + <source>Select the remote branch to associate</source> + <translation>Wähle den zu verbindenden, entfernten Zweig</translation> + </message> +</context> +<context> + <name>GitBranchPushDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="14"/> + <source>Git Push Branch</source> + <translation>Git Zweig hochladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="23"/> + <source>Branch Name:</source> + <translation>Zweigname:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="36"/> + <source>Select the branch</source> + <translation>Wähle den Zweig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="43"/> + <source>Remote Name:</source> + <translation>Entfernter Name:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="56"/> + <source>Select the remote repository</source> + <translation>Wähle das entfernte Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.py" line="36"/> + <source><all branches></source> + <translation><alle Zweige></translation> + </message> +</context> +<context> + <name>GitBundleDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="14"/> + <source>Git Bundle</source> + <translation>Git Bundle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="23"/> + <source>Revision</source> + <translation>Revision</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="29"/> + <source>Select to specify a revision or revision range</source> + <translation>Auswählen, um eine Revision oder einen Revisionsbereich einzugeben</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="32"/> + <source>Revisions:</source> + <translation>Revisionen:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation>Auswählen, um eine Revision per Marke zu wählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="52"/> + <source>Tag:</source> + <translation>Marke:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="62"/> + <source>Enter a tag name</source> + <translation>Gib den Namen der Marke ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="72"/> + <source>Select to specify a revision by a branch</source> + <translation>Auswählen, um eine Revision per Zweig zu wählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="75"/> + <source>Branch:</source> + <translation>Zweig:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="85"/> + <source>Enter a branch name</source> + <translation>Gib einen Zweignamen ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="42"/> + <source>Enter revisions or revision range expressions</source> + <translation>Gib Revisionen oder Revisionsausdrücke ein</translation> + </message> +</context> +<context> + <name>GitCherryPickDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="14"/> + <source>Git Cherry-pick</source> + <translation>Git Cherry-pick</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="23"/> + <source>Commits</source> + <translation>Revisionen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="29"/> + <source>Enter commits by id, branch or tag one per line</source> + <translation>Gib Revisionen per ID, Zweig oder Marke ein (eine pro Zeile)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="45"/> + <source>Select to append cherry-pick info to the commit message</source> + <translation>Auswählen, um Auswahlinformationen an die Revisionsmeldung zu hängen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="48"/> + <source>Append Cherry-pick &Info</source> + <translation>Auswahl&informationen anhängen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="58"/> + <source>Select to add a 'Signed-off-by' line to the commit message</source> + <translation>Auswählen, um eine Unterschriftenzeile anzuhängen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="61"/> + <source>Append '&Signed-off-by' line</source> + <translation>&Unterschriftenzeile anhängen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="68"/> + <source>Select to not commit the cherry-pick</source> + <translation>Auswählen, um nicht einzuchecken</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="71"/> + <source>Don't &commit</source> + <translation>&Nicht einchecken</translation> + </message> +</context> +<context> + <name>GitCommandDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="14"/> + <source>Git Command</source> + <translation>Git Befehl</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="23"/> + <source>Git Command:</source> + <translation>Git Befehl:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="36"/> + <source>Enter the Git command to be executed with all necessary parameters</source> + <translation>Gib den auszuführenden Git-Befehl mit allen notwendigen Parametern ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="39"/> + <source><b>Git Command</b> +<p>Enter the Git command to be executed including all necessary +parameters. If a parameter of the commandline includes a space you have to +surround this parameter by single or double quotes. Do not include the name +of the Git client executable (i.e. git).</p></source> + <translation><b>Git-Befehl</b> +<p>Gib den auszuführenden Git-Befehl mit allen notwendigen Parametern ein. +Falls ein Parameter des Befehls Leerzeichen enthält, so muss dieser Parameter in +einfache oder doppelte Anführungszeichen eingeschlossen werden. Der Name des +Git-Programms darf nicht eingegeben werden.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="65"/> + <source>Project Directory:</source> + <translation>Projektverzeichnis:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="78"/> + <source>This shows the root directory of the current project.</source> + <translation>Dies zeigt das Hauptverzeichnis des aktuellen Projektes an.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="81"/> + <source>project directory</source> + <translation>Projektverzeichnis</translation> + </message> +</context> +<context> + <name>GitCommitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="14"/> + <source>Git</source> + <translation>Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="20"/> + <source>Commit Message</source> + <translation>Änderungsbeschreibung</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="26"/> + <source>Enter the log message.</source> + <translation>Die Änderungsbeschreibung eingeben.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="29"/> + <source><b>Log Message</b> +<p>Enter the log message for the commit action.</p></source> + <translation><b>Änderungsbeschreibung</b> +<p>Gib die Änderungsbeschreibung für diese Einpflegeaktion ein.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="43"/> + <source>Recent commit messages</source> + <translation>Letzte Änderungsbeschreibungen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="50"/> + <source>Select a recent commit message to use</source> + <translation>Wähle eine zu verwendende Änderungsbeschreibung</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="70"/> + <source>Select to amend the last commit (leave message empty to keep it)</source> + <translation>Auswählen, um die letzte Änderung zu ergänzen (Beschreibung leer lassen, um die vorhandene zu behalten)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="73"/> + <source>Amend the last commit</source> + <translation>Letzte Änderung ergänzen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="80"/> + <source>Select to reset the author information</source> + <translation>Auswählen, um die Autorinformationen zurückzusetzen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="83"/> + <source>Reset Author Info</source> + <translation>Autorinformation zurücksetzen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="60"/> + <source>Select to commit only staged changes</source> + <translation>Auswählen, um nur vorgemerkte Änderungen einzupflegen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="63"/> + <source>Commit staged changes only</source> + <translation>Nur vorgemerkte Änderungen einpflegen</translation> + </message> +</context> +<context> + <name>GitCopyDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="14"/> + <source>Git Copy</source> + <translation>Git Kopiere</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="25"/> + <source>Source:</source> + <translation>Quelle:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="32"/> + <source>Shows the name of the source</source> + <translation>Zeigt den Namen der Quelle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="35"/> + <source><b>Source name</b> +<p>This field shows the name of the source.</p></source> + <translation><b>Quellname</b> +<p>Dieses Feld zeigt den namen der Quelle an.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="46"/> + <source>Enter the target name</source> + <translation>Gib den Zielnamen ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="49"/> + <source><b>Target name</b> +<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> + <translation><b>Zielname</b> +<p>Gib den Zielnamen in dieses Feld ein. Der Zielname muss der neue Name oder ein absoluter Pfad sein.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="57"/> + <source>Target:</source> + <translation>Ziel:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="64"/> + <source>Press to open a selection dialog</source> + <translation>Drücken, um einen Auswahldialog zu öffnen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="67"/> + <source><b>Target directory</b> +<p>Select the target name for the operation via a selection dialog.</p></source> + <translation><b>Zielverzeichnis</b> +<p>Auswahl des Zielverzeichnisses mit Hilfe eines Verzeichnisauswahldialoges.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="77"/> + <source>Select to force the operation</source> + <translation>Auswählen, um die Operation zu erzwingen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="80"/> + <source>Enforce operation</source> + <translation>Operation erzwingen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.py" line="51"/> + <source>Git Move</source> + <translation>Git Verschiebe</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.py" line="89"/> + <source>Select target</source> + <translation>Wähle Ziel aus</translation> + </message> +</context> +<context> + <name>GitDescribeDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="14"/> + <source>Git Tag List</source> + <translation>Markenliste</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="42"/> + <source>Commit</source> + <translation>Revision</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="47"/> + <source>Tag Info</source> + <translation>Marke</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="61"/> + <source>Errors</source> + <translation>Fehler</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="80"/> + <source>Input</source> + <translation>Eingabe</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="102"/> + <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/GitDescribeDialog.ui" line="105"/> + <source>&Send</source> + <translation>Sen&den</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="108"/> + <source>Alt+S</source> + <translation>Alt+D</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="115"/> + <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/GitDescribeDialog.ui" line="122"/> + <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/GitDescribeDialog.ui" line="125"/> + <source>&Password Mode</source> + <translation>&Kennwortmodus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="128"/> + <source>Alt+P</source> + <translation>Alt+K</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py" line="117"/> + <source>Process Generation Error</source> + <translation>Fehler beim Prozessstart</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py" line="117"/> + <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> +</context> +<context> + <name>GitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="14"/> + <source>Git</source> + <translation>Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="29"/> + <source>Output</source> + <translation>Ausgabe</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="57"/> + <source>Errors</source> + <translation>Fehler</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="76"/> + <source>Input</source> + <translation>Eingabe</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="98"/> + <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/GitDialog.ui" line="101"/> + <source>&Send</source> + <translation>Sen&den</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="104"/> + <source>Alt+S</source> + <translation>Alt+D</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="111"/> + <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/GitDialog.ui" line="118"/> + <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/GitDialog.ui" line="121"/> + <source>&Password Mode</source> + <translation>&Kennwortmodus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="124"/> + <source>Alt+P</source> + <translation>Alt+K</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="104"/> + <source>Process canceled.</source> + <translation>Vorgang abgebrochen.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="116"/> + <source>Process finished successfully.</source> + <translation>Vorgang erfolgreich beendet.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="118"/> + <source>Process crashed.</source> + <translation>Prozess gestorben.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="120"/> + <source>Proces finished with exit code {0}</source> + <translation>Prozess endete mit Code {0}</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/> + <source>Process Generation Error</source> + <translation>Fehler beim Prozessstart</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/> + <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/GitDialog.py" line="88"/> + <source>Additional Output</source> + <translation>Zusätzliche Ausgabe</translation> + </message> +</context> +<context> + <name>GitDiffDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="14"/> + <source>Git Diff</source> + <translation>Git Diff</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="26"/> + <source>Difference</source> + <translation>Unterschiede</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="39"/> + <source><b>Git Diff</b><p>This shows the output of the git diff command.</p></source> + <translation><b>Git-Diff</b><p>Dies zeigt die Ausgabe des git diff Befehls.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="85"/> + <source>Errors</source> + <translation>Fehler</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="179"/> + <source>Process Generation Error</source> + <translation>Fehler beim Prozessstart</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="179"/> + <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/GitDiffDialog.py" line="206"/> + <source>There is no difference.</source> + <translation>Es gibt keinen Unterschied.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="227"/> + <source><Start></source> + <translation><Anfang></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="228"/> + <source><End></source> + <translation><Ende></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="356"/> + <source>Save Diff</source> + <translation>Diff speichern</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="322"/> + <source>Patch Files (*.diff)</source> + <translation>Patchdateien (*.diff)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="339"/> + <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation><p>Die Patchdatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="356"/> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation><p>Die Patchdatei <b>{0}</b> konnte nicht gespeichert werden.<br>Grund: {1}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="56"/> + <source><b>Git Diff</b><p>This shows the output of the git diff command (stage to repo) if the dialog was asked to show separate diffs.</p></source> + <translation><b>Git-Diff</b><p>Dies zeigt die Ausgabe des git diff Befehls (Vormerkung zu Repository), falls der Dialog zur getrennten Ausgabe aufgerufen wurde.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="48"/> + <source>Refresh</source> + <translation>Aktualisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="50"/> + <source>Press to refresh the display</source> + <translation>Drücken, um die Anzeige zu aktualisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="96"/> + <source>Working Tree to Staging Area</source> + <translation>Arbeitsverzeichnis nach Vormerkung</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="97"/> + <source>Staging Area to HEAD Commit</source> + <translation>Vormerkung nach HEAD Revision</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="98"/> + <source>Working Tree to HEAD Commit</source> + <translation>Arbeitsverzeichnis nach HEAD Revision</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="99"/> + <source>Working to Staging (top) and Staging to HEAD (bottom)</source> + <translation>Arbeitsverzeichnis zu Vormerkung (oben) und Vormerkung zu Repository (unten)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="101"/> + <source>Stash Contents</source> + <translation>Ablageinhalt</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="102"/> + <source>Stash Contents of {0}</source> + <translation>Inhalt von Ablage {0}</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="171"/> + <source>Difference ({0})</source> + <translation>Unterschiede ({0})</translation> + </message> +</context> +<context> + <name>GitFetchDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="14"/> + <source>Git Fetch</source> + <translation>Git Fetch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="23"/> + <source>Remote Repository:</source> + <translation>Entferntes Repository:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="30"/> + <source>Select the remote repository to fetch from</source> + <translation>Wähle das entfernte Repository zum Herunterladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="46"/> + <source>Remote Branches:</source> + <translation>Entfernte Zweige:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="56"/> + <source>Press to update the list of remote branches</source> + <translation>Drücken, um die Liste der entfernten Zweige zu aktualisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="59"/> + <source>Update</source> + <translation>Aktualisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="81"/> + <source>Select the remote branches to be fetched</source> + <translation>Wähle die herunterzuladenden, entfernten Zweige</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="94"/> + <source>Local Branch:</source> + <translation>Lokaler Zweig:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="101"/> + <source>Select the local branch to fetch into</source> + <translation>Wähle den lokalen Zweig aus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="111"/> + <source>Select to remove non-existing tracking references </source> + <translation>Auswählen, um nicht existierende Verfolgungszweige zu löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="114"/> + <source>Prune obsolete tracking references</source> + <translation>Überholte Verfolgungszweige löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="121"/> + <source>Select to fetch tags as well</source> + <translation>Auswählen, um auch Marken zu laden</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="124"/> + <source>Include tags</source> + <translation>Marken einschließen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.py" line="36"/> + <source><All></source> + <translation><Alle></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.py" line="37"/> + <source><Custom></source> + <translation><Eigene Angaben></translation> + </message> +</context> +<context> + <name>GitListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitListDialog.ui" line="14"/> + <source>Git Select</source> + <translation>Git Select</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitListDialog.ui" line="23"/> + <source>Select from the list:</source> + <translation>Wähle aus der Liste:</translation> + </message> +</context> +<context> + <name>GitLogBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="14"/> + <source>Git Log</source> + <translation>Git Log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="491"/> + <source>Errors</source> + <translation>Fehler</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="497"/> + <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/GitLogBrowserDialog.ui" line="513"/> + <source>Input</source> + <translation>Eingabe</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="535"/> + <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/GitLogBrowserDialog.ui" line="538"/> + <source>&Send</source> + <translation>Sen&den</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="541"/> + <source>Alt+S</source> + <translation>Alt+D</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="548"/> + <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/GitLogBrowserDialog.ui" line="555"/> + <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/GitLogBrowserDialog.ui" line="558"/> + <source>&Password Mode</source> + <translation>&Kennwortmodus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="561"/> + <source>Alt+P</source> + <translation>Alt+K</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="65"/> + <source>From:</source> + <translation>Von:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="72"/> + <source>Enter the start date</source> + <translation>Gib das Anfangsdatum ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="82"/> + <source>To:</source> + <translation>Bis:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="89"/> + <source>Enter the end date</source> + <translation>Gib das Endedatum ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="112"/> + <source>Select the field to filter on</source> + <translation>Wähle das als Filter zu verwendende Feld</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="102"/> + <source>Author</source> + <translation>Autor</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="103"/> + <source>Committer</source> + <translation>Revisionsersteller</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1812"/> + <source>Branch</source> + <translation>Zweig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="104"/> + <source>Subject</source> + <translation>Betreff</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="174"/> + <source>Graph</source> + <translation>Grafik</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="189"/> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="199"/> + <source>Commit Date</source> + <translation>Revisionsdatum</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="214"/> + <source>Tags</source> + <translation>Marken</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="378"/> + <source>Action</source> + <translation>Aktion</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="383"/> + <source>Path</source> + <translation>Pfad</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="398"/> + <source>Copy from</source> + <translation>Kopiert von</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="257"/> + <source>Press to get the next bunch of log entries</source> + <translation>Drücken, um die nächsten Protokoll-Einträge zu erhalten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="260"/> + <source>&Next</source> + <translation>&Nächste</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="267"/> + <source>Enter the limit of entries to fetch</source> + <translation>Gib die Anzahl an zu holenden Einträgen ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="286"/> + <source>Select to stop listing log messages at a copy or move</source> + <translation>Auswählen, um die Anzeige von Protokoll Meldungen bei einer Kopier- oder Verschiebeaktion zu stoppen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="289"/> + <source>Stop on Copy/Move</source> + <translation>Bei Kopieren/Umbenennen anhalten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="22"/> + <source>Select action from menu</source> + <translation>Wähle eine Aktion aus dem Menü</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="88"/> + <source>&Refresh</source> + <translation>&Aktualisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="90"/> + <source>Press to refresh the list of commits</source> + <translation>Drücken, um die Protokollliste zu aktualisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="198"/> + <source>Added</source> + <translation>Hinzugefügt</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="199"/> + <source>Deleted</source> + <translation>Gelöscht</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="200"/> + <source>Modified</source> + <translation>Modifiziert</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="201"/> + <source>Copied</source> + <translation>Kopiert</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="202"/> + <source>Renamed</source> + <translation>Umbenannt</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="203"/> + <source>Type changed</source> + <translation>Typ geändert</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="204"/> + <source>Unmerged</source> + <translation>Nicht zusammengeführt</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="251"/> + <source>Show Author Columns</source> + <translation>Autor Spalten anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="253"/> + <source>Press to show the author columns</source> + <translation>Drücken, um die Autor Spalten anzuzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="261"/> + <source>Show Committer Columns</source> + <translation>Revisionsersteller Spalten anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="263"/> + <source>Press to show the committer columns</source> + <translation>Drücken, um die Revisionsersteller Spalten anzuzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="313"/> + <source>Copy Commits</source> + <translation>Revisionen kopieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="315"/> + <source>Cherry-pick the selected commits to the current branch</source> + <translation>Die ausgewählten Revisionen in den aktuellen Zweig kopieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="320"/> + <source>Tag</source> + <translation>Marke setzen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="322"/> + <source>Tag the selected commit</source> + <translation>Ausgewählte Revision mit einer Marke versehen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="326"/> + <source>Create a new branch at the selected commit.</source> + <translation>Neuen Zweig mit der ausgewählten Revision erzeugen.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="328"/> + <source>Branch && Switch</source> + <translation>Zweig erzeugen && Umschalten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="330"/> + <source>Create a new branch at the selected commit and switch the work tree to it.</source> + <translation>Neuen Zweig mit der ausgewählten Revision erzeugen und das Arbeitsverzeichnis umschalten.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1864"/> + <source>Switch</source> + <translation>Umschalten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="336"/> + <source>Switch the working directory to the selected commit</source> + <translation>Schaltet das Arbeitsverzeichnis auf die ausgewählte Revision um</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1890"/> + <source>Show Short Log</source> + <translation>Kurzprotokoll anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="342"/> + <source>Show a dialog with a log output for release notes</source> + <translation>Zeigt einen Dialog mit einem Kurzprotokoll zur Verwendung in Freigabemitteilungen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="345"/> + <source>Describe</source> + <translation>Beschreibe</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="347"/> + <source>Show the most recent tag reachable from a commit</source> + <translation>Zeigt die letzte von einer Revision erreichbare Marke</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="648"/> + <source>The git process did not finish within 30s.</source> + <translation>Der git-Prozess endete nicht innerhalb von 30s.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="651"/> + <source>Could not start the git executable.</source> + <translation>Das git Programm konnte nicht gestartet werden.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="654"/> + <source>Git Error</source> + <translation>Git Fehler</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="769"/> + <source>{0} ({1}%)</source> + <comment>action, confidence</comment> + <translation>{0} ({1}%)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="835"/> + <source>Process Generation Error</source> + <translation>Fehler beim Prozessstart</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="835"/> + <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/GitLogBrowserDialog.py" line="1725"/> + <source>Copy Changesets</source> + <translation>Änderungssätze kopieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1864"/> + <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/GitLogBrowserDialog.py" line="205"/> + <source>Unknown</source> + <translation>Unbekannt</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="209"/> + <source>Branches</source> + <translation>Zweige</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1890"/> + <source>Select a branch</source> + <translation>Zweig auswählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/> + <source>Select a default branch</source> + <translation>Standardzweig auswählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/> + <source>Branch & Switch</source> + <translation>Zweig erzeugen & Umschalten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="45"/> + <source>Select the mode (find or filter)</source> + <translation>Modus auswählen (Finden oder Filtern)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="126"/> + <source>Press to find the previous occurrence</source> + <translation>Drücken, um das vorherige Vorkommen zu finden</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="133"/> + <source>Press to find the next occurrence</source> + <translation>Drücken, um das nächste Vorkommen zu finden</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="101"/> + <source>Commit ID</source> + <translation>Revisions-ID</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="98"/> + <source>Find</source> + <translation>Finden</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="99"/> + <source>Filter</source> + <translation>Filtern</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="140"/> + <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Zweige</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="143"/> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Marken</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2073"/> + <source>'{0}' was not found.</source> + <translation>'{0}' wurde nicht gefunden.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2073"/> + <source>Find Commit</source> + <translation>Revision finden</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="119"/> + <source>Enter the regular expression to filter on or search for</source> + <translation>Gib den regulären Ausdruck zum Filtern oder Suchen ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="105"/> + <source>File</source> + <translation>Datei</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="224"/> + <source>Press to move up in the log list</source> + <translation>Drücken, um in der Liste nach oben zu gehen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="234"/> + <source>Press to move down in the log list</source> + <translation>Drücken, um in der Liste nach unten zu gehen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="388"/> + <source>Additions</source> + <translation>Ergänzungen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="393"/> + <source>Deletions</source> + <translation>Löschungen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2119"/> + <source>Differences</source> + <translation>Unterschiede</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="445"/> + <source><a href="save:me">Save</a></source> + <translation><a href="save:me">Speichern</a></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="122"/> + <source><table><tr><td><b>Commit ID</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2} &lt;{3}&gt;</td></tr><tr><td><b>Commit Date</b></td><td>{4}</td></tr><tr><td><b>Committer</b></td><td>{5} &lt;{6}&gt;</td></tr>{7}<tr><td><b>Subject</b></td><td>{8}</td></tr>{9}</table></source> + <translation><table><tr><td><b>Revisions-ID</b></td><td>{0}</td></tr><tr><td><b>Datum</b></td><td>{1}</td></tr><tr><td><b>Autor</b></td><td>{2} &lt;{3}&gt;</td></tr><tr><td><b>Revisionsdatum</b></td><td>{4}</td></tr><tr><td><b>Revisionsersteller</b></td><td>{5} &lt;{6}&gt;</td></tr>{7}<tr><td><b>Betreff</b></td><td>{8}</td></tr>{9}</table></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="134"/> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Vorgänger</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="137"/> + <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Nachfolger</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="146"/> + <source><tr><td><b>Message</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Beschreibung</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1275"/> + <source>Side-by-Side Diff to Parent {0}</source> + <translation>Unterschiede nebeneinander zu Vorgänger {0}</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1287"/> + <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> + <translation><a href="sbsdiff:{0}_{1}">Unterschiede nebeneinander</a></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2133"/> + <source>Differences to Parent {0}</source> + <translation>Unterschiede zu Vorgänger {0}</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2148"/> + <source>Diff to Parent {0}</source> + <translation>Diff zu Vorgänger {0}</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2174"/> + <source>There is no difference.</source> + <translation>Es gibt keinen Unterschied.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2337"/> + <source>Save Diff</source> + <translation>Diff speichern</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2303"/> + <source>Patch Files (*.diff)</source> + <translation>Patchdateien (*.diff)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2320"/> + <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation><p>Die Patchdatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2337"/> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation><p>Die Patchdatei <b>{0}</b> konnte nicht gespeichert werden.<br>Grund: {1}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="241"/> + <source>Show Commit ID Column</source> + <translation>Commit ID Spalte anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="243"/> + <source>Press to show the commit ID column</source> + <translation>Drücken, um die Commit ID Spalte anzuzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="271"/> + <source>Show Branches Column</source> + <translation>Zweige Spalte anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="273"/> + <source>Press to show the branches column</source> + <translation>Drücken, um die Zweige Spalte anzuzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="281"/> + <source>Show Tags Column</source> + <translation>Marken Spalte anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="283"/> + <source>Press to show the Tags column</source> + <translation>Drücken, um die Marken Spalte anzuzeigen</translation> + </message> +</context> +<context> + <name>GitMergeDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="14"/> + <source>Git Merge</source> + <translation>Git Merge</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="23"/> + <source>Revision</source> + <translation>Revision</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="29"/> + <source>Select to specify a revision by changeset id</source> + <translation>Auswählen, um eine Revision mit ihrer Änderungssatz-ID anzugeben</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="32"/> + <source>Commit:</source> + <translation>Revision:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="42"/> + <source>Enter a commit id</source> + <translation>Gib eine Revisions-ID ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation>Auswählen, um eine Revision per Marke zu wählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="52"/> + <source>Tag:</source> + <translation>Marke:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="62"/> + <source>Enter a tag name</source> + <translation>Gib den Namen der Marke ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="118"/> + <source>Select to not specify a specific revision</source> + <translation>Auswählen, um keine spezifische Revision zu wählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="121"/> + <source>No commit selected</source> + <translation>Keine Revision ausgewählt</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="134"/> + <source>Select to commit the merge</source> + <translation>Auswählen um den Merge einzupflegen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="137"/> + <source>Commit Merge</source> + <translation>Merge einpflegen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="146"/> + <source>Commit Message:</source> + <translation>Änderungsbeschreibung:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="153"/> + <source>Enter a message for the merge commit</source> + <translation>Gib die Änderungsbeschreibung für den Merge ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="163"/> + <source>Select to append the log summaries of merged commits</source> + <translation>Auswählen, um die Protokollzusammenfassung der zusammengeführten Revisionen anzuhängen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="166"/> + <source>Add Log Message Summary</source> + <translation>Protokollzusammenfassung anhängen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="176"/> + <source>Select to show diff statistics at the end of the merge</source> + <translation>Auswählen, um diff Statistiken am Ende des Vorgangs anzuzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="179"/> + <source>Show diff statistics</source> + <translation>Diff Statistiken anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="72"/> + <source>Select to specify a revision by a local branch</source> + <translation>Auswählen, um eine Revision per lokalem Zweig zu wählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="75"/> + <source>Local Branch:</source> + <translation>Lokaler Zweig:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="85"/> + <source>Enter a local branch name</source> + <translation>Gib einen lokalen Zweignamen ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="95"/> + <source>Select to specify a revision by a remote branch</source> + <translation>Auswählen, um eine Revision per entferntem Zweig zu wählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="98"/> + <source>Remote Branch:</source> + <translation>Entfernter Zweig:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="108"/> + <source>Enter a remote branch name</source> + <translation>Gib einen entfernten Zweignamen ein</translation> + </message> +</context> +<context> + <name>GitNewProjectOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="14"/> + <source>New Project from Repository</source> + <translation>Neues Projekt aus Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="28"/> + <source>&URL:</source> + <translation>&URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="60"/> + <source>Select the repository url via a directory selection dialog</source> + <translation>Wähle die URL mittels eines Verzeichnisauswahldialoges</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="74"/> + <source>Project &Directory:</source> + <translation>Projekt&verzeichnis:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="84"/> + <source>Enter the directory of the new project.</source> + <translation>Gib das Verzeichnis für das neue Projekt ein.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="87"/> + <source><b>Project Directory</b> +<p>Enter the directory of the new project. It will be retrieved from +the repository and be placed in this directory.</p></source> + <translation><b>Projektverzeichnis</b> +<p>Gib das Verzeichnis für das neue Projekt ein. Es wird aus dem Repository geladen +und in dieses Verzeichnis geschrieben.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py" line="87"/> + <source>Select Repository-Directory</source> + <translation>Wähle Repositoryverzeichnis</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py" line="102"/> + <source>Select Project Directory</source> + <translation>Wähle Projektverzeichnis</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="17"/> + <source><b>New Project from Repository Dialog</b> +<p>Enter the various repository infos into the entry fields. These values are used, when the new project is retrieved from the repository.</p> +<p>For remote repositories the URL must contain the hostname.</p></source> + <translation><b>Dialog für Neues Projekt aus Repository</b> +<p>Gib die verschiedenen Repositoryinformationen in die Felder ein. Die Angaben werden verwendet, um ein neues Projekt aus dem Repository zu holen.</p> +<p>Für ein entferntes Repository muss die URL den Hostnamen beinhalten.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="44"/> + <source>Enter the URL of the repository</source> + <translation>Gib die URL des Repository ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="67"/> + <source>Press to clear the history of entered repository URLs</source> + <translation>Drücken, um die Chronik eingegebener Repository URLs zu löschen</translation> + </message> +</context> +<context> + <name>GitOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="29"/> + <source>Commit &Message:</source> + <translation>Änderungs&beschreibung:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="39"/> + <source>Enter the log message for the new project.</source> + <translation>Gib die Änderungsbeschreibung für das neue Projekt ein.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="42"/> + <source><b>Log Message</b> +<p>Enter the log message to be used for the new project.</p></source> + <translation><b>Änderungsbeschreibung</b> +<p>Gib die Änderungsbeschreibung für das neue Projekt ein.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="46"/> + <source>new project started</source> + <translation>Neues Projekt angelegt</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="14"/> + <source>Initial Commit</source> + <translation>Initiales Einpflegen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="17"/> + <source><b>Initial Commit Dialog</b> +<p>Enter the message for the initial commit.</p></source> + <translation><b>Initiales Einpflegen</b> +<p>Gib die Beschreibung für das erste Einpflegen ein.</p></translation> + </message> +</context> +<context> + <name>GitPage</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="20"/> + <source><b>Configure Git Interface</b></source> + <translation><b>Git-Schnittstelle einstellen</b></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="40"/> + <source>Log</source> + <translation>Protokoll</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="46"/> + <source>No. of log messages shown:</source> + <translation>Anzahl angezeigter Protokollmeldungen:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="53"/> + <source>Enter the number of log messages to be shown</source> + <translation>Gib die Anzahl anzuzeigender Protokollmeldungen ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="118"/> + <source>Commit</source> + <translation>Einpflegen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="124"/> + <source>No. of commit messages to remember:</source> + <translation>Anzahl zu speichernder Änderungsmeldungen:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="131"/> + <source>Enter the number of commit messages to remember</source> + <translation>Gib die Anzahl zu speichernder Änderungsmeldungen ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="199"/> + <source>Cleanup</source> + <translation>Aufräumen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="205"/> + <source>Pattern:</source> + <translation>Muster:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="212"/> + <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> + <translation>Gib die Dateinamenmuster für das Aufräumen ein (Einträge durch Leerzeichen getrennt)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="222"/> + <source>Repository Optimization</source> + <translation>Repositoryoptimierung</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="228"/> + <source>Select this to use the '--aggressive' option for garbage collection</source> + <translation>Auswählen, um die '--aggressive' Option für die Müllbeseitigung zu verwenden</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="231"/> + <source>Perform aggressive repository optimization</source> + <translation>Aggressive Repositoryoptimierung verwenden</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="241"/> + <source>Edit the Git configuration file</source> + <translation>Git Konfigurationsdatei editieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="244"/> + <source>Edit configuration file</source> + <translation>Konfigurationsdatei editieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="160"/> + <source>Commit ID length:</source> + <translation>Revisions-ID Länge:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="167"/> + <source>Enter the number of character to show for the commit ID</source> + <translation>Gib die Anzahl anzuzeigender Zeichen der Revisions-ID ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="82"/> + <source>No. of subject characters shown in list:</source> + <translation>Anzahl in der Liste angezeigter Zeichen des Betreffs:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="89"/> + <source>Enter the number of characters of the commit subject to be shown in the list</source> + <translation>Gib die Anzahl der in der Protokollliste anzuzeigenden Zeichen des Betreffs ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="14"/> + <source>Select to perform an expensive copy detection</source> + <translation>Auswählen, um eine aufwändige Suche nach Kopien durchzuführen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="95"/> + <source>All</source> + <translation>Alle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="108"/> + <source>Find copies harder</source> + <translation>Kopien aufwändig finden</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="105"/> + <source>Select to perform expensive copy detection</source> + <translation>Auswählen, um eine aufwändige Suche nach Kopien durchzuführen</translation> + </message> +</context> +<context> + <name>GitPatchFilesDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py" line="83"/> + <source>Patch Files</source> + <translation>Patchdateien</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="37"/> + <source>Press to add patch files to the list</source> + <translation>Drücken, um Patchdateien zur Liste hinzuzufügen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="44"/> + <source>Press to delete the selected patch files from the list</source> + <translation>Drücken, um die ausgewählten Patchdateien aus der Liste zu löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="58"/> + <source>Press to move the selected file up</source> + <translation>Drücken, um die ausgewählte Datei nach oben zu verschieben</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="65"/> + <source>Press to move the selected file down</source> + <translation>Drücken, um die ausgewählte Datei nach unten zu verschieben</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="91"/> + <source>Strip Count:</source> + <translation># Löschungen:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="98"/> + <source>Enter number of leading directories to strip off (default 1)</source> + <translation>Gib die Anzahl an führenden Verzeichnissen, die gelöscht werden sollen, ein (Standard 1)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="129"/> + <source>Select, if the patch has inaccurate end-of-file markers</source> + <translation>Auswählen, wenn der Patch ungültige Dateiendemarkierungen hat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="132"/> + <source>Patch has inaccurate end-of-file</source> + <translation>Patch hat ungültige Dateiendemarker</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="139"/> + <source>Select, if the line counts of the patch header may be wrong</source> + <translation>Auswählen, wenn Zeileninformationen im Pathheader falsch sein könnten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="142"/> + <source>Don't trust line counts</source> + <translation>Zeileninformationen nicht vertrauen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py" line="83"/> + <source>Patch Files (*.diff *.patch);;All Files (*)</source> + <translation>Patchdateien (*.diff *.patch);;Alle Dateien (*)</translation> + </message> +</context> +<context> + <name>GitPatchStatisticsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="14"/> + <source>Patch Statistics</source> + <translation>Patch Statistiken</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="23"/> + <source>Insertions and Deletions:</source> + <translation>Einfügungen und Löschungen:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="52"/> + <source># Insertions</source> + <translation># Einfügungen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="57"/> + <source># Deletions</source> + <translation># Löschungen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="62"/> + <source>File</source> + <translation>Datei</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="70"/> + <source>Summary Information:</source> + <translation>Zusammenfassende Informationen:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="122"/> + <source>Process Generation Error</source> + <translation>Fehler beim Prozessstart</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="122"/> + <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> +</context> +<context> + <name>GitProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="488"/> + <source>Version Control</source> + <translation>Versionskontrolle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="499"/> + <source>Commit changes to repository...</source> + <translation>Änderungen einpflegen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="505"/> + <source>Add/Stage to repository</source> + <translation>Hinzufügen/Vormerken</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="508"/> + <source>Unstage changes</source> + <translation>Vormerkung rückgängig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="514"/> + <source>Remove from repository (and disk)</source> + <translation>Vom Repository (und der Festplatte) löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="588"/> + <source>Remove from repository only</source> + <translation>Nur vom Repository löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="430"/> + <source>Copy</source> + <translation>Kopieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="432"/> + <source>Move</source> + <translation>Verschieben</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="435"/> + <source>Show log browser</source> + <translation>Protokoll-Browser anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="520"/> + <source>Show status</source> + <translation>Status anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="525"/> + <source>Show differences</source> + <translation>Unterschiede anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="229"/> + <source>Show differences side-by-side</source> + <translation>Unterschiede nebeneinander anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="529"/> + <source>Show differences (extended)</source> + <translation>Unterschiede anzeigen (erweitert)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="238"/> + <source>Show differences side-by-side (extended)</source> + <translation>Unterschiede nebeneinander anzeigen (erweitert)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="244"/> + <source>Show annotated file</source> + <translation>Zeige kommentierte Datei</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="535"/> + <source>Revert changes</source> + <translation>Änderungen rückgängig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="542"/> + <source>Select all local file entries</source> + <translation>Alle lokalen Dateieinträge auswählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="544"/> + <source>Select all versioned file entries</source> + <translation>Alle versionierten Dateieinträge auswählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="546"/> + <source>Select all local directory entries</source> + <translation>Alle lokalen Verzeichniseinträge auswählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="548"/> + <source>Select all versioned directory entries</source> + <translation>Alle versionierten Verzeichniseinträge auswählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="551"/> + <source>Configure...</source> + <translation>Einstellungen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="588"/> + <source>Do you really want to remove these files from the repository?</source> + <translation>Wollen Sie wirklich diese Dateien vom Repository löschen?</translation> + </message> +</context> +<context> + <name>GitProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="73"/> + <source>New from repository</source> + <translation>Neu aus Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="73"/> + <source>&New from repository...</source> + <translation>&Neu aus Repository...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="78"/> + <source>Create (clone) a new project from a Git repository</source> + <translation>Erzeuge (klone) ein neues Projekt aus einem Git-Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="81"/> + <source><b>New from repository</b><p>This creates (clones) a new local project from a Git repository.</p></source> + <translation><b>Neu aus Repository</b><p>Dies erzeugt (klone) ein neues Projekt aus dem Git-Repository.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="89"/> + <source>Fetch changes</source> + <translation>Änderungen herunterladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="94"/> + <source>Fetch changes from a remote repository</source> + <translation>Änderungen von einem entfernten Repository herunterladen und einarbeiten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="97"/> + <source><b>Fetch changes</b><p>This fetches changes from a remote repository into the local repository.</p></source> + <translation><b>Änderungen herunterladen</b><p>Änderungen von einem entfernten Repository herunterladen und in das lokale Repository einarbeiten</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="105"/> + <source>Pull changes</source> + <translation>Änderungen holen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="110"/> + <source>Pull changes from a remote repository and update the work area</source> + <translation>Änderungen von einem entfernten Repository holen und den Arbeitsbereich aktualisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="113"/> + <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository and updates the work area.</p></source> + <translation><b>Änderungen holen</b><p>Änderungen von einem entfernten Repository in das lokale Repository herunterladen und den Arbeitsbereich aktualisieren</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="137"/> + <source>Push changes</source> + <translation>Änderungen hochladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="142"/> + <source>Push changes to a remote repository</source> + <translation>Änderungen an ein entferntes Repository hochladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="145"/> + <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> + <translation><b>Änderungen hochladen</b><p>Dies lädt Änderungen vom lokalen Repository an ein entferntes Repository hoch.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="153"/> + <source>Export from repository</source> + <translation>Export aus Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="153"/> + <source>&Export from repository...</source> + <translation>&Export aus Repository...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="158"/> + <source>Export a project from the repository</source> + <translation>Exportiert ein Projekt aus dem Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="161"/> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation><b>Export aus Repository</b<<p>Dies exportiert ein Projekt aus dem Repository.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="168"/> + <source>Show log browser</source> + <translation>Protokoll-Browser anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="173"/> + <source>Show a dialog to browse the log of the local project</source> + <translation>Zeigt einen Dialog, um das Protokoll des lokalen Projektes durchzusehen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="176"/> + <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation><b>Protokoll-Browser anzeigen</b><p>Dies zeigt einen Dialog, um das Protokoll des lokalen Projektes durchzusehen. Zunächst wird nur eine begrenzte Anzahl an Einträgen angezeigt. Weitere können später nachgeladen werden.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="185"/> + <source>Show reflog browser</source> + <translation>Reflog-Browser anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="190"/> + <source>Show a dialog to browse the reflog of the local project</source> + <translation>Zeigt einen Dialog, um das Reflog des lokalen Projektes durchzusehen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="193"/> + <source><b>Show reflog browser</b><p>This shows a dialog to browse the reflog of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation><b>Reflog-Browser anzeigen</b><p>Dies zeigt einen Dialog, um das Reflog des lokalen Projektes durchzusehen. Zunächst wird nur eine begrenzte Anzahl an Einträgen angezeigt. Weitere können später nachgeladen werden.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="202"/> + <source>Show differences</source> + <translation>Unterschiede anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="202"/> + <source>Show &differences...</source> + <translation>&Unterschiede anzeigen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="207"/> + <source>Show the differences of the local project to the repository</source> + <translation>Zeigt die Unterschiede des lokalen Projektes zum Repository an</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="210"/> + <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> + <translation><b>Unterschiede anzeigen</b><p>Dies zeigt Unterschiede des lokalen Projektes zum Repository an.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="218"/> + <source>Show differences (extended)</source> + <translation>Unterschiede anzeigen (erweitert)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="218"/> + <source>Show differences (extended) ...</source> + <translation>Unterschiede anzeigen (erweitert) ...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="223"/> + <source>Show the difference of revisions of the project to the repository</source> + <translation>Zeigt den Unterschied von Revisionen des Projektes an</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="226"/> + <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> + <translation><b>Unterschiede anzeigen (erweitert)</b><p>Dies zeigt Unterschiede von Revisionen des Projektes an.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="234"/> + <source>Show status</source> + <translation>Status anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="234"/> + <source>Show &status...</source> + <translation>Status an&zeigen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="239"/> + <source>Show the status of the local project</source> + <translation>Zeige den Status des lokalen Projektes an</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="242"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation><b>Status anzeigen</b><p>Dies zeigt den Status des lokalen Projektes an.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="249"/> + <source>Switch</source> + <translation>Umschalten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="249"/> + <source>S&witch...</source> + <translation>Umschal&ten...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="254"/> + <source>Switch the working directory to another revision</source> + <translation>Schaltet das Arbeitsverzeichnis auf eine andere Revision um</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="257"/> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation><b>Umschalten</b><p>Dies schaltet das lokale Arbeitsverzeichnis auf eine andere Revision um.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="265"/> + <source>Tag in repository</source> + <translation>Im Repository markieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="265"/> + <source>&Tag in repository...</source> + <translation>Im Repository &markieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="270"/> + <source>Perform tag operations for the local project</source> + <translation>Markenoperationen für das lokale Projekt durchführen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="273"/> + <source><b>Tag in repository</b><p>This performs selectable tag operations for the local project.</p></source> + <translation><b>Im Repository markieren</b><p>Dies führt auswählbare Markenoperationen für das lokale Projekt durch.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="281"/> + <source>List tags</source> + <translation>Marken listen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="281"/> + <source>&List tags...</source> + <translation>&Marken listen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="285"/> + <source>List tags of the project</source> + <translation>Listet Marken des Projektes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="288"/> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation><b>Marken listen</b><p>Dies listet die Marken des Projektes.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="295"/> + <source>Show most recent tag</source> + <translation>Aktuellste Marke zeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="299"/> + <source>Show the most recent tag reachable from the work tree</source> + <translation>Zeigt die aktuellste Marke, die vom Arbeitsbereich erreichbar ist</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="310"/> + <source>List branches</source> + <translation>Zweige listen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="310"/> + <source>&List branches...</source> + <translation>Zweige &listen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="314"/> + <source>List branches of the project</source> + <translation>Listet Zweige des Projektes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="317"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Zweige listen</b><p>Dies listet die Zweige des Projektes.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="324"/> + <source>List merged branches</source> + <translation>Zusammengeführte Zweige listen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="324"/> + <source>List &merged branches...</source> + <translation>&Zusammengeführte Zweige listen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="328"/> + <source>List merged branches of the project</source> + <translation>Listet zusammengeführte Zweige des Projektes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="331"/> + <source><b>List merged branches</b><p>This lists the merged branches of the project.</p></source> + <translation><b>Zusammengeführte Zweige listen</b><p>Dies listet die zusammengeführten Zweige des Projektes.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="339"/> + <source>List non-merged branches</source> + <translation>Nicht zusammengeführte Zweige listen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="339"/> + <source>List &non-merged branches...</source> + <translation>&Nicht zusammengeführte Zweige listen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="343"/> + <source>List non-merged branches of the project</source> + <translation>Listet nicht zusammengeführte Zweige des Projektes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="346"/> + <source><b>List non-merged branches</b><p>This lists the non-merged branches of the project.</p></source> + <translation><b>Nicht zusammengeführte Zweige listen</b><p>Dies listet die nicht zusammengeführten Zweige des Projektes.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="354"/> + <source>Branch in repository</source> + <translation>Im Repository verzweigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="354"/> + <source>&Branch in repository...</source> + <translation>Im Repository ver&zweigen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="359"/> + <source>Perform branch operations for the local project</source> + <translation>Zweigoperationen für das lokale Projekt durchführen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="362"/> + <source><b>Branch in repository</b><p>This performs selectable branch operations for the local project.</p></source> + <translation><b>Im Repository verzweigen</b><p>Dies führt auswählbare Zweigoperationen für das lokale Projekt durch.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="370"/> + <source>Delete Remote Branch</source> + <translation>Entfernten Zweig löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="370"/> + <source>&Delete Remote Branch...</source> + <translation>Entfernten Zweig &löschen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="374"/> + <source>Delete a branch from a remote repository</source> + <translation>Löscht einen Zweig aus eine entfernten Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="377"/> + <source><b>Delete Remote Branch</b><p>This deletes a branch from a remote repository.</p></source> + <translation><b>Entfernten Zweig löschen</b><p>Dies löscht einen Zweig aus eine entfernten Repository</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="384"/> + <source>Show current branch</source> + <translation>Zeige aktuellen Zweig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="388"/> + <source>Show the current branch of the project</source> + <translation>Zeigt den aktuellen Zweig des Projektes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="391"/> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation><b>Zeige aktuellen Zweig</b><p>Dies zeigt den aktuellen Zweig des Projektes.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="398"/> + <source>Revert changes</source> + <translation>Änderungen rückgängig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="398"/> + <source>Re&vert changes</source> + <translation>Änderungen &rückgängig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="403"/> + <source>Revert all changes made to the local project</source> + <translation>Alle Änderungen am lokalen Projekt werden rückgängig gemacht</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="406"/> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> + <translation><b>Änderungen rückgängig</b><p>Dies macht alle Änderungen am lokalen Projekt rückgängig.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="413"/> + <source>Unstage changes</source> + <translation>Vormerkung rückgängig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="413"/> + <source>&Unstage changes</source> + <translation>Vormerkung &rückgängig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="418"/> + <source>Unstage all changes made to the local project</source> + <translation>Alle Vormerkungen des lokalen Projektes werden rückgängig gemacht</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="421"/> + <source><b>Unstage changes</b><p>This unstages all changes made to the local project.</p></source> + <translation><b>Vormerkung rückgängig</b><p>Dies macht alle Vormerkung des lokalen Projekt rückgängig.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="428"/> + <source>Merge</source> + <translation>Änderungen zusammenführen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="428"/> + <source>Mer&ge changes...</source> + <translation>Änderungen &zusammenführen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="433"/> + <source>Merge changes into the local project</source> + <translation>Änderungen mit dem lokalen Projekt zusammenführen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="436"/> + <source><b>Merge</b><p>This merges changes into the local project.</p></source> + <translation><b>Änderungen zusammenführen</b><p>Dies führt Änderungen mit dem lokalen Projekt zusammen.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="443"/> + <source>Cancel uncommitted/failed merge</source> + <translation>Nicht abgeschlossene/fehlgeschlagene Zusammenführung abbrechen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="447"/> + <source>Cancel an uncommitted or failed merge and lose all changes</source> + <translation>Bricht eine nicht abgeschlossenen oder fehlgeschlagene Zusammenführung ab und löscht alle Änderungen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="450"/> + <source><b>Cancel uncommitted/failed merge</b><p>This cancels an uncommitted or failed merge causing all changes to be lost.</p></source> + <translation><b>Nicht abgeschlossene/fehlgeschlagene Zusammenführung abbrechen</b><p>Dies bricht eine nicht abgeschlossenen oder fehlgeschlagene Zusammenführung ab und löscht alle Änderungen.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="458"/> + <source>Commit failed merge</source> + <translation>Fehlgeschlagene Zusammenführung einpflegen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="462"/> + <source>Commit a failed merge after conflicts have been resolved</source> + <translation>Pflegt eine fehlgeschlagene Zusammenführung ein, nachdem Konflikte behoben wurden</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="465"/> + <source><b>Commit failed merge</b><p>This commits a failed merge after conflicts have been resolved.</p></source> + <translation><b>Fehlgeschlagene Zusammenführung einpflegen</b><p>Dies pflegt eine fehlgeschlagene Zusammenführung ein, nachdem Konflikte behoben wurden.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="473"/> + <source>Cleanup</source> + <translation>Aufräumen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="473"/> + <source>Cleanu&p</source> + <translation>Au&fräumen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="477"/> + <source>Cleanup the local project</source> + <translation>Räume das lokale Projekt auf</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="480"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Aufräumen</b><p>Dies räumt das lokale Projekt auf.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="487"/> + <source>Execute command</source> + <translation>Befehl ausführen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="487"/> + <source>E&xecute command...</source> + <translation>Befehl ausf&ühren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="491"/> + <source>Execute an arbitrary Git command</source> + <translation>Führe einen beliebigen Git-Befehl aus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="494"/> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Git command.</p></source> + <translation><b>Befehl ausführen</b><p>Dies öffnet einen Dialog zur Eingabe eines beliebeigen Git-Befehls.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="502"/> + <source>Configure</source> + <translation>Einstellungen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="502"/> + <source>Configure...</source> + <translation>Einstellungen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="506"/> + <source>Show the configuration dialog with the Git page selected</source> + <translation>Zeigt den Konfigurationsdialog mit ausgewählter Git-Seite</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="509"/> + <source><b>Configure</b><p>Show the configuration dialog with the Git page selected.</p></source> + <translation><b>Einstellungen</b><p>Zeigt den Konfigurationsdialog mit ausgewählter Git-Seite.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="517"/> + <source>Show Remotes</source> + <translation>Zeige Entfernte</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="517"/> + <source>Show Remotes...</source> + <translation>Zeige Entfernte...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="521"/> + <source>Show the available remote repositories</source> + <translation>Zeigt die verfügbaren entfernten Repositories</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="539"/> + <source><b>Show Remotes</b><p>This shows the remote repositories available for pulling, fetching and pushing.</p></source> + <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"/> + <source>Show Remote Info</source> + <translation>Zeige entfernte Informationen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="532"/> + <source>Show Remote Info...</source> + <translation>Zeige entfernte Informationen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="536"/> + <source>Show information about a remote repository</source> + <translation>Zeigt Informationen über ein entferntes Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1161"/> + <source>Add</source> + <translation>Hinzufügen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="547"/> + <source>Add...</source> + <translation>Hinzufügen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="551"/> + <source>Add a remote repository</source> + <translation>Ein entferntes Repository hinzufügen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="554"/> + <source><b>Add</b><p>This adds a remote repository.</p></source> + <translation><b>Hinzufügen</b><p>Ein entferntes Repository hinzufügen.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1785"/> + <source>Remove</source> + <translation>Entfernen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="561"/> + <source>Remove...</source> + <translation>Entfernen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="565"/> + <source>Remove a remote repository</source> + <translation>Ein entferntes Repository entfernen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="568"/> + <source><b>Remove</b><p>This removes a remote repository.</p></source> + <translation><b>Entfernen</b><p>Ein entferntes Repository entfernen.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1799"/> + <source>Prune</source> + <translation>Aufräumen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="575"/> + <source>Prune...</source> + <translation>Aufräumen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="579"/> + <source>Prune stale remote-tracking branches of a remote repository</source> + <translation>Löscht lose Trackingzweige eines entfernten Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="582"/> + <source><b>Prune</b><p>This prunes stale remote-tracking branches of a remote repository.</p></source> + <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"/> + <source>Rename</source> + <translation>Umbenennen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="590"/> + <source>Rename...</source> + <translation>Umbenennen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="594"/> + <source>Rename a remote repository</source> + <translation>Ein entferntes Repository umbenennen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="597"/> + <source><b>Rename</b><p>This renames a remote repository.</p></source> + <translation><b>Umbenennen</b><p>Dies benennt ein entferntes Repository um.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1833"/> + <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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="649"/> + <source>Cancel Copying Session</source> + <translation>Kopiersitzung abbrechen</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> + </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> + </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> + </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> + </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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> + <source>Show stash</source> + <translation>Ablage anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> + <source>Show stash...</source> + <translation>Ablage anzeigen...</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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="702"/> + <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"/> + <source>Restore && Keep</source> + <translation>Wiederherstellen && Behalten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="714"/> + <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"/> + <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"/> + <source>Restore && Delete</source> + <translation>Wiederherstellen && Löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="728"/> + <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"/> + <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"/> + <source>Create Branch</source> + <translation>Zweig erzeugen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="742"/> + <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"/> + <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"/> + <source>Delete</source> + <translation>Löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="757"/> + <source>Delete a stash</source> + <translation>Ablage löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="760"/> + <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"/> + <source>Delete All</source> + <translation>Alle Löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="771"/> + <source>Delete all stashes</source> + <translation>Alle Ablagen löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="774"/> + <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"/> + <source>Edit user configuration</source> + <translation>Nutzerkonfiguration editieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <source>Edit user configuration...</source> + <translation>Nutzerkonfiguration editieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="785"/> + <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"/> + <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"/> + <source>Edit repository configuration</source> + <translation>Repositorykonfiguration editieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <source>Edit repository configuration...</source> + <translation>Repositorykonfiguration editieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="799"/> + <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> + </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> + </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> + </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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="862"/> + <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"/> + <source>Repository Statistics</source> + <translation>Repository Statistiken</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <source>Repository Statistics...</source> + <translation>Repository Statistiken...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="873"/> + <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"/> + <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"/> + <source>Create Archive</source> + <translation>Archiv erzeugen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="887"/> + <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"/> + <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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> + <source>List bundle heads...</source> + <translation>Köpfe eines Pakets anzeigen...</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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="934"/> + <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"/> + <source>Apply Bundle (fetch)</source> + <translation>Paket anwenden (fetch)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <source>Apply Bundle (fetch)...</source> + <translation>Paket anwenden (fetch)...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="945"/> + <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"/> + <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"/> + <source>Apply Bundle (pull)</source> + <translation>Paket anwenden (pull)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="955"/> + <source>Apply Bundle (pull)...</source> + <translation>Paket anwenden (pull)...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="959"/> + <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"/> + <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> + </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> + </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> + </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> + </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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1020"/> + <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"/> + <source>Skip</source> + <translation>Überspringen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <source>Skip...</source> + <translation>Überspringen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1031"/> + <source>Skip a selectable revision</source> + <translation>Überspringe eine auswählbare Revision</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1034"/> + <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"/> + <source>Reset</source> + <translation>Zurücksetzen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <source>Reset...</source> + <translation>Zurücksetzen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1045"/> + <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"/> + <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"/> + <source>Show bisect log browser</source> + <translation>Bisect-Browser anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1060"/> + <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"/> + <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"/> + <source>Create replay file</source> + <translation>Wiederholungsdatei erzeugen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1076"/> + <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"/> + <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"/> + <source>Edit replay file</source> + <translation>Editiere Wiederholungsdatei</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1092"/> + <source>Edit a bisect replay file</source> + <translation>Eine bisect Wiederholungsdatei bearbeiten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1095"/> + <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"/> + <source>Replay session</source> + <translation>Session wiederholen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1107"/> + <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"/> + <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"/> + <source>Administration</source> + <translation>Verwaltung</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1360"/> + <source>Bundle Management</source> + <translation>Paketverwaltung</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1690"/> + <source>Pull</source> + <translation>Pull</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2237"/> + <source>Bisect</source> + <translation>Bisect</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1397"/> + <source>Tags</source> + <translation>Marken</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1405"/> + <source>Branches</source> + <translation>Zweige</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1418"/> + <source>Manage Changes</source> + <translation>Änderungen verwalten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1426"/> + <source>Remote Repositories</source> + <translation>Entfernte Repositories</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1436"/> + <source>Cherry-pick</source> + <translation>Aussuchen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1444"/> + <source>Stash</source> + <translation>Ablage</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1646"/> + <source>Branch</source> + <translation>Zweig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <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"/> + <source>Revert Changes</source> + <translation>Änderungen rückgängig machen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1734"/> + <source>Unstage Changes</source> + <translation>Vormerkung rückgängig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <source>Select a remote repository:</source> + <translation>Wähle ein entferntes Repository:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1853"/> + <source>Copy Commits (Continue)</source> + <translation>Revisionen kopieren (Fortsetzung)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1872"/> + <source>Copy Commits (Quit)</source> + <translation>Revisionen kopieren (Beenden)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1892"/> + <source>Copy Commits (Cancel)</source> + <translation>Revisionen kopieren (Abbrechen)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1911"/> + <source>Save Stash</source> + <translation>Ablage erstellen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1961"/> + <source>Restore Stash</source> + <translation>Ablage wiederherstellen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="302"/> + <source><b>Show most recent tag</b><p>This shows the most recent tag reachable from the work tree.</p></source> + <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"/> + <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> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="121"/> + <source>Commit changes to repository</source> + <translation>Änderungen einpflegen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="121"/> + <source>Commit changes to repository...</source> + <translation>Änderungen einpflegen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="126"/> + <source>Commit changes of the local project to the Git repository</source> + <translation>Änderungen am lokalen Projekt in das Git-Repository einpflegen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="129"/> + <source><b>Commit changes to repository</b><p>This commits changes of the local project to the Git repository.</p></source> + <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"/> + <source>Git</source> + <translation>Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1117"/> + <source>Check patch files</source> + <translation>Patchdateien prüfen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1121"/> + <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"/> + <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"/> + <source>Apply patch files</source> + <translation>Patchdateien anwenden</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1136"/> + <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"/> + <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> + </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> + </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> + </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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1198"/> + <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> + </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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1244"/> + <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"/> + <source>Fetch and Update</source> + <translation>Herunterladen und Aktualisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1257"/> + <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>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"/> + <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"/> + <source>Show Status</source> + <translation>Status anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1306"/> + <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"/> + <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"/> + <source>Show Summary</source> + <translation>Übersicht anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1322"/> + <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"/> + <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"/> + <source>Submodules</source> + <translation>Submodule</translation> + </message> +</context> +<context> + <name>GitPullDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="14"/> + <source>Git Pull</source> + <translation>Git Pull</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="23"/> + <source>Remote Repository:</source> + <translation>Entferntes Repository:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="30"/> + <source>Select the remote repository to pull from</source> + <translation>Wähle das entfernte Repository zum Herunterladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="46"/> + <source>Remote Branches:</source> + <translation>Entfernte Zweige:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="56"/> + <source>Press to update the list of remote branches</source> + <translation>Drücken, um die Liste der entfernten Zweige zu aktualisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="59"/> + <source>Update</source> + <translation>Aktualisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="81"/> + <source>Select the remote branches to be pulled</source> + <translation>Wähle die herunterzuladenden, entfernten Zweige</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="94"/> + <source>Select to remove non-existing tracking references </source> + <translation>Auswählen, um nicht existierende Verfolgungszweige zu löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="97"/> + <source>Prune obsolete tracking references</source> + <translation>Überholte Verfolgungszweige löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.py" line="36"/> + <source><All></source> + <translation><Alle></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.py" line="37"/> + <source><Custom></source> + <translation><Eigene Angaben></translation> + </message> +</context> +<context> + <name>GitPushDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="14"/> + <source>Git Push</source> + <translation>Git Push</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="25"/> + <source>Remote Repository:</source> + <translation>Entferntes Repository:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="32"/> + <source>Select the remote repository to push to</source> + <translation>Wähle das entfernte Repository zum Veröffentlichen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="48"/> + <source>Branches to be pushed</source> + <translation>Zweige veröffentlichen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="70"/> + <source>Push?</source> + <translation>Veröffentlichen?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="75"/> + <source>Local</source> + <translation>Lokal</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="80"/> + <source>Remote</source> + <translation>Entfernt</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="85"/> + <source>Force?</source> + <translation>Erzwingen?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="93"/> + <source>Press to select all branches</source> + <translation>Drücken, um alle Zweige auszuwählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="96"/> + <source>Select All</source> + <translation>Alle auswählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="106"/> + <source><b>WARNING: The "Force" option can result in dangling branches in the remote repository.</b></source> + <translation><b>WARNUNG: Die "Erzwingen" Option kann zu unerreichbaren Zweigen im entfernten Repository führen.</b></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="119"/> + <source>Select to push tags as well</source> + <translation>Auswählen, um auch Marken zu veröffentlichen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="122"/> + <source>Include tags</source> + <translation>Marken einschließen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="129"/> + <source>Select this to associate a remote tracking branch</source> + <translation>Auswählen, um mit dem entfernten Zweig zu verbinden</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="132"/> + <source>Set tracking information</source> + <translation>Verfolgungszweig setzen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="139"/> + <source>Push Submodules</source> + <translation>Submodule veröffentlichen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="145"/> + <source>Select to push submodules automatically</source> + <translation>Auswählen, um Submodule automatisch zu veröffentlichen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="148"/> + <source>on-demand</source> + <translation>bei Bedarf</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="161"/> + <source>check</source> + <translation>prüfen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="168"/> + <source>Select to push submodules only</source> + <translation>Auswählen, um nur Submodule zu veröffentlichen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="171"/> + <source>only</source> + <translation>ausschließlich</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="178"/> + <source>Select to not push any submodule</source> + <translation>Auswählen, um keine Submodule zu veröffentlichen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="181"/> + <source>no</source> + <translation>keine</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="158"/> + <source>Select to check, if submodules were pushed already</source> + <translation>Auswählen, um zu prüfen, ob Submodule bereits veröffentlicht wurden</translation> + </message> +</context> +<context> + <name>GitReflogBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="14"/> + <source>Git Reflog</source> + <translation>Git Reflog</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="42"/> + <source>Commit</source> + <translation>Revision</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="47"/> + <source>Selector</source> + <translation>Selektor</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="52"/> + <source>Name</source> + <translation>Name</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="57"/> + <source>Operation</source> + <translation>Operation</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="62"/> + <source>Subject</source> + <translation>Betreff</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="72"/> + <source>Press to get the next bunch of log entries</source> + <translation>Drücken, um die nächsten Einträge zu erhalten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="75"/> + <source>&Next</source> + <translation>&Nächste</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="82"/> + <source>Enter the limit of entries to fetch</source> + <translation>Gib die Anzahl an zu holenden Einträgen ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="122"/> + <source>Errors</source> + <translation>Fehler</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="128"/> + <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/GitReflogBrowserDialog.ui" line="144"/> + <source>Input</source> + <translation>Eingabe</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="166"/> + <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/GitReflogBrowserDialog.ui" line="169"/> + <source>&Send</source> + <translation>Sen&den</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="172"/> + <source>Alt+S</source> + <translation>Alt+D</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="179"/> + <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/GitReflogBrowserDialog.ui" line="186"/> + <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/GitReflogBrowserDialog.ui" line="189"/> + <source>&Password Mode</source> + <translation>&Kennwortmodus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="192"/> + <source>Alt+P</source> + <translation>Alt+K</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="59"/> + <source>&Refresh</source> + <translation>&Aktualisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="61"/> + <source>Press to refresh the list of commits</source> + <translation>Drücken, um die Protokollliste zu aktualisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="200"/> + <source>Process Generation Error</source> + <translation>Fehler beim Prozessstart</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="200"/> + <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> +</context> +<context> + <name>GitRemoteRepositoriesDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="14"/> + <source>Git Remote Repositories</source> + <translation>Entfernte Repositories</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="17"/> + <source><b>Git Remote Repositories</b> +<p>This dialog shows the available remote repositories.</p></source> + <translation><b>Entfernte Repositories</b> +<p>Dieser Dialog listet die verfügbaren entfernten Repositories.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="30"/> + <source>Remote Repositories</source> + <translation>Entfernte Repositories</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="46"/> + <source>Name</source> + <translation>Name</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="51"/> + <source>URL</source> + <translation>URL</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="56"/> + <source>Operation</source> + <translation>Operation</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="82"/> + <source>Press to add a remote repository</source> + <translation>Drücken, um ein entferntes Repository hinzuzufügen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="85"/> + <source>&Add</source> + <translation>&Hinzufügen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="92"/> + <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="95"/> + <source>&Rename</source> + <translation>&Umbenennen</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> + </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"/> + <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"/> + <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>Alt+S</source> + <translation>Alt+D</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="217"/> + <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"/> + <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"/> + <source>&Password Mode</source> + <translation>&Kennwortmodus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="230"/> + <source>Alt+P</source> + <translation>Alt+K</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="51"/> + <source>Refresh</source> + <translation>Aktualisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="53"/> + <source>Press to refresh the repositories display</source> + <translation>Drücken, um die Repositoryanzeige zu aktualisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="148"/> + <source>Process Generation Error</source> + <translation>Fehler beim Prozessstart</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="148"/> + <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> +</context> +<context> + <name>GitRevisionSelectionDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="14"/> + <source>Git Revision</source> + <translation>Git Revision</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="23"/> + <source>Revision</source> + <translation>Revision</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="29"/> + <source>Select to specify a revision by a revision expression</source> + <translation>Auswählen, um eine Revision durch einen Revisionsausdruck anzugeben</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="32"/> + <source>Commit:</source> + <translation>Revision:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="42"/> + <source>Enter a commit id</source> + <translation>Gib eine Revisions-ID ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation>Auswählen, um eine Revision per Marke zu wählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="52"/> + <source>Tag:</source> + <translation>Marke:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="68"/> + <source>Enter a tag name</source> + <translation>Gib den Namen der Marke ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="78"/> + <source>Select to specify a revision by a branch</source> + <translation>Auswählen, um eine Revision per Zweig zu wählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="81"/> + <source>Branch:</source> + <translation>Zweig:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="97"/> + <source>Enter a branch name</source> + <translation>Gib einen Zweignamen ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="136"/> + <source>Select HEAD revision</source> + <translation>Wähle 'HEAD' Revision</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="139"/> + <source>HEAD</source> + <translation>HEAD</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="146"/> + <source>No revision selected</source> + <translation>Keine Revision ausgewählt</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="107"/> + <source>Select to specify a revision by a remote branch</source> + <translation>Auswählen, um eine Revision per entferntem Zweig zu wählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="110"/> + <source>Remote Branch:</source> + <translation>Entfernter Zweig:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="126"/> + <source>Enter a remote branch name</source> + <translation>Gib einen entfernten Zweignamen ein</translation> + </message> +</context> +<context> + <name>GitRevisionsSelectionDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="14"/> + <source>Git Diff</source> + <translation>Git Diff</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="23"/> + <source>Revision &1</source> + <translation>Revision &1</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="137"/> + <source>Select to specify a revision by a revision expression</source> + <translation>Auswählen, um eine Revision durch einen Revisionsausdruck anzugeben</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="140"/> + <source>Commit:</source> + <translation>Revision:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="150"/> + <source>Enter a commit id</source> + <translation>Gib eine Revisions-ID ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="157"/> + <source>Select to specify a revision by a tag</source> + <translation>Auswählen, um eine Revision per Marke zu wählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="160"/> + <source>Tag:</source> + <translation>Marke:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="170"/> + <source>Enter a tag name</source> + <translation>Gib den Namen der Marke ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="180"/> + <source>Select to specify a revision by a branch</source> + <translation>Auswählen, um eine Revision per Zweig zu wählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="183"/> + <source>Branch:</source> + <translation>Zweig:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="193"/> + <source>Enter a branch name</source> + <translation>Gib einen Zweignamen ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="203"/> + <source>Select HEAD revision</source> + <translation>Wähle 'HEAD' Revision</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="206"/> + <source>HEAD</source> + <translation>HEAD</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="216"/> + <source>Select revision before HEAD</source> + <translation>Wähle Revision vor HEAD</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="219"/> + <source>HEAD^</source> + <translation>HEAD^</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="226"/> + <source>No revision selected</source> + <translation>Keine Revision ausgewählt</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="131"/> + <source>Revision &2</source> + <translation>Revision &2</translation> + </message> +</context> +<context> + <name>GitStashBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="14"/> + <source>Git Stash Browser</source> + <translation>Ablagenbrowser</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="42"/> + <source>Name</source> + <translation>Name</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="47"/> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="52"/> + <source>Message</source> + <translation>Nachricht</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="66"/> + <source>Statistics</source> + <translation>Statistiken</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="91"/> + <source>File</source> + <translation>Datei</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="96"/> + <source>Changes</source> + <translation>Änderungen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="101"/> + <source>Lines added</source> + <translation>Zeilen eingefügt</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="106"/> + <source>Lines deleted</source> + <translation>Zeilen gelöscht</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="153"/> + <source>Errors</source> + <translation>Fehler</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="159"/> + <source><b>Git stash errors</b><p>This shows possible error messages of the git stash command.</p></source> + <translation><b>Git Ablage-Fehler</b><p>Dies zeigt mögliche Fehlermeldungen des git-Befehls.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="175"/> + <source>Input</source> + <translation>Eingabe</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="197"/> + <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/GitStashBrowserDialog.ui" line="200"/> + <source>&Send</source> + <translation>Sen&den</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="203"/> + <source>Alt+S</source> + <translation>Alt+D</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="210"/> + <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/GitStashBrowserDialog.ui" line="217"/> + <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/GitStashBrowserDialog.ui" line="220"/> + <source>&Password Mode</source> + <translation>&Kennwortmodus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="223"/> + <source>Alt+P</source> + <translation>Alt+K</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="65"/> + <source>&Refresh</source> + <translation>&Aktualisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="82"/> + <source>Show</source> + <translation>Zeige</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="85"/> + <source>Restore && Keep</source> + <translation>Wiederherstellen && Behalten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="87"/> + <source>Restore && Delete</source> + <translation>Wiederherstellen && Löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="90"/> + <source>Create Branch</source> + <translation>Zweig erzeugen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="93"/> + <source>Delete</source> + <translation>Löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="95"/> + <source>Delete All</source> + <translation>Alle Löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="182"/> + <source>Process Generation Error</source> + <translation>Fehler beim Prozessstart</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="182"/> + <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 numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="369"/> + <source>%n file(s) changed</source> + <translation> + <numerusform>%n Datei geändert</numerusform> + <numerusform>%n Dateien geändert</numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="371"/> + <source>%n line(s) inserted</source> + <translation> + <numerusform>%n Zeile eingefügt</numerusform> + <numerusform>%n Zeilen eingefügt</numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="373"/> + <source>%n line(s) deleted</source> + <translation> + <numerusform>%n Zeile gelöscht</numerusform> + <numerusform>%n Zeilen gelöscht</numerusform> + </translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="67"/> + <source>Press to refresh the list of stashes</source> + <translation>Drücken, um die Liste der Ablagen zu aktualisieren</translation> + </message> +</context> +<context> + <name>GitStashDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="14"/> + <source>Git Stash</source> + <translation>Git Ablage</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="23"/> + <source>Message:</source> + <translation>Nachricht:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="40"/> + <source>Keep changes in staging area</source> + <translation>Änderungen im Vormerkbereich behalten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="47"/> + <source>Untracked/Ignored Files</source> + <translation>Nicht überwachte/ignorierte Dateien</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="53"/> + <source>Select to not stash untracked or ignored files</source> + <translation>Auswählen, um nicht überwachte oder ignorierte Dateien nicht abzulegen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="56"/> + <source>Don't stash untracked or ignored files</source> + <translation>Nicht überwachte oder ignorierte Dateien nicht ablegen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="66"/> + <source>Select to stash untracked files</source> + <translation>Auswählen, um nicht überwachte Dateien abzulegen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="69"/> + <source>Stash untracked files</source> + <translation>Nicht überwachte Dateien ablegen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="76"/> + <source>Select to stash untracked and ignored files</source> + <translation>Auswählen, um nicht überwachte oder ignorierte Dateien abzulegen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="79"/> + <source>Stash untracked and ignored files</source> + <translation>Nicht überwachte oder ignorierte Dateien ablegen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="33"/> + <source>Enter a message for the stash</source> + <translation>Gib eine Nachricht für die Ablage ein</translation> + </message> +</context> +<context> + <name>GitStatusDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="395"/> + <source>Git Status</source> + <translation>Git Status</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="17"/> + <source><b>Git Status</b> +<p>This dialog shows the status of the selected file or project.</p></source> + <translation><b>Git-Status</b> +<p>Dieser Dialog zeigt den Status der ausgewählten Datei oder des Projektes.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="49"/> + <source>&Filter on Status:</source> + <translation>Nach Status &filtern:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="59"/> + <source>Select the status of entries to be shown</source> + <translation>Wähle den Status anzuzeigender Einträge</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="662"/> + <source>Commit</source> + <translation>Einpflegen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="105"/> + <source>Status (Work)</source> + <translation>Status (Arbeitsbereich)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="110"/> + <source>Status (Staging)</source> + <translation>Status (Vormerkung)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="115"/> + <source>Path</source> + <translation>Pfad</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="197"/> + <source>Commit the selected changes</source> + <translation>Ausgewählte Änderungen einpflegen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="200"/> + <source>Amend the latest commit with the selected changes</source> + <translation>Letzte Revision mit ausgewählten Änderungen ergänzen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="252"/> + <source>Errors</source> + <translation>Fehler</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="271"/> + <source>Input</source> + <translation>Eingabe</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="293"/> + <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/GitStatusDialog.ui" line="296"/> + <source>&Send</source> + <translation>Sen&den</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="299"/> + <source>Alt+S</source> + <translation>Alt+D</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="306"/> + <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/GitStatusDialog.ui" line="313"/> + <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/GitStatusDialog.ui" line="316"/> + <source>&Password Mode</source> + <translation>&Kennwortmodus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="319"/> + <source>Alt+P</source> + <translation>Alt+K</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="65"/> + <source>Refresh</source> + <translation>Aktualisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="67"/> + <source>Press to refresh the status display</source> + <translation>Drücken, um die Statusanzeige zu aktualisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="202"/> + <source>Select all for commit</source> + <translation>Alle zum Einpflegen auswählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="211"/> + <source>Stage changes</source> + <translation>Änderungen vormerken</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="215"/> + <source>Unstage changes</source> + <translation>Vormerkung rückgängig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="242"/> + <source>Forget missing</source> + <translation>Fehlende vergessen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="246"/> + <source>Restore missing</source> + <translation>Fehlende wiederherstellen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="253"/> + <source>Edit file</source> + <translation>Datei bearbeiten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="260"/> + <source>Adjust column sizes</source> + <translation>Spaltengrößen anpassen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="169"/> + <source>added</source> + <translation>hinzugefügt</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="170"/> + <source>copied</source> + <translation>kopiert</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="171"/> + <source>deleted</source> + <translation>gelöscht</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="172"/> + <source>modified</source> + <translation>modifiziert</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="173"/> + <source>renamed</source> + <translation>umbenannt</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="175"/> + <source>not tracked</source> + <translation>nicht versioniert</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="174"/> + <source>unmerged</source> + <translation>nicht zusammengeführt</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="168"/> + <source>unmodified</source> + <translation>nicht verändert</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="176"/> + <source>ignored</source> + <translation>ignoriert</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="423"/> + <source>Process Generation Error</source> + <translation>Fehler beim Prozessstart</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="423"/> + <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/GitStatusDialog.py" line="596"/> + <source>all</source> + <translation>alle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="662"/> + <source>There are no entries selected to be committed.</source> + <translation>Es sind keine Einträge zum Einpflegen ausgewählt.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="703"/> + <source>Add</source> + <translation>Hinzufügen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="703"/> + <source>There are no unversioned entries available/selected.</source> + <translation>Es sind keine unversionierten Einträge vorhanden/ausgewählt.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="725"/> + <source>Stage</source> + <translation>Vormerken</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="725"/> + <source>There are no stageable entries available/selected.</source> + <translation>Es sind keine vorzumerkenden Einträge vorhanden/ausgewählt.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="747"/> + <source>Unstage</source> + <translation>Vormerkung rückgängig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="747"/> + <source>There are no unstageable entries available/selected.</source> + <translation>Es sind keine Vormerkungen vorhanden/ausgewählt.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="769"/> + <source>Forget Missing</source> + <translation>Fehlende vergessen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="810"/> + <source>There are no missing entries available/selected.</source> + <translation>Es sind keine fehlenden Einträge vorhanden/ausgewählt.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="786"/> + <source>Revert</source> + <translation>Rückgängig machen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="786"/> + <source>There are no uncommitted, unstaged changes available/selected.</source> + <translation>Es sind keine nicht eingepflegten, nicht vorgemerkten Änderungen vorhanden/ausgewählt.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="810"/> + <source>Restore Missing</source> + <translation>Fehlende wiederherstellen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="839"/> + <source>Differences</source> + <translation>Unterschiede</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="839"/> + <source>There are no uncommitted changes available/selected.</source> + <translation>Es sind keine nicht eingepflegten Änderungen vorhanden/ausgewählt.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="891"/> + <source>Working Tree to Staging Area</source> + <translation>Arbeitsverzeichnis nach Vormerkung</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="870"/> + <source>Staging Area to HEAD Commit</source> + <translation>Vormerkung nach HEAD Revision</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="892"/> + <source>Working Tree to HEAD Commit</source> + <translation>Arbeitsverzeichnis nach HEAD Revision</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="894"/> + <source>Side-by-Side Difference</source> + <translation>Unterschiede nebeneinander anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="894"/> + <source>Select the compare method.</source> + <translation>Vergleichsmethode auswählen.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="155"/> + <source>Difference Working to Staging</source> + <translation>Unterschied Arbeitsverzeichnis zu Vormerkung</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="209"/> + <source>Difference Staging to HEAD</source> + <translation>Unterschied Vormerkung zu HEAD</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="105"/> + <source>Stage Selected Lines</source> + <translation>Ausgewählte Zeilen vormerken</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="109"/> + <source>Revert Selected Lines</source> + <translation>Ausgewählte Zeilen rückgängig machen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="113"/> + <source>Stage Hunk</source> + <translation>Abschnitt vormerken</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="117"/> + <source>Revert Hunk</source> + <translation>Abschnitt rückgängig machen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="123"/> + <source>Unstage Selected Lines</source> + <translation>Ausgewählte Zeilen nicht vormerken</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="127"/> + <source>Unstage Hunk</source> + <translation>Abschnitt nicht vormerken</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1201"/> + <source>Revert selected lines</source> + <translation>Ausgewählte Zeilen rückgängig machen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1203"/> + <source>Revert hunk</source> + <translation>Abschnitt rückgängig machen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1204"/> + <source>Are you sure you want to revert the selected changes?</source> + <translation>Sind sie sicher, dass die ausgewählten Änderungen rückgängig gemacht werden sollen?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="26"/> + <source>Select action from menu</source> + <translation>Wähle eine Aktion aus dem Menü</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="198"/> + <source>Amend</source> + <translation>Ergänzen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="204"/> + <source>Unselect all from commit</source> + <translation>Alle vom Einpflegen abwählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="210"/> + <source>Add the selected files</source> + <translation>Ausgewählte Dateien hinzufügen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="213"/> + <source>Stages all changes of the selected files</source> + <translation>Alle Änderungen der ausgewählten Dateien vormerken</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="217"/> + <source>Unstages all changes of the selected files</source> + <translation>Vormerkung von Änderungen der ausgewählten Dateien rückgängig machen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="224"/> + <source>Shows the differences of the selected entry in a separate dialog</source> + <translation>Zeigt die Unterschiede des gewählten Eintrages in einem separaten Dialog</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="227"/> + <source>Differences Side-By-Side</source> + <translation>Unterschiede nebeneinander anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="229"/> + <source>Shows the differences of the selected entry side-by-side in a separate dialog</source> + <translation>Zeigt die Unterschiede des gewählten Eintrages nebeneinander in einem separaten Dialog</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="237"/> + <source>Reverts the changes of the selected files</source> + <translation>Macht alle Änderungen der ausgewählten Dateien rückgängig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="244"/> + <source>Forgets about the selected missing files</source> + <translation>Die ausgewählten fehlenden Dateien vergessen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="248"/> + <source>Restores the selected missing files</source> + <translation>Stellt die ausgewählten, fehlenden Dateien wieder her</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="255"/> + <source>Edit the selected conflicting file</source> + <translation>Bearbeitet die ausgewählte Datei mit Konflikten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="262"/> + <source>Adjusts the width of all columns to their contents</source> + <translation>Passt die Breite aller Spalten an ihren Inhalt an</translation> + </message> +</context> +<context> + <name>GitStatusMonitorThread</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py" line="93"/> + <source>Could not start the Git process.</source> + <translation>Der Git-Prozess konnte nicht gestartet werden.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py" line="133"/> + <source>Git status checked successfully</source> + <translation>Git-Status erfolgreich überprüft</translation> + </message> +</context> +<context> + <name>GitSubmoduleAddDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="14"/> + <source>Add Submodule</source> + <translation>Submodul hinzufügen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="23"/> + <source>&URL:</source> + <translation>&URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="39"/> + <source>Enter the URL of the repository</source> + <translation>Gib die URL des Repository ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="55"/> + <source>Select the repository URL via a directory selection dialog</source> + <translation>Wähle die Repository URL mittels eines Verzeichnisauswahldialoges</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="62"/> + <source>Press to clear the history of entered repository URLs</source> + <translation>Drücken, um die Chronik eingegebener Repository URLs zu löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="69"/> + <source>Submodule &Directory:</source> + <translation>Submodul&verzeichnis:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="79"/> + <source>Enter the directory for the submodule (leave empty to use default).</source> + <translation>Gib das Verzeichnis für das Submodul ein (leer lassen für Standardverhalten).</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="89"/> + <source>&Branch:</source> + <translation>&Zweig:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="99"/> + <source>Enter a branch name</source> + <translation>Gib einen Zweignamen ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="106"/> + <source>&Logical Name:</source> + <translation>&Logischer Name:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="116"/> + <source>Enter a logical name</source> + <translation>Gib einen logischen Namen ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="123"/> + <source>Select to enforce the operation</source> + <translation>Auswählen, um die Aktion zu erzwingen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="126"/> + <source>&Force Operation</source> + <translation>Aktion &erzwingen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="92"/> + <source>Select Submodule Repository Directory</source> + <translation>Submodulrepositoryverzeichnis auswählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="118"/> + <source>Select Submodule Directory</source> + <translation>Submodulverzeichnis auswählen</translation> + </message> +</context> +<context> + <name>GitSubmodulesDeinitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="14"/> + <source>Unregister Submodules</source> + <translation>Submodule deregistrieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="23"/> + <source>Select to unregister all submodules</source> + <translation>Auswählen, um alle Submodule zu deregistrieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="26"/> + <source>Unregister All Submodules</source> + <translation>Alle Submodule deregistrieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="33"/> + <source>Selected Submodules:</source> + <translation>Ausgewählte Submodule:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="40"/> + <source>Select the submodules to be unregistered</source> + <translation>Wähle die zu deregistrierenden Submodule aus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="53"/> + <source>Select to enforce unregistering</source> + <translation>Auswählen, um die Deregistrierung zu erzwingen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="56"/> + <source>Enforce Operation</source> + <translation>Aktion erzwingen</translation> + </message> +</context> +<context> + <name>GitSubmodulesListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="14"/> + <source>Defined Submodules</source> + <translation>Definierte Submodule</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="39"/> + <source>Name</source> + <translation>Name</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="44"/> + <source>Path</source> + <translation>Pfad</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="49"/> + <source>URL</source> + <translation>URL</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="54"/> + <source>Branch</source> + <translation>Zweig</translation> + </message> +</context> +<context> + <name>GitSubmodulesStatusDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="14"/> + <source>Submodules Status</source> + <translation>Submodulstatus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="33"/> + <source>Submodule</source> + <translation>Submodul</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="38"/> + <source>Status</source> + <translation>Status</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="43"/> + <source>Commit ID</source> + <translation>Revisions-ID</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="48"/> + <source>Info</source> + <translation>Informationen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="58"/> + <source>Select to show the status for the index</source> + <translation>Auswählen, um den Status für den Index anzuzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="61"/> + <source>Show Status for Index</source> + <translation>Status für Index anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="68"/> + <source>Perform a recursive operation</source> + <translation>Aktion rekursiv durchführen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="71"/> + <source>Recursive</source> + <translation>Rekursiv</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="99"/> + <source>Errors</source> + <translation>Fehler</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="46"/> + <source>up-to-date</source> + <translation>aktuell</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="47"/> + <source>not initialized</source> + <translation>nicht initialisiert</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="48"/> + <source>different to index</source> + <translation>Unterschied zum Index</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="49"/> + <source>merge conflicts</source> + <translation>Mergekonflikte</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="55"/> + <source>Refresh</source> + <translation>Aktualisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="57"/> + <source>Press to refresh the status display</source> + <translation>Drücken, um die Statusanzeige zu aktualisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="105"/> + <source>The process {0} did not finish within 30 seconds.</source> + <translation>Der {0}-Prozess endete nicht innerhalb von 30s.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="109"/> + <source>The process {0} finished with an error. +Error: {1}</source> + <translation>Der {0} Prozess endete mit einem Fehler. +Fehler: {1}</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="115"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation>Der {0} Prozess konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="134"/> + <source>unknown</source> + <translation>unbekannt</translation> + </message> +</context> +<context> + <name>GitSubmodulesSummaryOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="23"/> + <source>Selected Submodules:</source> + <translation>Ausgewählte Submodule:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="30"/> + <source>Select the submodules to show the summary for</source> + <translation>Wähle die Submodule aus, für die Übersichtsinformationen angezeigt werden sollen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="43"/> + <source>Select to show summary information for the index of the superproject</source> + <translation>Auswählen, um Übersichtsinformationen für den Index des Oberprojektes anzuzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="46"/> + <source>Show Summary for Superproject Index</source> + <translation>Übersichtsinformation für Oberprojektindex anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="53"/> + <source>Select to show summary information for the index</source> + <translation>Auswählen, um Übersichtsinformationen für den Index anzuzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="56"/> + <source>Show Summary for Index</source> + <translation>Übersichtsinformationen für Index anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="63"/> + <source>Commit:</source> + <translation>Revision:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="70"/> + <source>Enter a commit ID to show summary information for</source> + <translation>Gib die Revisions-ID, für die Übersichtsinformationen angezeigt werden sollen, ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="73"/> + <source>Enter Commit ID</source> + <translation>Revisions-ID eingeben</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="80"/> + <source>Limit:</source> + <translation>Anzahl:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="87"/> + <source>Enter the maximum number of entries to be shown per submodule</source> + <translation>Gib die maximale Anzahl an Einträgen pro Submodul ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="93"/> + <source>No Limit</source> + <translation>keine Begrenzung</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="14"/> + <source>Submodule Summary Options</source> + <translation>Optionen für Submodulübersicht</translation> + </message> +</context> +<context> + <name>GitSubmodulesSyncDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="14"/> + <source>Synchronize Submodule URLs</source> + <translation>Submodul URLs synchronisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="23"/> + <source>Selected Submodules:</source> + <translation>Ausgewählte Submodule:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="30"/> + <source>Select the submodules to be synchronized</source> + <translation>Wähle die zu synchronisierenden Submodule aus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="43"/> + <source>Select to perform a recursive synchronization</source> + <translation>Auswählen, um eine rekursive Synchronisation durchzuführen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="46"/> + <source>Recursive Operation</source> + <translation>Rekursive Aktion</translation> + </message> +</context> +<context> + <name>GitSubmodulesUpdateOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="14"/> + <source>Submodule Update Options</source> + <translation>Optionen für Submodulaktualisierung</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="23"/> + <source>Update Procedure</source> + <translation>Aktualisierungsprozedur</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="29"/> + <source>Select to perform a 'checkout' procedure</source> + <translation>Auswählen, um eine 'Checkout' Prozedur auszuführen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="32"/> + <source>checkout</source> + <translation>Checkout</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="42"/> + <source>Select to perform a 'rebase' procedure</source> + <translation>Auswählen, um eine 'Rebase' Prozedur auszuführen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="45"/> + <source>rebase</source> + <translation>Rebase</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="52"/> + <source>Select to perform a 'merge' procedure</source> + <translation>Auswählen, um eine 'Merge' Prozedur auszuführen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="55"/> + <source>merge</source> + <translation>Zusammenführen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="65"/> + <source>Select to initialize submodules before the update</source> + <translation>Auswählen, um Submodule vor der Aktualisierung zu initialisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="68"/> + <source>Initialize before Update</source> + <translation>vor Aktualisierung initialisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="75"/> + <source>Fetch remote changes before updating</source> + <translation>Entfernte Änderung vor der Aktualisierung herunterladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="78"/> + <source>Synchronize with remote</source> + <translation>zuerst synchronisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="88"/> + <source>Select to not fetch the remote</source> + <translation>Auswählen, um keine entfernten Änderungen herunterzuladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="91"/> + <source>Don't Fetch</source> + <translation>nicht herunterladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="98"/> + <source>Selected Submodules:</source> + <translation>Ausgewählte Submodule:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="105"/> + <source>Select the submodules to be updated</source> + <translation>Wähle die zu aktualisierenden Submodule aus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="118"/> + <source>Select to enforce the update</source> + <translation>Auswählen, um die Aktualisierung zu erzwingen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="121"/> + <source>Enforce Operation</source> + <translation>Aktion erzwingen</translation> + </message> +</context> +<context> + <name>GitTagBranchListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="14"/> + <source>Git Tag List</source> + <translation>Markenliste</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="17"/> + <source><b>Git Tag/Branch List</b> +<p>This dialog shows a list of the projects tags or branches.</p></source> + <translation><b>Git-Marken-/Zweigliste</b> +<p>Dieser Dialog zeigt eine Liste alle Marken oder Zweige des Projektes.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="33"/> + <source><b>Tag/Branches List</b> +<p>This shows a list of the projects tags or branches.</p></source> + <translation><b>Marken-/Zweigliste</b> +<p>Dies zeigt eine Liste alle Marken oder Zweige des Projektes.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="99"/> + <source>Commit</source> + <translation>Einpflegen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="99"/> + <source>Name</source> + <translation>Name</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="69"/> + <source>Errors</source> + <translation>Fehler</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="88"/> + <source>Input</source> + <translation>Eingabe</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="110"/> + <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/GitTagBranchListDialog.ui" line="113"/> + <source>&Send</source> + <translation>Sen&den</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="116"/> + <source>Alt+S</source> + <translation>Alt+D</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="123"/> + <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/GitTagBranchListDialog.ui" line="130"/> + <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/GitTagBranchListDialog.ui" line="133"/> + <source>&Password Mode</source> + <translation>&Kennwortmodus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="136"/> + <source>Alt+P</source> + <translation>Alt+K</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="94"/> + <source>Annotation Message</source> + <translation>Annotation</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="98"/> + <source>Git Branches List</source> + <translation>Git Zweigliste</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="135"/> + <source>Process Generation Error</source> + <translation>Fehler beim Prozessstart</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="135"/> + <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> +</context> +<context> + <name>GitTagDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="14"/> + <source>Git Tag</source> + <translation>Git Marke</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="23"/> + <source>Name:</source> + <translation>Name:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="36"/> + <source>Enter the name of the tag</source> + <translation>Gib den Namen der Marke ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="39"/> + <source><b>Tag Name</b> +<p>Enter the name of the tag to be created, deleted or verified.</p></source> + <translation><b>Name der Marke</b> +<p>Gib den Namen der zu erzeugenden, zu löschenden oder zu verifizierenden Marke ein.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="53"/> + <source>Revision:</source> + <translation>Revision:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="60"/> + <source>Enter a revision to set a tag for</source> + <translation>Gib eine Revision ein, die eine Marke erhalten soll</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="67"/> + <source>Tag Action</source> + <translation>Aktion</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="73"/> + <source>Select to create a tag</source> + <translation>Auswählen, um eine Marke zu erzeugen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="76"/> + <source><b>Create Tag</b> +<p>Select this entry in order to create a tag.</p></source> + <translation><b>Marke erzeugen</b> +<p>Wähle diesen Eintrag, um eine Marke zu erzeugen.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="80"/> + <source>Create Tag</source> + <translation>Marke erzeugen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="90"/> + <source>Select to delete a tag</source> + <translation>Auswählen, um eine Marke zu löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="93"/> + <source><b>Delete Tag</b> +<p>Select this entry in order to delete the selected tag.</p></source> + <translation><b>Marke löschen</b> +<p>Wähle diesen Eintrag, um eine Marke im Repository zu löschen.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="97"/> + <source>Delete Tag</source> + <translation>Marke löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="104"/> + <source>Select to verify a tag</source> + <translation>Auswählen, um eine Marke zu verifizieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="107"/> + <source><b>Verify Tag</b> +<p>Select this entry in order to verify the selected tag.</p></source> + <translation><b>Marke verifizieren</b> +<p>Wähle diesen Eintrag, um eine Marke zu verifizieren.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="111"/> + <source>Verify Tag</source> + <translation>Marke verifizieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="121"/> + <source>Tag Type</source> + <translation>Markentyp</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="130"/> + <source>Global Tag</source> + <translation>Globale Marke</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="143"/> + <source>Signed Tag</source> + <translation>Signierte Marke</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="153"/> + <source>Local Tag</source> + <translation>Lokale Marke</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="163"/> + <source>Select to enforce the create operation</source> + <translation>Auswählen, um die Aktion zu erzwingen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="166"/> + <source>Enforce Operation</source> + <translation>Aktion erzwingen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="127"/> + <source>Select to create/delete/verify a global tag</source> + <translation>Auswählen, um eine globale Marke zu erzeugen/zu löschen/zu verifizieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="140"/> + <source>Select to create/delete/verify a signed tag</source> + <translation>Auswählen, um eine signierte Marke zu erzeugen/zu löschen/zu verifizieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="150"/> + <source>Select to create/delete/verify a local tag</source> + <translation>Auswählen, um eine lokale Marke zu erzeugen/zu löschen/zu verifizieren</translation> + </message> +</context> +<context> + <name>GitUserConfigDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="14"/> + <source>Git User Data</source> + <translation>Git Nutzer Daten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="23"/> + <source>User Data</source> + <translation>Nutzer Daten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="29"/> + <source>First Name:</source> + <translation>Vorname:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="36"/> + <source>Enter the first name</source> + <translation>Gib den Vornamen ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="43"/> + <source>Last Name:</source> + <translation>Nachname:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="50"/> + <source>Enter the last name</source> + <translation>Gib den Nachnamen ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="57"/> + <source>Email:</source> + <translation>E-Mail:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="64"/> + <source>Enter the email address</source> + <translation>Gib die Email Adresse ein</translation> + </message> +</context> +<context> <name>GlosbeEngine</name> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/GlosbeEngine.py" line="88"/> @@ -18101,8 +24698,8 @@ </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1219"/> - <source>Open Link in New Tab Ctrl+LMB</source> - <translation>Link in neuem Fenster öffnen Strg+LMK</translation> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Link in neuem Fenster öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1292"/> @@ -69441,6 +76038,19 @@ </message> </context> <context> + <name>VcsGitPlugin</name> + <message> + <location filename="../Plugins/PluginVcsGit.py" line="60"/> + <source>Version Control - Git</source> + <translation>Versionskontrolle – Git</translation> + </message> + <message> + <location filename="../Plugins/PluginVcsGit.py" line="135"/> + <source>Git</source> + <translation>Git</translation> + </message> +</context> +<context> <name>VcsMercurialPlugin</name> <message> <location filename="../Plugins/PluginVcsMercurial.py" line="60"/> @@ -75267,8 +81877,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserView.py" line="618"/> - <source>Open Link in New Tab Ctrl+LMB</source> - <translation>Link in neuem Fenster öffnen Strg+LMK</translation> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Link in neuem Fenster öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="../WebBrowser/WebBrowserView.py" line="622"/>
--- a/i18n/eric6_empty.ts Sun Dec 10 16:43:11 2017 +0100 +++ b/i18n/eric6_empty.ts Sun Dec 10 17:42:11 2017 +0100 @@ -17223,6 +17223,6569 @@ </message> </context> <context> + <name>Git</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="211"/> + <source>The git process finished with the exit code {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1565"/> + <source>The git process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="218"/> + <source>Could not start the git executable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="246"/> + <source>Create project repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="246"/> + <source>The project repository could not be created.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="274"/> + <source>Creating Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="289"/> + <source>Adding files to Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="300"/> + <source>Initial commit to Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="330"/> + <source>Cloning project from a Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="419"/> + <source>Commit Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="419"/> + <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="478"/> + <source>Committing changes to Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="501"/> + <source>Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="501"/> + <source><p>Do you really want to switch to <b>{0}</b>?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="532"/> + <source>Synchronizing with the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="579"/> + <source>Adding files/directories to the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="653"/> + <source>Removing files/directories from the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="710"/> + <source>Renaming {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="833"/> + <source>Unstage files/directories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="884"/> + <source>Revert changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="875"/> + <source>Do you really want to revert all changes to these files or directories?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="884"/> + <source>Do you really want to revert all changes of the project?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="890"/> + <source>Reverting changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="942"/> + <source>Merging</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="967"/> + <source>Master branch head</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1200"/> + <source>Git Command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1287"/> + <source><tr><td><b>Commit</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1291"/> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1295"/> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1299"/> + <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1302"/> + <source><tr><td><b>Author</b></td><td>{0} &lt;{1}&gt;</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1305"/> + <source><tr><td><b>Date</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1308"/> + <source><tr><td><b>Committer</b></td><td>{0} &lt;{1}&gt;</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1311"/> + <source><tr><td><b>Committed Date</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1314"/> + <source><tr><td><b>Subject</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1322"/> + <source><h3>Repository information</h3> +<p><table> +<tr><td><b>Git V.</b></td><td>{0}</td></tr> +<tr></tr> +{1}</table></p> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1390"/> + <source>Create {0} file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1390"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1449"/> + <source>Git Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1434"/> + <source><p>Copying the directory <b>{0}</b> failed.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1449"/> + <source><p>Copying the file <b>{0}</b> failed.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2634"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1636"/> + <source>Git Side-by-Side Difference</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1636"/> + <source><p>The file <b>{0}</b> could not be read.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1685"/> + <source>Fetching from a remote Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1723"/> + <source>Pulling from a remote Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1764"/> + <source>Pushing to a remote Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1792"/> + <source>Committing failed merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1819"/> + <source>Aborting uncommitted/failed merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1852"/> + <source>Applying patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1884"/> + <source>Check patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1887"/> + <source>Apply patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1969"/> + <source>Tagging in the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2200"/> + <source>Branching in the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2240"/> + <source>Delete Remote Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2261"/> + <source>Current Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2261"/> + <source><p>The current branch is <b>{0}</b>.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2325"/> + <source>Create Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2290"/> + <source>Git Bundle Files (*.bundle)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2307"/> + <source><p>The Git bundle file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2355"/> + <source>Verify Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2485"/> + <source>Git Bundle Files (*.bundle);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2385"/> + <source>List Bundle Heads</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2485"/> + <source>Apply Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2508"/> + <source>Applying a bundle file (fetch)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2535"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2738"/> + <source>Git Bisect ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2634"/> + <source>Process Generation Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2678"/> + <source>Create Bisect Replay File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2644"/> + <source>Git Bisect Replay Files (*.replay)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2661"/> + <source><p>The Git bisect replay file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2678"/> + <source><p>The file <b>{0}</b> could not be written.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2699"/> + <source>Edit Bisect Replay File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2726"/> + <source>Git Bisect Replay Files (*.replay);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2726"/> + <source>Bisect Replay</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2980"/> + <source>Show Remote Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2927"/> + <source>Rename Remote Repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2927"/> + <source>Enter new name for remote repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3004"/> + <source>Show Shortlog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3062"/> + <source>Cherry-pick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3092"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3117"/> + <source>Copy Changesets (Quit)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3143"/> + <source>Copy Changesets (Cancel)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3223"/> + <source>Saving stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3422"/> + <source>Show Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3422"/> + <source>Select a stash (empty for latest stash):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3334"/> + <source>Restore Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3348"/> + <source>Restoring stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3382"/> + <source>Create Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3372"/> + <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="3397"/> + <source>Creating branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3431"/> + <source>Delete Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3431"/> + <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="3442"/> + <source>Deleting stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> + <source>Delete All Stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> + <source>Do you really want to delete all stashes?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3470"/> + <source>Deleting all stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3542"/> + <source>Showing the combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3568"/> + <source>Verifying the integrity of the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3593"/> + <source>Performing Repository Housekeeping</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3637"/> + <source><tr><td><b>Statistics</b></td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3638"/> + <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="3642"/> + <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="3646"/> + <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="3650"/> + <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="3654"/> + <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="3658"/> + <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="3662"/> + <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="3666"/> + <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="3672"/> + <source><p><b>No statistics available.</b></p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3738"/> + <source>Creating Archive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3781"/> + <source>Add Submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3840"/> + <source>List Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3840"/> + <source>No submodules defined for the project.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3855"/> + <source>All</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <source>Submodule Path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <source>Select a submodule path:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3911"/> + <source>Initialize Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3948"/> + <source>Unregister Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4028"/> + <source>Update Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4062"/> + <source>Synchronize Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4120"/> + <source>Submodules Summary</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitAddRemoteDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="14"/> + <source>Git Add Remote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="30"/> + <source>Enter the remote name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="37"/> + <source>URL:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="44"/> + <source>Enter the remote URL</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitApplyBundleDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="14"/> + <source>Git Apply Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="23"/> + <source>Bundle Head:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="36"/> + <source>Select a head to apply</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="43"/> + <source>Local Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="56"/> + <source>Enter a local branch</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitArchiveDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="14"/> + <source>Git Archive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="29"/> + <source>Select to specify a revision by a revision expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="32"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="42"/> + <source>Enter a commit id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="52"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="68"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="78"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="81"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="97"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="107"/> + <source>Select HEAD revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="110"/> + <source>HEAD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="125"/> + <source>Format:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="132"/> + <source>Select the archive format</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="139"/> + <source>File Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="146"/> + <source>Enter the name of the archive file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="153"/> + <source>Select the archive file via a file selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="160"/> + <source>Prefix:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="167"/> + <source>Enter a prefix to be prepended to each file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.py" line="88"/> + <source>Select Archive File</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBisectLogBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="14"/> + <source>Git Bisect Log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="42"/> + <source>Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="47"/> + <source>Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="52"/> + <source>Subject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="66"/> + <source>Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="72"/> + <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/GitBisectLogBrowserDialog.ui" line="88"/> + <source>Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="110"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="113"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="116"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="123"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="130"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="133"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="136"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="57"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="59"/> + <source>Press to refresh the list of commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="175"/> + <source>Process Generation Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="175"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBisectStartDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="14"/> + <source>Git Bisect Start</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="23"/> + <source>Bad Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="30"/> + <source>Enter a bad commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="37"/> + <source>Good Commits:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="44"/> + <source>Enter a list of good commits separated by space</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="51"/> + <source>Select to not checkout the working tree</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="54"/> + <source>Don't checkout working tree</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBlameDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="14"/> + <source>Git Blame</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="45"/> + <source>Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="50"/> + <source>Author</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="55"/> + <source>Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="60"/> + <source>Time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="65"/> + <source>Line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="79"/> + <source>Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="98"/> + <source>Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="120"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="123"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="126"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="133"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="140"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="143"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="146"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="119"/> + <source>Process Generation Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="119"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBranchDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="14"/> + <source>Git Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="23"/> + <source>Branch Action</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="29"/> + <source>Select to create a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="32"/> + <source><b>Create Branch</b> +<p>Select this entry in order to create a branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="36"/> + <source>Create</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="46"/> + <source>Select to rename a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="49"/> + <source><b>Rename</b> +<p>Select this entry in order to rename the selected branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="53"/> + <source>Rename</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="60"/> + <source>Select to delete a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="63"/> + <source><b>Delete Branch</b> +<p>Select this entry in order to delete the selected branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="67"/> + <source>Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="74"/> + <source>Select to create a new branch and switch to it</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="77"/> + <source><b>Create &amp; Switch</b>\n<p>Select this entry in order to create a new branch and switch the working tree to it.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="80"/> + <source>Create && Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="87"/> + <source>Select to create a tracking branch and switch to it</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="90"/> + <source><b>Create Tracking Branch &amp; Switch</b>\n<p>Select this entry in order to create a new branch tracking a remote repository branch. The working tree is switched to it.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="93"/> + <source>Create Tracking Branch && Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="100"/> + <source>Select to associate a remote branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="209"/> + <source>Set Tracking Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="110"/> + <source>Select to de-associate a remote branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="113"/> + <source>Unset Tracking Branch Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="125"/> + <source>Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="138"/> + <source>Enter the name of the branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="141"/> + <source><b>Branch Name</b> +<p>Enter the name of the branch to be created, deleted or moved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="157"/> + <source>Create Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="163"/> + <source>Revision:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="170"/> + <source>Enter a revision at which to start the branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="183"/> + <source>Rename Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="189"/> + <source>New Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="196"/> + <source>Enter a new name for the selected branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="215"/> + <source>Remote Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="228"/> + <source>Select the remote branch to associate</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="238"/> + <source>Select to enforce the create operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="241"/> + <source>Enforce Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBranchPushDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="14"/> + <source>Git Push Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="23"/> + <source>Branch Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="36"/> + <source>Select the branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="43"/> + <source>Remote Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="56"/> + <source>Select the remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.py" line="36"/> + <source><all branches></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBundleDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="14"/> + <source>Git Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="29"/> + <source>Select to specify a revision or revision range</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="32"/> + <source>Revisions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="42"/> + <source>Enter revisions or revision range expressions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="52"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="62"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="72"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="75"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="85"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitCherryPickDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="14"/> + <source>Git Cherry-pick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="23"/> + <source>Commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="29"/> + <source>Enter commits by id, branch or tag one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="45"/> + <source>Select to append cherry-pick info to the commit message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="48"/> + <source>Append Cherry-pick &Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="58"/> + <source>Select to add a 'Signed-off-by' line to the commit message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="61"/> + <source>Append '&Signed-off-by' line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="68"/> + <source>Select to not commit the cherry-pick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="71"/> + <source>Don't &commit</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitCommandDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="14"/> + <source>Git Command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="23"/> + <source>Git Command:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="36"/> + <source>Enter the Git command to be executed with all necessary parameters</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="39"/> + <source><b>Git Command</b> +<p>Enter the Git command to be executed including all necessary +parameters. If a parameter of the commandline includes a space you have to +surround this parameter by single or double quotes. Do not include the name +of the Git client executable (i.e. git).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="65"/> + <source>Project Directory:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="78"/> + <source>This shows the root directory of the current project.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="81"/> + <source>project directory</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitCommitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="14"/> + <source>Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="20"/> + <source>Commit Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="26"/> + <source>Enter the log message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="29"/> + <source><b>Log Message</b> +<p>Enter the log message for the commit action.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="43"/> + <source>Recent commit messages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="50"/> + <source>Select a recent commit message to use</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="60"/> + <source>Select to commit only staged changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="63"/> + <source>Commit staged changes only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="70"/> + <source>Select to amend the last commit (leave message empty to keep it)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="73"/> + <source>Amend the last commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="80"/> + <source>Select to reset the author information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="83"/> + <source>Reset Author Info</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitCopyDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="14"/> + <source>Git Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="25"/> + <source>Source:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="32"/> + <source>Shows the name of the source</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="35"/> + <source><b>Source name</b> +<p>This field shows the name of the source.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="46"/> + <source>Enter the target name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="49"/> + <source><b>Target name</b> +<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="57"/> + <source>Target:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="64"/> + <source>Press to open a selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="67"/> + <source><b>Target directory</b> +<p>Select the target name for the operation via a selection dialog.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="77"/> + <source>Select to force the operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="80"/> + <source>Enforce operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.py" line="51"/> + <source>Git Move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.py" line="89"/> + <source>Select target</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitDescribeDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="14"/> + <source>Git Tag List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="42"/> + <source>Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="47"/> + <source>Tag Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="61"/> + <source>Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="80"/> + <source>Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="102"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="105"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="108"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="115"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="122"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="125"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="128"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py" line="117"/> + <source>Process Generation Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py" line="117"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="14"/> + <source>Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="29"/> + <source>Output</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="57"/> + <source>Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="76"/> + <source>Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="98"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="101"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="104"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="111"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="118"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="121"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="124"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="88"/> + <source>Additional Output</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="104"/> + <source>Process canceled.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="116"/> + <source>Process finished successfully.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="118"/> + <source>Process crashed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="120"/> + <source>Proces finished with exit code {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/> + <source>Process Generation Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitDiffDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="14"/> + <source>Git Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="26"/> + <source>Difference</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="39"/> + <source><b>Git Diff</b><p>This shows the output of the git diff command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="56"/> + <source><b>Git Diff</b><p>This shows the output of the git diff command (stage to repo) if the dialog was asked to show separate diffs.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="85"/> + <source>Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="48"/> + <source>Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="50"/> + <source>Press to refresh the display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="96"/> + <source>Working Tree to Staging Area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="97"/> + <source>Staging Area to HEAD Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="98"/> + <source>Working Tree to HEAD Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="99"/> + <source>Working to Staging (top) and Staging to HEAD (bottom)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="101"/> + <source>Stash Contents</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="102"/> + <source>Stash Contents of {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="171"/> + <source>Difference ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="179"/> + <source>Process Generation Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="179"/> + <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/GitDiffDialog.py" line="206"/> + <source>There is no difference.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="227"/> + <source><Start></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="228"/> + <source><End></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="356"/> + <source>Save Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="322"/> + <source>Patch Files (*.diff)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="339"/> + <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="356"/> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitFetchDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="14"/> + <source>Git Fetch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="23"/> + <source>Remote Repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="30"/> + <source>Select the remote repository to fetch from</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="46"/> + <source>Remote Branches:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="56"/> + <source>Press to update the list of remote branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="59"/> + <source>Update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="81"/> + <source>Select the remote branches to be fetched</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="94"/> + <source>Local Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="101"/> + <source>Select the local branch to fetch into</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="111"/> + <source>Select to remove non-existing tracking references </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="114"/> + <source>Prune obsolete tracking references</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="121"/> + <source>Select to fetch tags as well</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="124"/> + <source>Include tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.py" line="36"/> + <source><All></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.py" line="37"/> + <source><Custom></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitListDialog.ui" line="14"/> + <source>Git Select</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitListDialog.ui" line="23"/> + <source>Select from the list:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitLogBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="14"/> + <source>Git Log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="22"/> + <source>Select action from menu</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="45"/> + <source>Select the mode (find or filter)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="65"/> + <source>From:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="72"/> + <source>Enter the start date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="82"/> + <source>To:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="89"/> + <source>Enter the end date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="112"/> + <source>Select the field to filter on</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="119"/> + <source>Enter the regular expression to filter on or search for</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="126"/> + <source>Press to find the previous occurrence</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="133"/> + <source>Press to find the next occurrence</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="174"/> + <source>Graph</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="101"/> + <source>Commit ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="102"/> + <source>Author</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="189"/> + <source>Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="103"/> + <source>Committer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="199"/> + <source>Commit Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="104"/> + <source>Subject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="209"/> + <source>Branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="214"/> + <source>Tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="224"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="234"/> + <source>Press to move down in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="257"/> + <source>Press to get the next bunch of log entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="260"/> + <source>&Next</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="267"/> + <source>Enter the limit of entries to fetch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="286"/> + <source>Select to stop listing log messages at a copy or move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="289"/> + <source>Stop on Copy/Move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="378"/> + <source>Action</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="383"/> + <source>Path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="388"/> + <source>Additions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="393"/> + <source>Deletions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="398"/> + <source>Copy from</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2119"/> + <source>Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="445"/> + <source><a href="save:me">Save</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="491"/> + <source>Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="497"/> + <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/GitLogBrowserDialog.ui" line="513"/> + <source>Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="535"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="538"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="541"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="548"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="555"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="558"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="561"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="88"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="90"/> + <source>Press to refresh the list of commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="98"/> + <source>Find</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="99"/> + <source>Filter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="105"/> + <source>File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="122"/> + <source><table><tr><td><b>Commit ID</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2} &lt;{3}&gt;</td></tr><tr><td><b>Commit Date</b></td><td>{4}</td></tr><tr><td><b>Committer</b></td><td>{5} &lt;{6}&gt;</td></tr>{7}<tr><td><b>Subject</b></td><td>{8}</td></tr>{9}</table></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="134"/> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="137"/> + <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="140"/> + <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="143"/> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="146"/> + <source><tr><td><b>Message</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="198"/> + <source>Added</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="199"/> + <source>Deleted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="200"/> + <source>Modified</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="201"/> + <source>Copied</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="202"/> + <source>Renamed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="203"/> + <source>Type changed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="204"/> + <source>Unmerged</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="205"/> + <source>Unknown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="241"/> + <source>Show Commit ID Column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="243"/> + <source>Press to show the commit ID column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="251"/> + <source>Show Author Columns</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="253"/> + <source>Press to show the author columns</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="261"/> + <source>Show Committer Columns</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="263"/> + <source>Press to show the committer columns</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="271"/> + <source>Show Branches Column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="273"/> + <source>Press to show the branches column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="281"/> + <source>Show Tags Column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="283"/> + <source>Press to show the Tags column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="313"/> + <source>Copy Commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="315"/> + <source>Cherry-pick the selected commits to the current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="320"/> + <source>Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="322"/> + <source>Tag the selected commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1812"/> + <source>Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="326"/> + <source>Create a new branch at the selected commit.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="328"/> + <source>Branch && Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="330"/> + <source>Create a new branch at the selected commit and switch the work tree to it.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1864"/> + <source>Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="336"/> + <source>Switch the working directory to the selected commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1890"/> + <source>Show Short Log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="342"/> + <source>Show a dialog with a log output for release notes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="345"/> + <source>Describe</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="347"/> + <source>Show the most recent tag reachable from a commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="648"/> + <source>The git process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="651"/> + <source>Could not start the git executable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="654"/> + <source>Git Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="769"/> + <source>{0} ({1}%)</source> + <comment>action, confidence</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="835"/> + <source>Process Generation Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="835"/> + <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/GitLogBrowserDialog.py" line="1275"/> + <source>Side-by-Side Diff to Parent {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1287"/> + <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1725"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1864"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1890"/> + <source>Select a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/> + <source>Select a default branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/> + <source>Branch & Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2073"/> + <source>Find Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2073"/> + <source>'{0}' was not found.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2133"/> + <source>Differences to Parent {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2148"/> + <source>Diff to Parent {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2174"/> + <source>There is no difference.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2337"/> + <source>Save Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2303"/> + <source>Patch Files (*.diff)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2320"/> + <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2337"/> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitMergeDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="14"/> + <source>Git Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="29"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="32"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="42"/> + <source>Enter a commit id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="52"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="62"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="72"/> + <source>Select to specify a revision by a local branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="75"/> + <source>Local Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="85"/> + <source>Enter a local branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="95"/> + <source>Select to specify a revision by a remote branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="98"/> + <source>Remote Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="108"/> + <source>Enter a remote branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="118"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="121"/> + <source>No commit selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="134"/> + <source>Select to commit the merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="137"/> + <source>Commit Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="146"/> + <source>Commit Message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="153"/> + <source>Enter a message for the merge commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="163"/> + <source>Select to append the log summaries of merged commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="166"/> + <source>Add Log Message Summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="176"/> + <source>Select to show diff statistics at the end of the merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="179"/> + <source>Show diff statistics</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitNewProjectOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="14"/> + <source>New Project from Repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="17"/> + <source><b>New Project from Repository Dialog</b> +<p>Enter the various repository infos into the entry fields. These values are used, when the new project is retrieved from the repository.</p> +<p>For remote repositories the URL must contain the hostname.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="28"/> + <source>&URL:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="44"/> + <source>Enter the URL of the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="60"/> + <source>Select the repository url via a directory selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="67"/> + <source>Press to clear the history of entered repository URLs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="74"/> + <source>Project &Directory:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="84"/> + <source>Enter the directory of the new project.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="87"/> + <source><b>Project Directory</b> +<p>Enter the directory of the new project. It will be retrieved from +the repository and be placed in this directory.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py" line="87"/> + <source>Select Repository-Directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py" line="102"/> + <source>Select Project Directory</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="14"/> + <source>Initial Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="17"/> + <source><b>Initial Commit Dialog</b> +<p>Enter the message for the initial commit.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="29"/> + <source>Commit &Message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="39"/> + <source>Enter the log message for the new project.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="42"/> + <source><b>Log Message</b> +<p>Enter the log message to be used for the new project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="46"/> + <source>new project started</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitPage</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="14"/> + <source>Select to perform an expensive copy detection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="20"/> + <source><b>Configure Git Interface</b></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="40"/> + <source>Log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="46"/> + <source>No. of log messages shown:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="53"/> + <source>Enter the number of log messages to be shown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="82"/> + <source>No. of subject characters shown in list:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="89"/> + <source>Enter the number of characters of the commit subject to be shown in the list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="95"/> + <source>All</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="105"/> + <source>Select to perform expensive copy detection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="108"/> + <source>Find copies harder</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="118"/> + <source>Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="124"/> + <source>No. of commit messages to remember:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="131"/> + <source>Enter the number of commit messages to remember</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="160"/> + <source>Commit ID length:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="167"/> + <source>Enter the number of character to show for the commit ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="199"/> + <source>Cleanup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="205"/> + <source>Pattern:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="212"/> + <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="222"/> + <source>Repository Optimization</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="228"/> + <source>Select this to use the '--aggressive' option for garbage collection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="231"/> + <source>Perform aggressive repository optimization</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="241"/> + <source>Edit the Git configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="244"/> + <source>Edit configuration file</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitPatchFilesDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py" line="83"/> + <source>Patch Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="37"/> + <source>Press to add patch files to the list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="44"/> + <source>Press to delete the selected patch files from the list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="58"/> + <source>Press to move the selected file up</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="65"/> + <source>Press to move the selected file down</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="91"/> + <source>Strip Count:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="98"/> + <source>Enter number of leading directories to strip off (default 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="129"/> + <source>Select, if the patch has inaccurate end-of-file markers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="132"/> + <source>Patch has inaccurate end-of-file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="139"/> + <source>Select, if the line counts of the patch header may be wrong</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="142"/> + <source>Don't trust line counts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py" line="83"/> + <source>Patch Files (*.diff *.patch);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitPatchStatisticsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="14"/> + <source>Patch Statistics</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="23"/> + <source>Insertions and Deletions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="52"/> + <source># Insertions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="57"/> + <source># Deletions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="62"/> + <source>File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="70"/> + <source>Summary Information:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="122"/> + <source>Process Generation Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="122"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="488"/> + <source>Version Control</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="499"/> + <source>Commit changes to repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="505"/> + <source>Add/Stage to repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="508"/> + <source>Unstage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="514"/> + <source>Remove from repository (and disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="588"/> + <source>Remove from repository only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="430"/> + <source>Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="432"/> + <source>Move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="435"/> + <source>Show log browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="520"/> + <source>Show status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="525"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="229"/> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="529"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="238"/> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="244"/> + <source>Show annotated file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="535"/> + <source>Revert changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="542"/> + <source>Select all local file entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="544"/> + <source>Select all versioned file entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="546"/> + <source>Select all local directory entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="548"/> + <source>Select all versioned directory entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="551"/> + <source>Configure...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="588"/> + <source>Do you really want to remove these files from the repository?</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="73"/> + <source>New from repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="73"/> + <source>&New from repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="78"/> + <source>Create (clone) a new project from a Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="81"/> + <source><b>New from repository</b><p>This creates (clones) a new local project from a Git repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="89"/> + <source>Fetch changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="94"/> + <source>Fetch changes from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="97"/> + <source><b>Fetch changes</b><p>This fetches changes from a remote repository into the local repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="105"/> + <source>Pull changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="110"/> + <source>Pull changes from a remote repository and update the work area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="113"/> + <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository and updates the work area.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="121"/> + <source>Commit changes to repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="121"/> + <source>Commit changes to repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="126"/> + <source>Commit changes of the local project to the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="129"/> + <source><b>Commit changes to repository</b><p>This commits changes of the local project to the Git repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="137"/> + <source>Push changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="142"/> + <source>Push changes to a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="145"/> + <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="153"/> + <source>Export from repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="153"/> + <source>&Export from repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="158"/> + <source>Export a project from the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="161"/> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="168"/> + <source>Show log browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="173"/> + <source>Show a dialog to browse the log of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="176"/> + <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="185"/> + <source>Show reflog browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="190"/> + <source>Show a dialog to browse the reflog of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="193"/> + <source><b>Show reflog browser</b><p>This shows a dialog to browse the reflog of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="202"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="202"/> + <source>Show &differences...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="207"/> + <source>Show the differences of the local project to the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="210"/> + <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="218"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="218"/> + <source>Show differences (extended) ...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="223"/> + <source>Show the difference of revisions of the project to the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="226"/> + <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="234"/> + <source>Show status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="234"/> + <source>Show &status...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="239"/> + <source>Show the status of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="242"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="249"/> + <source>Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="249"/> + <source>S&witch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="254"/> + <source>Switch the working directory to another revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="257"/> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="265"/> + <source>Tag in repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="265"/> + <source>&Tag in repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="270"/> + <source>Perform tag operations for the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="273"/> + <source><b>Tag in repository</b><p>This performs selectable tag operations for the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="281"/> + <source>List tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="281"/> + <source>&List tags...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="285"/> + <source>List tags of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="288"/> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="295"/> + <source>Show most recent tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="299"/> + <source>Show the most recent tag reachable from the work tree</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="302"/> + <source><b>Show most recent tag</b><p>This shows the most recent tag reachable from the work tree.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="310"/> + <source>List branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="310"/> + <source>&List branches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="314"/> + <source>List branches of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="317"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="324"/> + <source>List merged branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="324"/> + <source>List &merged branches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="328"/> + <source>List merged branches of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="331"/> + <source><b>List merged branches</b><p>This lists the merged branches of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="339"/> + <source>List non-merged branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="339"/> + <source>List &non-merged branches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="343"/> + <source>List non-merged branches of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="346"/> + <source><b>List non-merged branches</b><p>This lists the non-merged branches of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="354"/> + <source>Branch in repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="354"/> + <source>&Branch in repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="359"/> + <source>Perform branch operations for the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="362"/> + <source><b>Branch in repository</b><p>This performs selectable branch operations for the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="370"/> + <source>Delete Remote Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="370"/> + <source>&Delete Remote Branch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="374"/> + <source>Delete a branch from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="377"/> + <source><b>Delete Remote Branch</b><p>This deletes a branch from a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="384"/> + <source>Show current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="388"/> + <source>Show the current branch of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="391"/> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="398"/> + <source>Revert changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="398"/> + <source>Re&vert changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="403"/> + <source>Revert all changes made to the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="406"/> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="413"/> + <source>Unstage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="413"/> + <source>&Unstage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="418"/> + <source>Unstage all changes made to the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="421"/> + <source><b>Unstage changes</b><p>This unstages all changes made to the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="428"/> + <source>Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="428"/> + <source>Mer&ge changes...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="433"/> + <source>Merge changes into the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="436"/> + <source><b>Merge</b><p>This merges changes into the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="443"/> + <source>Cancel uncommitted/failed merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="447"/> + <source>Cancel an uncommitted or failed merge and lose all changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="450"/> + <source><b>Cancel uncommitted/failed merge</b><p>This cancels an uncommitted or failed merge causing all changes to be lost.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="458"/> + <source>Commit failed merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="462"/> + <source>Commit a failed merge after conflicts have been resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="465"/> + <source><b>Commit failed merge</b><p>This commits a failed merge after conflicts have been resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="473"/> + <source>Cleanup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="473"/> + <source>Cleanu&p</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="477"/> + <source>Cleanup the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="480"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="487"/> + <source>Execute command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="487"/> + <source>E&xecute command...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="491"/> + <source>Execute an arbitrary Git command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="494"/> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Git command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="502"/> + <source>Configure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="502"/> + <source>Configure...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="506"/> + <source>Show the configuration dialog with the Git page selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="509"/> + <source><b>Configure</b><p>Show the configuration dialog with the Git page selected.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="517"/> + <source>Show Remotes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="517"/> + <source>Show Remotes...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="521"/> + <source>Show the available remote repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="539"/> + <source><b>Show Remotes</b><p>This shows the remote repositories available for pulling, fetching and pushing.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1765"/> + <source>Show Remote Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="532"/> + <source>Show Remote Info...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="536"/> + <source>Show information about a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1161"/> + <source>Add</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="547"/> + <source>Add...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="551"/> + <source>Add a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="554"/> + <source><b>Add</b><p>This adds a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1785"/> + <source>Remove</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="561"/> + <source>Remove...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="565"/> + <source>Remove a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="568"/> + <source><b>Remove</b><p>This removes a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1799"/> + <source>Prune</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="575"/> + <source>Prune...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="579"/> + <source>Prune stale remote-tracking branches of a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="582"/> + <source><b>Prune</b><p>This prunes stale remote-tracking branches of a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <source>Rename</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="590"/> + <source>Rename...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="594"/> + <source>Rename a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="597"/> + <source><b>Rename</b><p>This renames a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1833"/> + <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> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="649"/> + <source>Cancel 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> + <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> + <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> + <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> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> + <source>Show stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> + <source>Show stash...</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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="702"/> + <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"/> + <source>Restore && Keep</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="714"/> + <source>Restore a stash but keep it</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="717"/> + <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"/> + <source>Restore && Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="728"/> + <source>Restore a stash and delete it</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="731"/> + <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"/> + <source>Create Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="742"/> + <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"/> + <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"/> + <source>Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="757"/> + <source>Delete a stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="760"/> + <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"/> + <source>Delete All</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="771"/> + <source>Delete all stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="774"/> + <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"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="785"/> + <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"/> + <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"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="799"/> + <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> + <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> + <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> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="862"/> + <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"/> + <source>Repository Statistics</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <source>Repository Statistics...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="873"/> + <source>Show some statistics of the local repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="876"/> + <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"/> + <source>Create Archive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="887"/> + <source>Create an archive from the local repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="890"/> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> + <source>List bundle heads...</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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="934"/> + <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"/> + <source>Apply Bundle (fetch)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <source>Apply Bundle (fetch)...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="945"/> + <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"/> + <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"/> + <source>Apply Bundle (pull)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="955"/> + <source>Apply Bundle (pull)...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="959"/> + <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"/> + <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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1003"/> + <source>Mark a selectable revision as good</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> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1017"/> + <source>Mark a selectable revision as bad</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1020"/> + <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"/> + <source>Skip</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <source>Skip...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1031"/> + <source>Skip a selectable revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1034"/> + <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"/> + <source>Reset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <source>Reset...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1045"/> + <source>Reset the bisect session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1048"/> + <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"/> + <source>Show bisect log browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1060"/> + <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"/> + <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"/> + <source>Create replay file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1076"/> + <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"/> + <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"/> + <source>Edit replay file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1092"/> + <source>Edit a bisect replay file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1095"/> + <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"/> + <source>Replay session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1107"/> + <source>Replay a bisect session from file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1110"/> + <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"/> + <source>Check patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1121"/> + <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"/> + <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"/> + <source>Apply patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1136"/> + <source>Apply a list of patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1139"/> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1180"/> + <source>List the submodule of the current project</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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1195"/> + <source>Initialize the submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1198"/> + <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> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1244"/> + <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"/> + <source>Fetch and Update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1257"/> + <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>Synchronize URLs of submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1293"/> + <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"/> + <source>Show Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1306"/> + <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"/> + <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"/> + <source>Show Summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1322"/> + <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"/> + <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"/> + <source>Administration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1360"/> + <source>Bundle Management</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="2237"/> + <source>Bisect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1397"/> + <source>Tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1405"/> + <source>Branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1418"/> + <source>Manage Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1426"/> + <source>Remote Repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1436"/> + <source>Cherry-pick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1444"/> + <source>Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1459"/> + <source>Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1541"/> + <source>Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1646"/> + <source>Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <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"/> + <source>Pull</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1715"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1734"/> + <source>Unstage Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <source>Select a remote repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1853"/> + <source>Copy Commits (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1872"/> + <source>Copy Commits (Quit)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1892"/> + <source>Copy Commits (Cancel)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1911"/> + <source>Save Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1961"/> + <source>Restore Stash</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitPullDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="14"/> + <source>Git Pull</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="23"/> + <source>Remote Repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="30"/> + <source>Select the remote repository to pull from</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="46"/> + <source>Remote Branches:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="56"/> + <source>Press to update the list of remote branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="59"/> + <source>Update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="81"/> + <source>Select the remote branches to be pulled</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="94"/> + <source>Select to remove non-existing tracking references </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="97"/> + <source>Prune obsolete tracking references</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.py" line="36"/> + <source><All></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.py" line="37"/> + <source><Custom></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitPushDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="14"/> + <source>Git Push</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="25"/> + <source>Remote Repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="32"/> + <source>Select the remote repository to push to</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="48"/> + <source>Branches to be pushed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="70"/> + <source>Push?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="75"/> + <source>Local</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="80"/> + <source>Remote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="85"/> + <source>Force?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="93"/> + <source>Press to select all branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="96"/> + <source>Select All</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="106"/> + <source><b>WARNING: The "Force" option can result in dangling branches in the remote repository.</b></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="119"/> + <source>Select to push tags as well</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="122"/> + <source>Include tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="129"/> + <source>Select this to associate a remote tracking branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="132"/> + <source>Set tracking information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="139"/> + <source>Push Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="145"/> + <source>Select to push submodules automatically</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="148"/> + <source>on-demand</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="158"/> + <source>Select to check, if submodules were pushed already</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="161"/> + <source>check</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="168"/> + <source>Select to push submodules only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="171"/> + <source>only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="178"/> + <source>Select to not push any submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="181"/> + <source>no</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitReflogBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="14"/> + <source>Git Reflog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="42"/> + <source>Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="47"/> + <source>Selector</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="52"/> + <source>Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="57"/> + <source>Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="62"/> + <source>Subject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="72"/> + <source>Press to get the next bunch of log entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="75"/> + <source>&Next</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="82"/> + <source>Enter the limit of entries to fetch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="122"/> + <source>Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="128"/> + <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/GitReflogBrowserDialog.ui" line="144"/> + <source>Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="166"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="169"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="172"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="179"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="186"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="189"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="192"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="59"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="61"/> + <source>Press to refresh the list of commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="200"/> + <source>Process Generation Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="200"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitRemoteRepositoriesDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="14"/> + <source>Git Remote Repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="17"/> + <source><b>Git Remote Repositories</b> +<p>This dialog shows the available remote repositories.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="30"/> + <source>Remote Repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="46"/> + <source>Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="51"/> + <source>URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="56"/> + <source>Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="82"/> + <source>Press to add a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="85"/> + <source>&Add</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="92"/> + <source>Press to rename the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="95"/> + <source>&Rename</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="102"/> + <source>Press to remove 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"/> + <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"/> + <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>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="217"/> + <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"/> + <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"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="230"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="51"/> + <source>Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="53"/> + <source>Press to refresh the repositories display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="148"/> + <source>Process Generation Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="148"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitRevisionSelectionDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="14"/> + <source>Git Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="29"/> + <source>Select to specify a revision by a revision expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="32"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="42"/> + <source>Enter a commit id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="52"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="68"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="78"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="81"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="97"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="107"/> + <source>Select to specify a revision by a remote branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="110"/> + <source>Remote Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="126"/> + <source>Enter a remote branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="136"/> + <source>Select HEAD revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="139"/> + <source>HEAD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="146"/> + <source>No revision selected</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitRevisionsSelectionDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="14"/> + <source>Git Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="23"/> + <source>Revision &1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="137"/> + <source>Select to specify a revision by a revision expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="140"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="150"/> + <source>Enter a commit id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="157"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="160"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="170"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="180"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="183"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="193"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="203"/> + <source>Select HEAD revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="206"/> + <source>HEAD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="216"/> + <source>Select revision before HEAD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="219"/> + <source>HEAD^</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="226"/> + <source>No revision selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="131"/> + <source>Revision &2</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitStashBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="14"/> + <source>Git Stash Browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="42"/> + <source>Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="47"/> + <source>Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="52"/> + <source>Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="66"/> + <source>Statistics</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="91"/> + <source>File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="96"/> + <source>Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="101"/> + <source>Lines added</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="106"/> + <source>Lines deleted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="153"/> + <source>Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="159"/> + <source><b>Git stash errors</b><p>This shows possible error messages of the git stash command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="175"/> + <source>Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="197"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="200"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="203"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="210"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="217"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="220"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="223"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="65"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="67"/> + <source>Press to refresh the list of stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="82"/> + <source>Show</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="85"/> + <source>Restore && Keep</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="87"/> + <source>Restore && Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="90"/> + <source>Create Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="93"/> + <source>Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="95"/> + <source>Delete All</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="182"/> + <source>Process Generation Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="182"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> + <message numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="369"/> + <source>%n file(s) changed</source> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="371"/> + <source>%n line(s) inserted</source> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="373"/> + <source>%n line(s) deleted</source> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> + </message> +</context> +<context> + <name>GitStashDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="14"/> + <source>Git Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="23"/> + <source>Message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="33"/> + <source>Enter a message for the stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="40"/> + <source>Keep changes in staging area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="47"/> + <source>Untracked/Ignored Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="53"/> + <source>Select to not stash untracked or ignored files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="56"/> + <source>Don't stash untracked or ignored files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="66"/> + <source>Select to stash untracked files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="69"/> + <source>Stash untracked files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="76"/> + <source>Select to stash untracked and ignored files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="79"/> + <source>Stash untracked and ignored files</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitStatusDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="395"/> + <source>Git Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="17"/> + <source><b>Git Status</b> +<p>This dialog shows the status of the selected file or project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="26"/> + <source>Select action from menu</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="49"/> + <source>&Filter on Status:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="59"/> + <source>Select the status of entries to be shown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="662"/> + <source>Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="105"/> + <source>Status (Work)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="110"/> + <source>Status (Staging)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="115"/> + <source>Path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="155"/> + <source>Difference Working to Staging</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="209"/> + <source>Difference Staging to HEAD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="252"/> + <source>Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="271"/> + <source>Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="293"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="296"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="299"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="306"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="313"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="316"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="319"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="65"/> + <source>Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="67"/> + <source>Press to refresh the status display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="105"/> + <source>Stage Selected Lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="109"/> + <source>Revert Selected Lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="113"/> + <source>Stage Hunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="117"/> + <source>Revert Hunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="123"/> + <source>Unstage Selected Lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="127"/> + <source>Unstage Hunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="169"/> + <source>added</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="170"/> + <source>copied</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="171"/> + <source>deleted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="172"/> + <source>modified</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="173"/> + <source>renamed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="175"/> + <source>not tracked</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="174"/> + <source>unmerged</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="168"/> + <source>unmodified</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="176"/> + <source>ignored</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="197"/> + <source>Commit the selected changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="198"/> + <source>Amend</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="200"/> + <source>Amend the latest commit with the selected changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="202"/> + <source>Select all for commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="204"/> + <source>Unselect all from commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="703"/> + <source>Add</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="210"/> + <source>Add the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="211"/> + <source>Stage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="213"/> + <source>Stages all changes of the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="215"/> + <source>Unstage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="217"/> + <source>Unstages all changes of the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="839"/> + <source>Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="224"/> + <source>Shows the differences of the selected entry in a separate dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="227"/> + <source>Differences Side-By-Side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="229"/> + <source>Shows the differences of the selected entry side-by-side in a separate dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="786"/> + <source>Revert</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="237"/> + <source>Reverts the changes of the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="242"/> + <source>Forget missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="244"/> + <source>Forgets about the selected missing files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="246"/> + <source>Restore missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="248"/> + <source>Restores the selected missing files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="253"/> + <source>Edit file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="255"/> + <source>Edit the selected conflicting file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="260"/> + <source>Adjust column sizes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="262"/> + <source>Adjusts the width of all columns to their contents</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="423"/> + <source>Process Generation Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="423"/> + <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/GitStatusDialog.py" line="596"/> + <source>all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="662"/> + <source>There are no entries selected to be committed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="703"/> + <source>There are no unversioned entries available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="725"/> + <source>Stage</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="725"/> + <source>There are no stageable entries available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="747"/> + <source>Unstage</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="747"/> + <source>There are no unstageable entries available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="769"/> + <source>Forget Missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="810"/> + <source>There are no missing entries available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="786"/> + <source>There are no uncommitted, unstaged changes available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="810"/> + <source>Restore Missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="839"/> + <source>There are no uncommitted changes available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="891"/> + <source>Working Tree to Staging Area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="870"/> + <source>Staging Area to HEAD Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="892"/> + <source>Working Tree to HEAD Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="894"/> + <source>Side-by-Side Difference</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="894"/> + <source>Select the compare method.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1201"/> + <source>Revert selected lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1203"/> + <source>Revert hunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1204"/> + <source>Are you sure you want to revert the selected changes?</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitStatusMonitorThread</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py" line="93"/> + <source>Could not start the Git process.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py" line="133"/> + <source>Git status checked successfully</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmoduleAddDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="14"/> + <source>Add Submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="23"/> + <source>&URL:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="39"/> + <source>Enter the URL of the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="55"/> + <source>Select the repository URL via a directory selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="62"/> + <source>Press to clear the history of entered repository URLs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="69"/> + <source>Submodule &Directory:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="79"/> + <source>Enter the directory for the submodule (leave empty to use default).</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="89"/> + <source>&Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="99"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="106"/> + <source>&Logical Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="116"/> + <source>Enter a logical name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="123"/> + <source>Select to enforce the operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="126"/> + <source>&Force Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="92"/> + <source>Select Submodule Repository Directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="118"/> + <source>Select Submodule Directory</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesDeinitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="14"/> + <source>Unregister Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="23"/> + <source>Select to unregister all submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="26"/> + <source>Unregister All Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="33"/> + <source>Selected Submodules:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="40"/> + <source>Select the submodules to be unregistered</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="53"/> + <source>Select to enforce unregistering</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="56"/> + <source>Enforce Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="14"/> + <source>Defined Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="39"/> + <source>Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="44"/> + <source>Path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="49"/> + <source>URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="54"/> + <source>Branch</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesStatusDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="14"/> + <source>Submodules Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="33"/> + <source>Submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="38"/> + <source>Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="43"/> + <source>Commit ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="48"/> + <source>Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="58"/> + <source>Select to show the status for the index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="61"/> + <source>Show Status for Index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="68"/> + <source>Perform a recursive operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="71"/> + <source>Recursive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="99"/> + <source>Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="46"/> + <source>up-to-date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="47"/> + <source>not initialized</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="48"/> + <source>different to index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="49"/> + <source>merge conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="55"/> + <source>Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="57"/> + <source>Press to refresh the status display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="105"/> + <source>The process {0} did not finish within 30 seconds.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="109"/> + <source>The process {0} finished with an error. +Error: {1}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="115"/> + <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/GitSubmodulesStatusDialog.py" line="134"/> + <source>unknown</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesSummaryOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="14"/> + <source>Submodule Summary Options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="23"/> + <source>Selected Submodules:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="30"/> + <source>Select the submodules to show the summary for</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="43"/> + <source>Select to show summary information for the index of the superproject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="46"/> + <source>Show Summary for Superproject Index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="53"/> + <source>Select to show summary information for the index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="56"/> + <source>Show Summary for Index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="63"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="70"/> + <source>Enter a commit ID to show summary information for</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="73"/> + <source>Enter Commit ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="80"/> + <source>Limit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="87"/> + <source>Enter the maximum number of entries to be shown per submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="93"/> + <source>No Limit</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesSyncDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="14"/> + <source>Synchronize Submodule URLs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="23"/> + <source>Selected Submodules:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="30"/> + <source>Select the submodules to be synchronized</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="43"/> + <source>Select to perform a recursive synchronization</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="46"/> + <source>Recursive Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesUpdateOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="14"/> + <source>Submodule Update Options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="23"/> + <source>Update Procedure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="29"/> + <source>Select to perform a 'checkout' procedure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="32"/> + <source>checkout</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="42"/> + <source>Select to perform a 'rebase' procedure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="45"/> + <source>rebase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="52"/> + <source>Select to perform a 'merge' procedure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="55"/> + <source>merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="65"/> + <source>Select to initialize submodules before the update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="68"/> + <source>Initialize before Update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="75"/> + <source>Fetch remote changes before updating</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="78"/> + <source>Synchronize with remote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="88"/> + <source>Select to not fetch the remote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="91"/> + <source>Don't Fetch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="98"/> + <source>Selected Submodules:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="105"/> + <source>Select the submodules to be updated</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="118"/> + <source>Select to enforce the update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="121"/> + <source>Enforce Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitTagBranchListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="14"/> + <source>Git Tag List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="17"/> + <source><b>Git Tag/Branch List</b> +<p>This dialog shows a list of the projects tags or branches.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="33"/> + <source><b>Tag/Branches List</b> +<p>This shows a list of the projects tags or branches.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="99"/> + <source>Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="99"/> + <source>Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="69"/> + <source>Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="88"/> + <source>Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="110"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="113"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="116"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="123"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="130"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="133"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="136"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="94"/> + <source>Annotation Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="98"/> + <source>Git Branches List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="135"/> + <source>Process Generation Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="135"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitTagDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="14"/> + <source>Git Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="36"/> + <source>Enter the name of the tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="39"/> + <source><b>Tag Name</b> +<p>Enter the name of the tag to be created, deleted or verified.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="53"/> + <source>Revision:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="60"/> + <source>Enter a revision to set a tag for</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="67"/> + <source>Tag Action</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="73"/> + <source>Select to create a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="76"/> + <source><b>Create Tag</b> +<p>Select this entry in order to create a tag.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="80"/> + <source>Create Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="90"/> + <source>Select to delete a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="93"/> + <source><b>Delete Tag</b> +<p>Select this entry in order to delete the selected tag.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="97"/> + <source>Delete Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="104"/> + <source>Select to verify a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="107"/> + <source><b>Verify Tag</b> +<p>Select this entry in order to verify the selected tag.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="111"/> + <source>Verify Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="121"/> + <source>Tag Type</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="127"/> + <source>Select to create/delete/verify a global tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="130"/> + <source>Global Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="140"/> + <source>Select to create/delete/verify a signed tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="143"/> + <source>Signed Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="150"/> + <source>Select to create/delete/verify a local tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="153"/> + <source>Local Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="163"/> + <source>Select to enforce the create operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="166"/> + <source>Enforce Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitUserConfigDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="14"/> + <source>Git User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="23"/> + <source>User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="29"/> + <source>First Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="36"/> + <source>Enter the first name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="43"/> + <source>Last Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="50"/> + <source>Enter the last name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="57"/> + <source>Email:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="64"/> + <source>Enter the email address</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GlosbeEngine</name> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/GlosbeEngine.py" line="88"/> @@ -68835,6 +75398,19 @@ </message> </context> <context> + <name>VcsGitPlugin</name> + <message> + <location filename="../Plugins/PluginVcsGit.py" line="60"/> + <source>Version Control - Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/PluginVcsGit.py" line="135"/> + <source>Git</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>VcsMercurialPlugin</name> <message> <location filename="../Plugins/PluginVcsMercurial.py" line="60"/>
--- a/i18n/eric6_en.ts Sun Dec 10 16:43:11 2017 +0100 +++ b/i18n/eric6_en.ts Sun Dec 10 17:42:11 2017 +0100 @@ -17239,6 +17239,6572 @@ </message> </context> <context> + <name>Git</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="211"/> + <source>The git process finished with the exit code {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1565"/> + <source>The git process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="218"/> + <source>Could not start the git executable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="246"/> + <source>Create project repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="246"/> + <source>The project repository could not be created.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="274"/> + <source>Creating Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="289"/> + <source>Adding files to Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="300"/> + <source>Initial commit to Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="330"/> + <source>Cloning project from a Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="419"/> + <source>Commit Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="419"/> + <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="478"/> + <source>Committing changes to Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="532"/> + <source>Synchronizing with the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="579"/> + <source>Adding files/directories to the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="653"/> + <source>Removing files/directories from the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="710"/> + <source>Renaming {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="833"/> + <source>Unstage files/directories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="884"/> + <source>Revert changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="875"/> + <source>Do you really want to revert all changes to these files or directories?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="884"/> + <source>Do you really want to revert all changes of the project?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="890"/> + <source>Reverting changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="942"/> + <source>Merging</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="967"/> + <source>Master branch head</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1200"/> + <source>Git Command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1287"/> + <source><tr><td><b>Commit</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1291"/> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1295"/> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1299"/> + <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1302"/> + <source><tr><td><b>Author</b></td><td>{0} &lt;{1}&gt;</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1305"/> + <source><tr><td><b>Date</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1308"/> + <source><tr><td><b>Committer</b></td><td>{0} &lt;{1}&gt;</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1311"/> + <source><tr><td><b>Committed Date</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1314"/> + <source><tr><td><b>Subject</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1322"/> + <source><h3>Repository information</h3> +<p><table> +<tr><td><b>Git V.</b></td><td>{0}</td></tr> +<tr></tr> +{1}</table></p> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1390"/> + <source>Create {0} file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1390"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1449"/> + <source>Git Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1434"/> + <source><p>Copying the directory <b>{0}</b> failed.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1449"/> + <source><p>Copying the file <b>{0}</b> failed.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2634"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1636"/> + <source>Git Side-by-Side Difference</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1636"/> + <source><p>The file <b>{0}</b> could not be read.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1685"/> + <source>Fetching from a remote Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1723"/> + <source>Pulling from a remote Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1764"/> + <source>Pushing to a remote Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1792"/> + <source>Committing failed merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1819"/> + <source>Aborting uncommitted/failed merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1969"/> + <source>Tagging in the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2200"/> + <source>Branching in the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2240"/> + <source>Delete Remote Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2261"/> + <source>Current Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2261"/> + <source><p>The current branch is <b>{0}</b>.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2325"/> + <source>Create Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2290"/> + <source>Git Bundle Files (*.bundle)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2307"/> + <source><p>The Git bundle file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2355"/> + <source>Verify Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2485"/> + <source>Git Bundle Files (*.bundle);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2385"/> + <source>List Bundle Heads</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2485"/> + <source>Apply Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2508"/> + <source>Applying a bundle file (fetch)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2535"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2738"/> + <source>Git Bisect ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2634"/> + <source>Process Generation Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2678"/> + <source>Create Bisect Replay File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2644"/> + <source>Git Bisect Replay Files (*.replay)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2661"/> + <source><p>The Git bisect replay file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2678"/> + <source><p>The file <b>{0}</b> could not be written.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2699"/> + <source>Edit Bisect Replay File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2726"/> + <source>Git Bisect Replay Files (*.replay);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2726"/> + <source>Bisect Replay</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2980"/> + <source>Show Remote Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2927"/> + <source>Rename Remote Repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2927"/> + <source>Enter new name for remote repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3004"/> + <source>Show Shortlog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3062"/> + <source>Cherry-pick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3092"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3117"/> + <source>Copy Changesets (Quit)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3143"/> + <source>Copy Changesets (Cancel)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3223"/> + <source>Saving stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3422"/> + <source>Show Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3422"/> + <source>Select a stash (empty for latest stash):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3334"/> + <source>Restore Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3348"/> + <source>Restoring stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3382"/> + <source>Create Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3372"/> + <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="3397"/> + <source>Creating branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3431"/> + <source>Delete Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3431"/> + <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="3442"/> + <source>Deleting stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> + <source>Delete All Stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> + <source>Do you really want to delete all stashes?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3470"/> + <source>Deleting all stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3542"/> + <source>Showing the combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3568"/> + <source>Verifying the integrity of the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3593"/> + <source>Performing Repository Housekeeping</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3637"/> + <source><tr><td><b>Statistics</b></td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3638"/> + <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="3642"/> + <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="3646"/> + <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="3650"/> + <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="3654"/> + <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="3658"/> + <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="3662"/> + <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="3666"/> + <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="3672"/> + <source><p><b>No statistics available.</b></p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3738"/> + <source>Creating Archive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="501"/> + <source>Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="501"/> + <source><p>Do you really want to switch to <b>{0}</b>?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1852"/> + <source>Applying patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1884"/> + <source>Check patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1887"/> + <source>Apply patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3781"/> + <source>Add Submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3840"/> + <source>List Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3840"/> + <source>No submodules defined for the project.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3855"/> + <source>All</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <source>Submodule Path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <source>Select a submodule path:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3911"/> + <source>Initialize Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3948"/> + <source>Unregister Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4028"/> + <source>Update Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4062"/> + <source>Synchronize Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4120"/> + <source>Submodules Summary</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitAddRemoteDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="14"/> + <source>Git Add Remote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="30"/> + <source>Enter the remote name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="37"/> + <source>URL:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="44"/> + <source>Enter the remote URL</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitApplyBundleDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="14"/> + <source>Git Apply Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="23"/> + <source>Bundle Head:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="36"/> + <source>Select a head to apply</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="43"/> + <source>Local Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="56"/> + <source>Enter a local branch</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitArchiveDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="14"/> + <source>Git Archive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="29"/> + <source>Select to specify a revision by a revision expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="32"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="42"/> + <source>Enter a commit id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="52"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="68"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="78"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="81"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="97"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="107"/> + <source>Select HEAD revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="110"/> + <source>HEAD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="125"/> + <source>Format:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="132"/> + <source>Select the archive format</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="139"/> + <source>File Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="146"/> + <source>Enter the name of the archive file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="153"/> + <source>Select the archive file via a file selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="160"/> + <source>Prefix:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="167"/> + <source>Enter a prefix to be prepended to each file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.py" line="88"/> + <source>Select Archive File</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBisectLogBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="14"/> + <source>Git Bisect Log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="42"/> + <source>Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="47"/> + <source>Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="52"/> + <source>Subject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="66"/> + <source>Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="72"/> + <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/GitBisectLogBrowserDialog.ui" line="88"/> + <source>Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="110"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="113"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="116"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="123"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="130"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="133"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="136"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="57"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="59"/> + <source>Press to refresh the list of commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="175"/> + <source>Process Generation Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="175"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBisectStartDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="14"/> + <source>Git Bisect Start</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="23"/> + <source>Bad Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="30"/> + <source>Enter a bad commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="37"/> + <source>Good Commits:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="44"/> + <source>Enter a list of good commits separated by space</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="51"/> + <source>Select to not checkout the working tree</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="54"/> + <source>Don't checkout working tree</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBlameDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="14"/> + <source>Git Blame</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="45"/> + <source>Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="50"/> + <source>Author</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="55"/> + <source>Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="60"/> + <source>Time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="65"/> + <source>Line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="79"/> + <source>Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="98"/> + <source>Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="120"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="123"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="126"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="133"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="140"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="143"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="146"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="119"/> + <source>Process Generation Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="119"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBranchDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="14"/> + <source>Git Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="23"/> + <source>Branch Action</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="29"/> + <source>Select to create a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="32"/> + <source><b>Create Branch</b> +<p>Select this entry in order to create a branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="36"/> + <source>Create</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="46"/> + <source>Select to rename a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="49"/> + <source><b>Rename</b> +<p>Select this entry in order to rename the selected branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="53"/> + <source>Rename</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="60"/> + <source>Select to delete a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="63"/> + <source><b>Delete Branch</b> +<p>Select this entry in order to delete the selected branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="67"/> + <source>Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="74"/> + <source>Select to create a new branch and switch to it</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="77"/> + <source><b>Create &amp; Switch</b>\n<p>Select this entry in order to create a new branch and switch the working tree to it.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="80"/> + <source>Create && Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="87"/> + <source>Select to create a tracking branch and switch to it</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="90"/> + <source><b>Create Tracking Branch &amp; Switch</b>\n<p>Select this entry in order to create a new branch tracking a remote repository branch. The working tree is switched to it.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="93"/> + <source>Create Tracking Branch && Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="125"/> + <source>Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="138"/> + <source>Enter the name of the branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="141"/> + <source><b>Branch Name</b> +<p>Enter the name of the branch to be created, deleted or moved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="157"/> + <source>Create Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="163"/> + <source>Revision:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="170"/> + <source>Enter a revision at which to start the branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="183"/> + <source>Rename Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="189"/> + <source>New Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="196"/> + <source>Enter a new name for the selected branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="238"/> + <source>Select to enforce the create operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="241"/> + <source>Enforce Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="100"/> + <source>Select to associate a remote branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="209"/> + <source>Set Tracking Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="110"/> + <source>Select to de-associate a remote branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="113"/> + <source>Unset Tracking Branch Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="215"/> + <source>Remote Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="228"/> + <source>Select the remote branch to associate</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBranchPushDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="14"/> + <source>Git Push Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="23"/> + <source>Branch Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="36"/> + <source>Select the branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="43"/> + <source>Remote Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="56"/> + <source>Select the remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.py" line="36"/> + <source><all branches></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBundleDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="14"/> + <source>Git Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="29"/> + <source>Select to specify a revision or revision range</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="32"/> + <source>Revisions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="52"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="62"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="72"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="75"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="85"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="42"/> + <source>Enter revisions or revision range expressions</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitCherryPickDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="14"/> + <source>Git Cherry-pick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="23"/> + <source>Commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="29"/> + <source>Enter commits by id, branch or tag one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="45"/> + <source>Select to append cherry-pick info to the commit message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="48"/> + <source>Append Cherry-pick &Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="58"/> + <source>Select to add a 'Signed-off-by' line to the commit message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="61"/> + <source>Append '&Signed-off-by' line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="68"/> + <source>Select to not commit the cherry-pick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="71"/> + <source>Don't &commit</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitCommandDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="14"/> + <source>Git Command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="23"/> + <source>Git Command:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="36"/> + <source>Enter the Git command to be executed with all necessary parameters</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="39"/> + <source><b>Git Command</b> +<p>Enter the Git command to be executed including all necessary +parameters. If a parameter of the commandline includes a space you have to +surround this parameter by single or double quotes. Do not include the name +of the Git client executable (i.e. git).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="65"/> + <source>Project Directory:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="78"/> + <source>This shows the root directory of the current project.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="81"/> + <source>project directory</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitCommitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="14"/> + <source>Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="20"/> + <source>Commit Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="26"/> + <source>Enter the log message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="29"/> + <source><b>Log Message</b> +<p>Enter the log message for the commit action.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="43"/> + <source>Recent commit messages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="50"/> + <source>Select a recent commit message to use</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="70"/> + <source>Select to amend the last commit (leave message empty to keep it)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="73"/> + <source>Amend the last commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="80"/> + <source>Select to reset the author information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="83"/> + <source>Reset Author Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="60"/> + <source>Select to commit only staged changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="63"/> + <source>Commit staged changes only</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitCopyDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="14"/> + <source>Git Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="25"/> + <source>Source:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="32"/> + <source>Shows the name of the source</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="35"/> + <source><b>Source name</b> +<p>This field shows the name of the source.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="46"/> + <source>Enter the target name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="49"/> + <source><b>Target name</b> +<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="57"/> + <source>Target:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="64"/> + <source>Press to open a selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="67"/> + <source><b>Target directory</b> +<p>Select the target name for the operation via a selection dialog.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="77"/> + <source>Select to force the operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="80"/> + <source>Enforce operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.py" line="51"/> + <source>Git Move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.py" line="89"/> + <source>Select target</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitDescribeDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="14"/> + <source>Git Tag List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="42"/> + <source>Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="47"/> + <source>Tag Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="61"/> + <source>Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="80"/> + <source>Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="102"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="105"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="108"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="115"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="122"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="125"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="128"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py" line="117"/> + <source>Process Generation Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py" line="117"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="14"/> + <source>Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="29"/> + <source>Output</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="57"/> + <source>Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="76"/> + <source>Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="98"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="101"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="104"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="111"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="118"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="121"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="124"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="104"/> + <source>Process canceled.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="116"/> + <source>Process finished successfully.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="118"/> + <source>Process crashed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="120"/> + <source>Proces finished with exit code {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/> + <source>Process Generation Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/> + <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/GitDialog.py" line="88"/> + <source>Additional Output</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitDiffDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="14"/> + <source>Git Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="26"/> + <source>Difference</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="39"/> + <source><b>Git Diff</b><p>This shows the output of the git diff command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="85"/> + <source>Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="179"/> + <source>Process Generation Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="179"/> + <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/GitDiffDialog.py" line="206"/> + <source>There is no difference.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="227"/> + <source><Start></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="228"/> + <source><End></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="356"/> + <source>Save Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="322"/> + <source>Patch Files (*.diff)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="339"/> + <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="356"/> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="56"/> + <source><b>Git Diff</b><p>This shows the output of the git diff command (stage to repo) if the dialog was asked to show separate diffs.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="48"/> + <source>Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="50"/> + <source>Press to refresh the display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="96"/> + <source>Working Tree to Staging Area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="97"/> + <source>Staging Area to HEAD Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="98"/> + <source>Working Tree to HEAD Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="99"/> + <source>Working to Staging (top) and Staging to HEAD (bottom)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="101"/> + <source>Stash Contents</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="102"/> + <source>Stash Contents of {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="171"/> + <source>Difference ({0})</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitFetchDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="14"/> + <source>Git Fetch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="23"/> + <source>Remote Repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="30"/> + <source>Select the remote repository to fetch from</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="46"/> + <source>Remote Branches:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="56"/> + <source>Press to update the list of remote branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="59"/> + <source>Update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="81"/> + <source>Select the remote branches to be fetched</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="94"/> + <source>Local Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="101"/> + <source>Select the local branch to fetch into</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="111"/> + <source>Select to remove non-existing tracking references </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="114"/> + <source>Prune obsolete tracking references</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="121"/> + <source>Select to fetch tags as well</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="124"/> + <source>Include tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.py" line="36"/> + <source><All></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.py" line="37"/> + <source><Custom></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitListDialog.ui" line="14"/> + <source>Git Select</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitListDialog.ui" line="23"/> + <source>Select from the list:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitLogBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="14"/> + <source>Git Log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="491"/> + <source>Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="497"/> + <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/GitLogBrowserDialog.ui" line="513"/> + <source>Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="535"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="538"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="541"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="548"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="555"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="558"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="561"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="65"/> + <source>From:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="72"/> + <source>Enter the start date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="82"/> + <source>To:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="89"/> + <source>Enter the end date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="112"/> + <source>Select the field to filter on</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="102"/> + <source>Author</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="103"/> + <source>Committer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1812"/> + <source>Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="104"/> + <source>Subject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="174"/> + <source>Graph</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="189"/> + <source>Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="199"/> + <source>Commit Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="214"/> + <source>Tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="378"/> + <source>Action</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="383"/> + <source>Path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="398"/> + <source>Copy from</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="257"/> + <source>Press to get the next bunch of log entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="260"/> + <source>&Next</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="267"/> + <source>Enter the limit of entries to fetch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="286"/> + <source>Select to stop listing log messages at a copy or move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="289"/> + <source>Stop on Copy/Move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="22"/> + <source>Select action from menu</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="88"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="90"/> + <source>Press to refresh the list of commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="198"/> + <source>Added</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="199"/> + <source>Deleted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="200"/> + <source>Modified</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="201"/> + <source>Copied</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="202"/> + <source>Renamed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="203"/> + <source>Type changed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="204"/> + <source>Unmerged</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="251"/> + <source>Show Author Columns</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="253"/> + <source>Press to show the author columns</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="261"/> + <source>Show Committer Columns</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="263"/> + <source>Press to show the committer columns</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="313"/> + <source>Copy Commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="315"/> + <source>Cherry-pick the selected commits to the current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="320"/> + <source>Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="322"/> + <source>Tag the selected commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="326"/> + <source>Create a new branch at the selected commit.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="328"/> + <source>Branch && Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="330"/> + <source>Create a new branch at the selected commit and switch the work tree to it.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1864"/> + <source>Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="336"/> + <source>Switch the working directory to the selected commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1890"/> + <source>Show Short Log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="342"/> + <source>Show a dialog with a log output for release notes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="345"/> + <source>Describe</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="347"/> + <source>Show the most recent tag reachable from a commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="648"/> + <source>The git process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="651"/> + <source>Could not start the git executable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="654"/> + <source>Git Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="769"/> + <source>{0} ({1}%)</source> + <comment>action, confidence</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="835"/> + <source>Process Generation Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="835"/> + <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/GitLogBrowserDialog.py" line="1725"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1864"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="205"/> + <source>Unknown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="209"/> + <source>Branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1890"/> + <source>Select a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/> + <source>Select a default branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/> + <source>Branch & Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="45"/> + <source>Select the mode (find or filter)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="126"/> + <source>Press to find the previous occurrence</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="133"/> + <source>Press to find the next occurrence</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="101"/> + <source>Commit ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="98"/> + <source>Find</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="99"/> + <source>Filter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="140"/> + <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="143"/> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2073"/> + <source>'{0}' was not found.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2073"/> + <source>Find Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="119"/> + <source>Enter the regular expression to filter on or search for</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="105"/> + <source>File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="224"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="234"/> + <source>Press to move down in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="388"/> + <source>Additions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="393"/> + <source>Deletions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2119"/> + <source>Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="445"/> + <source><a href="save:me">Save</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="122"/> + <source><table><tr><td><b>Commit ID</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2} &lt;{3}&gt;</td></tr><tr><td><b>Commit Date</b></td><td>{4}</td></tr><tr><td><b>Committer</b></td><td>{5} &lt;{6}&gt;</td></tr>{7}<tr><td><b>Subject</b></td><td>{8}</td></tr>{9}</table></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="134"/> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="137"/> + <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="146"/> + <source><tr><td><b>Message</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1275"/> + <source>Side-by-Side Diff to Parent {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1287"/> + <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2133"/> + <source>Differences to Parent {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2148"/> + <source>Diff to Parent {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2174"/> + <source>There is no difference.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2337"/> + <source>Save Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2303"/> + <source>Patch Files (*.diff)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2320"/> + <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2337"/> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="241"/> + <source>Show Commit ID Column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="243"/> + <source>Press to show the commit ID column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="271"/> + <source>Show Branches Column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="273"/> + <source>Press to show the branches column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="281"/> + <source>Show Tags Column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="283"/> + <source>Press to show the Tags column</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitMergeDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="14"/> + <source>Git Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="29"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="32"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="42"/> + <source>Enter a commit id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="52"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="62"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="118"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="121"/> + <source>No commit selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="134"/> + <source>Select to commit the merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="137"/> + <source>Commit Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="146"/> + <source>Commit Message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="153"/> + <source>Enter a message for the merge commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="163"/> + <source>Select to append the log summaries of merged commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="166"/> + <source>Add Log Message Summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="176"/> + <source>Select to show diff statistics at the end of the merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="179"/> + <source>Show diff statistics</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="72"/> + <source>Select to specify a revision by a local branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="75"/> + <source>Local Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="85"/> + <source>Enter a local branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="95"/> + <source>Select to specify a revision by a remote branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="98"/> + <source>Remote Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="108"/> + <source>Enter a remote branch name</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitNewProjectOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="14"/> + <source>New Project from Repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="28"/> + <source>&URL:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="60"/> + <source>Select the repository url via a directory selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="74"/> + <source>Project &Directory:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="84"/> + <source>Enter the directory of the new project.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="87"/> + <source><b>Project Directory</b> +<p>Enter the directory of the new project. It will be retrieved from +the repository and be placed in this directory.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py" line="87"/> + <source>Select Repository-Directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py" line="102"/> + <source>Select Project Directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="17"/> + <source><b>New Project from Repository Dialog</b> +<p>Enter the various repository infos into the entry fields. These values are used, when the new project is retrieved from the repository.</p> +<p>For remote repositories the URL must contain the hostname.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="44"/> + <source>Enter the URL of the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="67"/> + <source>Press to clear the history of entered repository URLs</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="29"/> + <source>Commit &Message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="39"/> + <source>Enter the log message for the new project.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="42"/> + <source><b>Log Message</b> +<p>Enter the log message to be used for the new project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="46"/> + <source>new project started</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="14"/> + <source>Initial Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="17"/> + <source><b>Initial Commit Dialog</b> +<p>Enter the message for the initial commit.</p></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitPage</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="20"/> + <source><b>Configure Git Interface</b></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="40"/> + <source>Log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="46"/> + <source>No. of log messages shown:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="53"/> + <source>Enter the number of log messages to be shown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="118"/> + <source>Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="124"/> + <source>No. of commit messages to remember:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="131"/> + <source>Enter the number of commit messages to remember</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="199"/> + <source>Cleanup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="205"/> + <source>Pattern:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="212"/> + <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="222"/> + <source>Repository Optimization</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="228"/> + <source>Select this to use the '--aggressive' option for garbage collection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="231"/> + <source>Perform aggressive repository optimization</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="241"/> + <source>Edit the Git configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="244"/> + <source>Edit configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="160"/> + <source>Commit ID length:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="167"/> + <source>Enter the number of character to show for the commit ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="82"/> + <source>No. of subject characters shown in list:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="89"/> + <source>Enter the number of characters of the commit subject to be shown in the list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="14"/> + <source>Select to perform an expensive copy detection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="95"/> + <source>All</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="108"/> + <source>Find copies harder</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="105"/> + <source>Select to perform expensive copy detection</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitPatchFilesDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py" line="83"/> + <source>Patch Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="37"/> + <source>Press to add patch files to the list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="44"/> + <source>Press to delete the selected patch files from the list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="58"/> + <source>Press to move the selected file up</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="65"/> + <source>Press to move the selected file down</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="91"/> + <source>Strip Count:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="98"/> + <source>Enter number of leading directories to strip off (default 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="129"/> + <source>Select, if the patch has inaccurate end-of-file markers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="132"/> + <source>Patch has inaccurate end-of-file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="139"/> + <source>Select, if the line counts of the patch header may be wrong</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="142"/> + <source>Don't trust line counts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py" line="83"/> + <source>Patch Files (*.diff *.patch);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitPatchStatisticsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="14"/> + <source>Patch Statistics</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="23"/> + <source>Insertions and Deletions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="52"/> + <source># Insertions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="57"/> + <source># Deletions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="62"/> + <source>File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="70"/> + <source>Summary Information:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="122"/> + <source>Process Generation Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="122"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="488"/> + <source>Version Control</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="499"/> + <source>Commit changes to repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="505"/> + <source>Add/Stage to repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="508"/> + <source>Unstage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="514"/> + <source>Remove from repository (and disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="588"/> + <source>Remove from repository only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="430"/> + <source>Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="432"/> + <source>Move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="435"/> + <source>Show log browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="520"/> + <source>Show status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="525"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="229"/> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="529"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="238"/> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="244"/> + <source>Show annotated file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="535"/> + <source>Revert changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="542"/> + <source>Select all local file entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="544"/> + <source>Select all versioned file entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="546"/> + <source>Select all local directory entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="548"/> + <source>Select all versioned directory entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="551"/> + <source>Configure...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="588"/> + <source>Do you really want to remove these files from the repository?</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="73"/> + <source>New from repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="73"/> + <source>&New from repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="78"/> + <source>Create (clone) a new project from a Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="81"/> + <source><b>New from repository</b><p>This creates (clones) a new local project from a Git repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="89"/> + <source>Fetch changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="94"/> + <source>Fetch changes from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="97"/> + <source><b>Fetch changes</b><p>This fetches changes from a remote repository into the local repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="105"/> + <source>Pull changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="110"/> + <source>Pull changes from a remote repository and update the work area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="113"/> + <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository and updates the work area.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="137"/> + <source>Push changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="142"/> + <source>Push changes to a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="145"/> + <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="153"/> + <source>Export from repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="153"/> + <source>&Export from repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="158"/> + <source>Export a project from the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="161"/> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="168"/> + <source>Show log browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="173"/> + <source>Show a dialog to browse the log of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="176"/> + <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="185"/> + <source>Show reflog browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="190"/> + <source>Show a dialog to browse the reflog of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="193"/> + <source><b>Show reflog browser</b><p>This shows a dialog to browse the reflog of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="202"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="202"/> + <source>Show &differences...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="207"/> + <source>Show the differences of the local project to the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="210"/> + <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="218"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="218"/> + <source>Show differences (extended) ...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="223"/> + <source>Show the difference of revisions of the project to the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="226"/> + <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="234"/> + <source>Show status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="234"/> + <source>Show &status...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="239"/> + <source>Show the status of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="242"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="249"/> + <source>Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="249"/> + <source>S&witch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="254"/> + <source>Switch the working directory to another revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="257"/> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="265"/> + <source>Tag in repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="265"/> + <source>&Tag in repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="270"/> + <source>Perform tag operations for the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="273"/> + <source><b>Tag in repository</b><p>This performs selectable tag operations for the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="281"/> + <source>List tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="281"/> + <source>&List tags...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="285"/> + <source>List tags of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="288"/> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="295"/> + <source>Show most recent tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="299"/> + <source>Show the most recent tag reachable from the work tree</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="310"/> + <source>List branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="310"/> + <source>&List branches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="314"/> + <source>List branches of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="317"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="324"/> + <source>List merged branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="324"/> + <source>List &merged branches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="328"/> + <source>List merged branches of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="331"/> + <source><b>List merged branches</b><p>This lists the merged branches of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="339"/> + <source>List non-merged branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="339"/> + <source>List &non-merged branches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="343"/> + <source>List non-merged branches of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="346"/> + <source><b>List non-merged branches</b><p>This lists the non-merged branches of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="354"/> + <source>Branch in repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="354"/> + <source>&Branch in repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="359"/> + <source>Perform branch operations for the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="362"/> + <source><b>Branch in repository</b><p>This performs selectable branch operations for the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="370"/> + <source>Delete Remote Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="370"/> + <source>&Delete Remote Branch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="374"/> + <source>Delete a branch from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="377"/> + <source><b>Delete Remote Branch</b><p>This deletes a branch from a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="384"/> + <source>Show current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="388"/> + <source>Show the current branch of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="391"/> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="398"/> + <source>Revert changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="398"/> + <source>Re&vert changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="403"/> + <source>Revert all changes made to the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="406"/> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="413"/> + <source>Unstage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="413"/> + <source>&Unstage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="418"/> + <source>Unstage all changes made to the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="421"/> + <source><b>Unstage changes</b><p>This unstages all changes made to the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="428"/> + <source>Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="428"/> + <source>Mer&ge changes...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="433"/> + <source>Merge changes into the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="436"/> + <source><b>Merge</b><p>This merges changes into the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="443"/> + <source>Cancel uncommitted/failed merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="447"/> + <source>Cancel an uncommitted or failed merge and lose all changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="450"/> + <source><b>Cancel uncommitted/failed merge</b><p>This cancels an uncommitted or failed merge causing all changes to be lost.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="458"/> + <source>Commit failed merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="462"/> + <source>Commit a failed merge after conflicts have been resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="465"/> + <source><b>Commit failed merge</b><p>This commits a failed merge after conflicts have been resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="473"/> + <source>Cleanup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="473"/> + <source>Cleanu&p</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="477"/> + <source>Cleanup the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="480"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="487"/> + <source>Execute command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="487"/> + <source>E&xecute command...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="491"/> + <source>Execute an arbitrary Git command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="494"/> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Git command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="502"/> + <source>Configure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="502"/> + <source>Configure...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="506"/> + <source>Show the configuration dialog with the Git page selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="509"/> + <source><b>Configure</b><p>Show the configuration dialog with the Git page selected.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="517"/> + <source>Show Remotes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="517"/> + <source>Show Remotes...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="521"/> + <source>Show the available remote repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="539"/> + <source><b>Show Remotes</b><p>This shows the remote repositories available for pulling, fetching and pushing.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1765"/> + <source>Show Remote Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="532"/> + <source>Show Remote Info...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="536"/> + <source>Show information about a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1161"/> + <source>Add</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="547"/> + <source>Add...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="551"/> + <source>Add a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="554"/> + <source><b>Add</b><p>This adds a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1785"/> + <source>Remove</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="561"/> + <source>Remove...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="565"/> + <source>Remove a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="568"/> + <source><b>Remove</b><p>This removes a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1799"/> + <source>Prune</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="575"/> + <source>Prune...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="579"/> + <source>Prune stale remote-tracking branches of a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="582"/> + <source><b>Prune</b><p>This prunes stale remote-tracking branches of a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <source>Rename</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="590"/> + <source>Rename...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="594"/> + <source>Rename a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="597"/> + <source><b>Rename</b><p>This renames a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1833"/> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="649"/> + <source>Cancel 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> + <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> + <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> + <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> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> + <source>Show stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> + <source>Show stash...</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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="702"/> + <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"/> + <source>Restore && Keep</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="714"/> + <source>Restore a stash but keep it</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="717"/> + <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"/> + <source>Restore && Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="728"/> + <source>Restore a stash and delete it</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="731"/> + <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"/> + <source>Create Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="742"/> + <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"/> + <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"/> + <source>Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="757"/> + <source>Delete a stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="760"/> + <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"/> + <source>Delete All</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="771"/> + <source>Delete all stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="774"/> + <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"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="785"/> + <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"/> + <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"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="799"/> + <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> + <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> + <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> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="862"/> + <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"/> + <source>Repository Statistics</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <source>Repository Statistics...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="873"/> + <source>Show some statistics of the local repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="876"/> + <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"/> + <source>Create Archive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="887"/> + <source>Create an archive from the local repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="890"/> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> + <source>List bundle heads...</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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="934"/> + <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"/> + <source>Apply Bundle (fetch)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <source>Apply Bundle (fetch)...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="945"/> + <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"/> + <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"/> + <source>Apply Bundle (pull)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="955"/> + <source>Apply Bundle (pull)...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="959"/> + <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"/> + <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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1003"/> + <source>Mark a selectable revision as good</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> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1017"/> + <source>Mark a selectable revision as bad</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1020"/> + <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"/> + <source>Skip</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <source>Skip...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1031"/> + <source>Skip a selectable revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1034"/> + <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"/> + <source>Reset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <source>Reset...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1045"/> + <source>Reset the bisect session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1048"/> + <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"/> + <source>Show bisect log browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1060"/> + <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"/> + <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"/> + <source>Create replay file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1076"/> + <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"/> + <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"/> + <source>Edit replay file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1092"/> + <source>Edit a bisect replay file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1095"/> + <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"/> + <source>Replay session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1107"/> + <source>Replay a bisect session from file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1110"/> + <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"/> + <source>Administration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1360"/> + <source>Bundle Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1690"/> + <source>Pull</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2237"/> + <source>Bisect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1397"/> + <source>Tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1405"/> + <source>Branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1418"/> + <source>Manage Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1426"/> + <source>Remote Repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1436"/> + <source>Cherry-pick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1444"/> + <source>Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1646"/> + <source>Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <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"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1734"/> + <source>Unstage Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <source>Select a remote repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1853"/> + <source>Copy Commits (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1872"/> + <source>Copy Commits (Quit)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1892"/> + <source>Copy Commits (Cancel)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1911"/> + <source>Save Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1961"/> + <source>Restore Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="302"/> + <source><b>Show most recent tag</b><p>This shows the most recent tag reachable from the work tree.</p></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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="121"/> + <source>Commit changes to repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="121"/> + <source>Commit changes to repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="126"/> + <source>Commit changes of the local project to the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="129"/> + <source><b>Commit changes to repository</b><p>This commits changes of the local project to the Git repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1541"/> + <source>Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1117"/> + <source>Check patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1121"/> + <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"/> + <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"/> + <source>Apply patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1136"/> + <source>Apply a list of patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1139"/> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1180"/> + <source>List the submodule of the current project</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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1195"/> + <source>Initialize the submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1198"/> + <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> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1244"/> + <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"/> + <source>Fetch and Update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1257"/> + <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>Synchronize URLs of submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1293"/> + <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"/> + <source>Show Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1306"/> + <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"/> + <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"/> + <source>Show Summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1322"/> + <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"/> + <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"/> + <source>Submodules</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitPullDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="14"/> + <source>Git Pull</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="23"/> + <source>Remote Repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="30"/> + <source>Select the remote repository to pull from</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="46"/> + <source>Remote Branches:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="56"/> + <source>Press to update the list of remote branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="59"/> + <source>Update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="81"/> + <source>Select the remote branches to be pulled</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="94"/> + <source>Select to remove non-existing tracking references </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="97"/> + <source>Prune obsolete tracking references</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.py" line="36"/> + <source><All></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.py" line="37"/> + <source><Custom></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitPushDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="14"/> + <source>Git Push</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="25"/> + <source>Remote Repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="32"/> + <source>Select the remote repository to push to</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="48"/> + <source>Branches to be pushed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="70"/> + <source>Push?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="75"/> + <source>Local</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="80"/> + <source>Remote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="85"/> + <source>Force?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="93"/> + <source>Press to select all branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="96"/> + <source>Select All</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="106"/> + <source><b>WARNING: The "Force" option can result in dangling branches in the remote repository.</b></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="119"/> + <source>Select to push tags as well</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="122"/> + <source>Include tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="129"/> + <source>Select this to associate a remote tracking branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="132"/> + <source>Set tracking information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="139"/> + <source>Push Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="145"/> + <source>Select to push submodules automatically</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="148"/> + <source>on-demand</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="161"/> + <source>check</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="168"/> + <source>Select to push submodules only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="171"/> + <source>only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="178"/> + <source>Select to not push any submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="181"/> + <source>no</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="158"/> + <source>Select to check, if submodules were pushed already</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitReflogBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="14"/> + <source>Git Reflog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="42"/> + <source>Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="47"/> + <source>Selector</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="52"/> + <source>Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="57"/> + <source>Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="62"/> + <source>Subject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="72"/> + <source>Press to get the next bunch of log entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="75"/> + <source>&Next</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="82"/> + <source>Enter the limit of entries to fetch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="122"/> + <source>Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="128"/> + <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/GitReflogBrowserDialog.ui" line="144"/> + <source>Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="166"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="169"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="172"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="179"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="186"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="189"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="192"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="59"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="61"/> + <source>Press to refresh the list of commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="200"/> + <source>Process Generation Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="200"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitRemoteRepositoriesDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="14"/> + <source>Git Remote Repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="17"/> + <source><b>Git Remote Repositories</b> +<p>This dialog shows the available remote repositories.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="30"/> + <source>Remote Repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="46"/> + <source>Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="51"/> + <source>URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="56"/> + <source>Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="82"/> + <source>Press to add a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="85"/> + <source>&Add</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="92"/> + <source>Press to rename the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="95"/> + <source>&Rename</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="102"/> + <source>Press to remove 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"/> + <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"/> + <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>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="217"/> + <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"/> + <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"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="230"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="51"/> + <source>Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="53"/> + <source>Press to refresh the repositories display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="148"/> + <source>Process Generation Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="148"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitRevisionSelectionDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="14"/> + <source>Git Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="29"/> + <source>Select to specify a revision by a revision expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="32"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="42"/> + <source>Enter a commit id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="52"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="68"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="78"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="81"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="97"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="136"/> + <source>Select HEAD revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="139"/> + <source>HEAD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="146"/> + <source>No revision selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="107"/> + <source>Select to specify a revision by a remote branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="110"/> + <source>Remote Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="126"/> + <source>Enter a remote branch name</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitRevisionsSelectionDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="14"/> + <source>Git Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="23"/> + <source>Revision &1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="137"/> + <source>Select to specify a revision by a revision expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="140"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="150"/> + <source>Enter a commit id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="157"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="160"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="170"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="180"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="183"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="193"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="203"/> + <source>Select HEAD revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="206"/> + <source>HEAD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="216"/> + <source>Select revision before HEAD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="219"/> + <source>HEAD^</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="226"/> + <source>No revision selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="131"/> + <source>Revision &2</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitStashBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="14"/> + <source>Git Stash Browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="42"/> + <source>Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="47"/> + <source>Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="52"/> + <source>Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="66"/> + <source>Statistics</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="91"/> + <source>File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="96"/> + <source>Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="101"/> + <source>Lines added</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="106"/> + <source>Lines deleted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="153"/> + <source>Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="159"/> + <source><b>Git stash errors</b><p>This shows possible error messages of the git stash command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="175"/> + <source>Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="197"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="200"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="203"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="210"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="217"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="220"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="223"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="65"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="82"/> + <source>Show</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="85"/> + <source>Restore && Keep</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="87"/> + <source>Restore && Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="90"/> + <source>Create Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="93"/> + <source>Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="95"/> + <source>Delete All</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="182"/> + <source>Process Generation Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="182"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> + <message numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="369"/> + <source>%n file(s) changed</source> + <translation> + <numerusform>%n file changed</numerusform> + <numerusform>%n files changed</numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="371"/> + <source>%n line(s) inserted</source> + <translation> + <numerusform>%n line inserted</numerusform> + <numerusform>%n lines inserted</numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="373"/> + <source>%n line(s) deleted</source> + <translation> + <numerusform>%n line deleted</numerusform> + <numerusform>%n lines deleted</numerusform> + </translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="67"/> + <source>Press to refresh the list of stashes</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitStashDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="14"/> + <source>Git Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="23"/> + <source>Message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="40"/> + <source>Keep changes in staging area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="47"/> + <source>Untracked/Ignored Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="53"/> + <source>Select to not stash untracked or ignored files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="56"/> + <source>Don't stash untracked or ignored files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="66"/> + <source>Select to stash untracked files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="69"/> + <source>Stash untracked files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="76"/> + <source>Select to stash untracked and ignored files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="79"/> + <source>Stash untracked and ignored files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="33"/> + <source>Enter a message for the stash</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitStatusDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="395"/> + <source>Git Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="17"/> + <source><b>Git Status</b> +<p>This dialog shows the status of the selected file or project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="49"/> + <source>&Filter on Status:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="59"/> + <source>Select the status of entries to be shown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="662"/> + <source>Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="105"/> + <source>Status (Work)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="110"/> + <source>Status (Staging)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="115"/> + <source>Path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="197"/> + <source>Commit the selected changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="200"/> + <source>Amend the latest commit with the selected changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="252"/> + <source>Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="271"/> + <source>Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="293"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="296"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="299"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="306"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="313"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="316"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="319"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="65"/> + <source>Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="67"/> + <source>Press to refresh the status display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="202"/> + <source>Select all for commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="211"/> + <source>Stage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="215"/> + <source>Unstage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="242"/> + <source>Forget missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="246"/> + <source>Restore missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="253"/> + <source>Edit file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="260"/> + <source>Adjust column sizes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="169"/> + <source>added</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="170"/> + <source>copied</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="171"/> + <source>deleted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="172"/> + <source>modified</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="173"/> + <source>renamed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="175"/> + <source>not tracked</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="174"/> + <source>unmerged</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="168"/> + <source>unmodified</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="176"/> + <source>ignored</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="423"/> + <source>Process Generation Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="423"/> + <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/GitStatusDialog.py" line="596"/> + <source>all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="662"/> + <source>There are no entries selected to be committed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="703"/> + <source>Add</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="703"/> + <source>There are no unversioned entries available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="725"/> + <source>Stage</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="725"/> + <source>There are no stageable entries available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="747"/> + <source>Unstage</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="747"/> + <source>There are no unstageable entries available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="769"/> + <source>Forget Missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="810"/> + <source>There are no missing entries available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="786"/> + <source>Revert</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="786"/> + <source>There are no uncommitted, unstaged changes available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="810"/> + <source>Restore Missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="839"/> + <source>Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="839"/> + <source>There are no uncommitted changes available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="891"/> + <source>Working Tree to Staging Area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="870"/> + <source>Staging Area to HEAD Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="892"/> + <source>Working Tree to HEAD Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="894"/> + <source>Side-by-Side Difference</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="894"/> + <source>Select the compare method.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="155"/> + <source>Difference Working to Staging</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="209"/> + <source>Difference Staging to HEAD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="105"/> + <source>Stage Selected Lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="109"/> + <source>Revert Selected Lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="113"/> + <source>Stage Hunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="117"/> + <source>Revert Hunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="123"/> + <source>Unstage Selected Lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="127"/> + <source>Unstage Hunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1201"/> + <source>Revert selected lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1203"/> + <source>Revert hunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1204"/> + <source>Are you sure you want to revert the selected changes?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="26"/> + <source>Select action from menu</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="198"/> + <source>Amend</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="204"/> + <source>Unselect all from commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="210"/> + <source>Add the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="213"/> + <source>Stages all changes of the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="217"/> + <source>Unstages all changes of the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="224"/> + <source>Shows the differences of the selected entry in a separate dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="227"/> + <source>Differences Side-By-Side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="229"/> + <source>Shows the differences of the selected entry side-by-side in a separate dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="237"/> + <source>Reverts the changes of the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="244"/> + <source>Forgets about the selected missing files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="248"/> + <source>Restores the selected missing files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="255"/> + <source>Edit the selected conflicting file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="262"/> + <source>Adjusts the width of all columns to their contents</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitStatusMonitorThread</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py" line="93"/> + <source>Could not start the Git process.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py" line="133"/> + <source>Git status checked successfully</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmoduleAddDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="14"/> + <source>Add Submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="23"/> + <source>&URL:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="39"/> + <source>Enter the URL of the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="55"/> + <source>Select the repository URL via a directory selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="62"/> + <source>Press to clear the history of entered repository URLs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="69"/> + <source>Submodule &Directory:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="79"/> + <source>Enter the directory for the submodule (leave empty to use default).</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="89"/> + <source>&Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="99"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="106"/> + <source>&Logical Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="116"/> + <source>Enter a logical name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="123"/> + <source>Select to enforce the operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="126"/> + <source>&Force Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="92"/> + <source>Select Submodule Repository Directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="118"/> + <source>Select Submodule Directory</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesDeinitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="14"/> + <source>Unregister Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="23"/> + <source>Select to unregister all submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="26"/> + <source>Unregister All Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="33"/> + <source>Selected Submodules:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="40"/> + <source>Select the submodules to be unregistered</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="53"/> + <source>Select to enforce unregistering</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="56"/> + <source>Enforce Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="14"/> + <source>Defined Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="39"/> + <source>Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="44"/> + <source>Path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="49"/> + <source>URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="54"/> + <source>Branch</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesStatusDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="14"/> + <source>Submodules Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="33"/> + <source>Submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="38"/> + <source>Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="43"/> + <source>Commit ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="48"/> + <source>Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="58"/> + <source>Select to show the status for the index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="61"/> + <source>Show Status for Index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="68"/> + <source>Perform a recursive operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="71"/> + <source>Recursive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="99"/> + <source>Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="46"/> + <source>up-to-date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="47"/> + <source>not initialized</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="48"/> + <source>different to index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="49"/> + <source>merge conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="55"/> + <source>Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="57"/> + <source>Press to refresh the status display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="105"/> + <source>The process {0} did not finish within 30 seconds.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="109"/> + <source>The process {0} finished with an error. +Error: {1}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="115"/> + <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/GitSubmodulesStatusDialog.py" line="134"/> + <source>unknown</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesSummaryOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="23"/> + <source>Selected Submodules:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="30"/> + <source>Select the submodules to show the summary for</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="43"/> + <source>Select to show summary information for the index of the superproject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="46"/> + <source>Show Summary for Superproject Index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="53"/> + <source>Select to show summary information for the index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="56"/> + <source>Show Summary for Index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="63"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="70"/> + <source>Enter a commit ID to show summary information for</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="73"/> + <source>Enter Commit ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="80"/> + <source>Limit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="87"/> + <source>Enter the maximum number of entries to be shown per submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="93"/> + <source>No Limit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="14"/> + <source>Submodule Summary Options</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesSyncDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="14"/> + <source>Synchronize Submodule URLs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="23"/> + <source>Selected Submodules:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="30"/> + <source>Select the submodules to be synchronized</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="43"/> + <source>Select to perform a recursive synchronization</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="46"/> + <source>Recursive Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesUpdateOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="14"/> + <source>Submodule Update Options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="23"/> + <source>Update Procedure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="29"/> + <source>Select to perform a 'checkout' procedure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="32"/> + <source>checkout</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="42"/> + <source>Select to perform a 'rebase' procedure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="45"/> + <source>rebase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="52"/> + <source>Select to perform a 'merge' procedure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="55"/> + <source>merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="65"/> + <source>Select to initialize submodules before the update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="68"/> + <source>Initialize before Update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="75"/> + <source>Fetch remote changes before updating</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="78"/> + <source>Synchronize with remote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="88"/> + <source>Select to not fetch the remote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="91"/> + <source>Don't Fetch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="98"/> + <source>Selected Submodules:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="105"/> + <source>Select the submodules to be updated</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="118"/> + <source>Select to enforce the update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="121"/> + <source>Enforce Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitTagBranchListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="14"/> + <source>Git Tag List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="17"/> + <source><b>Git Tag/Branch List</b> +<p>This dialog shows a list of the projects tags or branches.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="33"/> + <source><b>Tag/Branches List</b> +<p>This shows a list of the projects tags or branches.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="99"/> + <source>Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="99"/> + <source>Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="69"/> + <source>Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="88"/> + <source>Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="110"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="113"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="116"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="123"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="130"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="133"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="136"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="94"/> + <source>Annotation Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="98"/> + <source>Git Branches List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="135"/> + <source>Process Generation Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="135"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitTagDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="14"/> + <source>Git Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="36"/> + <source>Enter the name of the tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="39"/> + <source><b>Tag Name</b> +<p>Enter the name of the tag to be created, deleted or verified.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="53"/> + <source>Revision:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="60"/> + <source>Enter a revision to set a tag for</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="67"/> + <source>Tag Action</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="73"/> + <source>Select to create a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="76"/> + <source><b>Create Tag</b> +<p>Select this entry in order to create a tag.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="80"/> + <source>Create Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="90"/> + <source>Select to delete a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="93"/> + <source><b>Delete Tag</b> +<p>Select this entry in order to delete the selected tag.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="97"/> + <source>Delete Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="104"/> + <source>Select to verify a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="107"/> + <source><b>Verify Tag</b> +<p>Select this entry in order to verify the selected tag.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="111"/> + <source>Verify Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="121"/> + <source>Tag Type</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="130"/> + <source>Global Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="143"/> + <source>Signed Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="153"/> + <source>Local Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="163"/> + <source>Select to enforce the create operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="166"/> + <source>Enforce Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="127"/> + <source>Select to create/delete/verify a global tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="140"/> + <source>Select to create/delete/verify a signed tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="150"/> + <source>Select to create/delete/verify a local tag</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitUserConfigDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="14"/> + <source>Git User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="23"/> + <source>User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="29"/> + <source>First Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="36"/> + <source>Enter the first name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="43"/> + <source>Last Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="50"/> + <source>Enter the last name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="57"/> + <source>Email:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="64"/> + <source>Enter the email address</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GlosbeEngine</name> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/GlosbeEngine.py" line="88"/> @@ -48277,7 +54843,7 @@ <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py" line="214"/> <source>Greek</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Greek</translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py" line="214"/> @@ -48297,7 +54863,7 @@ <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py" line="214"/> <source>Arabic</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Arabic</translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py" line="214"/> @@ -48362,7 +54928,7 @@ <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py" line="214"/> <source>Thai</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Thai</translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py" line="214"/> @@ -48382,7 +54948,7 @@ <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py" line="214"/> <source>Georgian</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Georgian</translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py" line="214"/> @@ -49587,7 +56153,7 @@ <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py" line="193"/> <source>Arabic</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Arabic</translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py" line="193"/> @@ -49712,7 +56278,7 @@ <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py" line="193"/> <source>Georgian</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Georgian</translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py" line="193"/> @@ -49727,7 +56293,7 @@ <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py" line="193"/> <source>Greek</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Greek</translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py" line="193"/> @@ -50047,7 +56613,7 @@ <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py" line="193"/> <source>Thai</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Thai</translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py" line="193"/> @@ -60567,7 +67133,7 @@ <message> <location filename="../UI/SymbolsWidget.py" line="73"/> <source>Arabic</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Arabic</translation> </message> <message> <location filename="../UI/SymbolsWidget.py" line="74"/> @@ -60632,7 +67198,7 @@ <message> <location filename="../UI/SymbolsWidget.py" line="90"/> <source>Thai</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Thai</translation> </message> <message> <location filename="../UI/SymbolsWidget.py" line="91"/> @@ -60652,7 +67218,7 @@ <message> <location filename="../UI/SymbolsWidget.py" line="94"/> <source>Georgian</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Georgian</translation> </message> <message> <location filename="../UI/SymbolsWidget.py" line="95"/> @@ -64479,252 +71045,252 @@ <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="33"/> <source>Arabic</source> - <translation type="unfinished"></translation> + <translation>Arabic</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="35"/> <source>Bulgarian</source> - <translation type="unfinished"></translation> + <translation>Bulgarian</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="36"/> <source>Bosnian</source> - <translation type="unfinished"></translation> + <translation>Bosnian</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="37"/> <source>Catalan</source> - <translation type="unfinished"></translation> + <translation>Catalan</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="38"/> <source>Czech</source> - <translation type="unfinished"></translation> + <translation>Czech</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="39"/> <source>Danish</source> - <translation type="unfinished"></translation> + <translation>Danish</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="40"/> <source>German</source> - <translation type="unfinished"></translation> + <translation>German</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="41"/> <source>Greek</source> - <translation type="unfinished"></translation> + <translation>Greek</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="42"/> <source>English</source> - <translation type="unfinished">English</translation> + <translation>English</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="43"/> <source>Spanish</source> - <translation type="unfinished"></translation> + <translation>Spanish</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="44"/> <source>Estonian</source> - <translation type="unfinished"></translation> + <translation>Estonian</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="45"/> <source>Finnish</source> - <translation type="unfinished"></translation> + <translation>Finnish</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="46"/> <source>French</source> - <translation type="unfinished"></translation> + <translation>French</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="47"/> <source>Irish</source> - <translation type="unfinished"></translation> + <translation>Irish</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="48"/> <source>Galician</source> - <translation type="unfinished"></translation> + <translation>Galician</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="50"/> <source>Hindi</source> - <translation type="unfinished"></translation> + <translation>Hindi</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="51"/> <source>Croatian</source> - <translation type="unfinished"></translation> + <translation>Croatian</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="52"/> <source>Hungarian</source> - <translation type="unfinished"></translation> + <translation>Hungarian</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="53"/> <source>Indonesian</source> - <translation type="unfinished"></translation> + <translation>Indonesian</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="54"/> <source>Icelandic</source> - <translation type="unfinished"></translation> + <translation>Icelandic</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="55"/> <source>Italian</source> - <translation type="unfinished"></translation> + <translation>Italian</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="57"/> <source>Japanese</source> - <translation type="unfinished"></translation> + <translation>Japanese</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="58"/> <source>Georgian</source> - <translation type="unfinished"></translation> + <translation>Georgian</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="59"/> <source>Korean</source> - <translation type="unfinished"></translation> + <translation>Korean</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="60"/> <source>Lithuanian</source> - <translation type="unfinished"></translation> + <translation>Lithuanian</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="61"/> <source>Latvian</source> - <translation type="unfinished"></translation> + <translation>Latvian</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="62"/> <source>Macedonian</source> - <translation type="unfinished"></translation> + <translation>Macedonian</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="63"/> <source>Maltese</source> - <translation type="unfinished"></translation> + <translation>Maltese</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="64"/> <source>Dutch</source> - <translation type="unfinished"></translation> + <translation>Dutch</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="65"/> <source>Norwegian</source> - <translation type="unfinished"></translation> + <translation>Norwegian</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="66"/> <source>Polish</source> - <translation type="unfinished"></translation> + <translation>Polish</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="67"/> <source>Portuguese</source> - <translation type="unfinished"></translation> + <translation>Portuguese</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="68"/> <source>Romanian</source> - <translation type="unfinished"></translation> + <translation>Romanian</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="69"/> <source>Russian</source> - <translation type="unfinished"></translation> + <translation>Russian</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="70"/> <source>Slovak</source> - <translation type="unfinished"></translation> + <translation>Slovak</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="71"/> <source>Slovenian</source> - <translation type="unfinished"></translation> + <translation>Slovenian</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="72"/> <source>Albanian</source> - <translation type="unfinished"></translation> + <translation>Albanian</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="73"/> <source>Serbian</source> - <translation type="unfinished"></translation> + <translation>Serbian</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="74"/> <source>Swedish</source> - <translation type="unfinished"></translation> + <translation>Swedish</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="75"/> <source>Thai</source> - <translation type="unfinished"></translation> + <translation>Thai</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="76"/> <source>Filipino</source> - <translation type="unfinished"></translation> + <translation>Filipino</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="77"/> <source>Turkish</source> - <translation type="unfinished"></translation> + <translation>Turkish</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="78"/> <source>Ukrainian</source> - <translation type="unfinished"></translation> + <translation>Ukrainian</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="79"/> <source>Vietnamese</source> - <translation type="unfinished"></translation> + <translation>Vietnamese</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="80"/> <source>Chinese S</source> - <translation type="unfinished"></translation> + <translation>Chinese S</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="81"/> <source>Chinese T</source> - <translation type="unfinished"></translation> + <translation>Chinese T</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="32"/> <source>Afrikaans</source> - <translation type="unfinished"></translation> + <translation>Afrikaans</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="34"/> <source>Belarusian</source> - <translation type="unfinished"></translation> + <translation>Belarusian</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="49"/> <source>Hebrew (he)</source> - <translation type="unfinished"></translation> + <translation>Hebrew (he)</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py" line="56"/> <source>Hebrew (iw)</source> - <translation type="unfinished"></translation> + <translation>Hebrew (iw)</translation> </message> </context> <context> @@ -68879,6 +75445,19 @@ </message> </context> <context> + <name>VcsGitPlugin</name> + <message> + <location filename="../Plugins/PluginVcsGit.py" line="60"/> + <source>Version Control - Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/PluginVcsGit.py" line="135"/> + <source>Git</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>VcsMercurialPlugin</name> <message> <location filename="../Plugins/PluginVcsMercurial.py" line="60"/>
--- a/i18n/eric6_es.ts Sun Dec 10 16:43:11 2017 +0100 +++ b/i18n/eric6_es.ts Sun Dec 10 17:42:11 2017 +0100 @@ -17352,6 +17352,6604 @@ </message> </context> <context> + <name>Git</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="211"/> + <source>The git process finished with the exit code {0}</source> + <translation>El proceso git ha terminado con código de salida {0}</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1565"/> + <source>The git process did not finish within 30s.</source> + <translation>El proceso git no terminó en un plazo de 30s.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="218"/> + <source>Could not start the git executable.</source> + <translation>No se ha podido iniciar el ejecutable de git.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="246"/> + <source>Create project repository</source> + <translation>Crear repositorio del proyecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="246"/> + <source>The project repository could not be created.</source> + <translation>No se ha podido crear el repositorio del proyecto.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="274"/> + <source>Creating Git repository</source> + <translation>Creando repositorio Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="289"/> + <source>Adding files to Git repository</source> + <translation>Añadiendo archivos al repositorio Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="300"/> + <source>Initial commit to Git repository</source> + <translation>Commit inicial al repositorio Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="330"/> + <source>Cloning project from a Git repository</source> + <translation>Clonando proyecto desde un repositorio Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="419"/> + <source>Commit Changes</source> + <translation>Hacer Commit de Cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="419"/> + <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> + <translation>La operación de commit afecta a archivos que tienen cambios sin guardar. ¿Continuar con la operación de commit?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="478"/> + <source>Committing changes to Git repository</source> + <translation>Haciendo commit de cambios al repositorio Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="532"/> + <source>Synchronizing with the Git repository</source> + <translation>Sincronizando con el repositorio Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="579"/> + <source>Adding files/directories to the Git repository</source> + <translation>Añadiendo archivos/directorios al repositorio Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="653"/> + <source>Removing files/directories from the Git repository</source> + <translation>Eliminando archivos/directorios del repositorio Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="710"/> + <source>Renaming {0}</source> + <translation>Renombrando {0}</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="833"/> + <source>Unstage files/directories</source> + <translation>Sacar archivos/directorios del área de preparación (unstage)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="884"/> + <source>Revert changes</source> + <translation>Revertir cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="875"/> + <source>Do you really want to revert all changes to these files or directories?</source> + <translation>¿Realmente desea revertir todos los cambios de estos archivos o directorios?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="884"/> + <source>Do you really want to revert all changes of the project?</source> + <translation>¿Realmente desea revertir todos los cambios del proyecto?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="890"/> + <source>Reverting changes</source> + <translation>Revirtiendo cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="942"/> + <source>Merging</source> + <translation>Haciendo un merge</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="967"/> + <source>Master branch head</source> + <translation>Master branch head</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1200"/> + <source>Git Command</source> + <translation>Comando de Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1287"/> + <source><tr><td><b>Commit</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Commit</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1291"/> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Padres</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1295"/> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Tags</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1299"/> + <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1302"/> + <source><tr><td><b>Author</b></td><td>{0} &lt;{1}&gt;</td></tr></source> + <translation><tr><td><b>Autor</b></td><td>{0} &lt;{1}&gt;</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1305"/> + <source><tr><td><b>Date</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Fecha</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1308"/> + <source><tr><td><b>Committer</b></td><td>{0} &lt;{1}&gt;</td></tr></source> + <translation><tr><td><b>Autor del Commit</b></td><td>{0} &lt;{1}&gt;</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1311"/> + <source><tr><td><b>Committed Date</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Fecha de Commit</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1314"/> + <source><tr><td><b>Subject</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Asunto</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1322"/> + <source><h3>Repository information</h3> +<p><table> +<tr><td><b>Git V.</b></td><td>{0}</td></tr> +<tr></tr> +{1}</table></p> +</source> + <translation><h3>Información de repositorio</h3> +<p><table> +<tr><td><b>V. de Git </b></td><td>{0}</td></tr> +<tr></tr> +{1}</table></p> +</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1390"/> + <source>Create {0} file</source> + <translation>Crear archivo {0}</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1390"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1449"/> + <source>Git Copy</source> + <translation>Git Copy</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1434"/> + <source><p>Copying the directory <b>{0}</b> failed.</p><p>Reason: {1}</p></source> + <translation><p>La copia del directorio <b>{0}</b> ha fallado.</p><p>Razón: {1}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1449"/> + <source><p>Copying the file <b>{0}</b> failed.</p><p>Reason: {1}</p></source> + <translation><p>La copia del archivo <b>{0}</b> ha fallado.</p><p>Razón: {1}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2634"/> + <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/git.py" line="1636"/> + <source>Git Side-by-Side Difference</source> + <translation>Git mostrar Diferencias Lado a Lado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1636"/> + <source><p>The file <b>{0}</b> could not be read.</p></source> + <translation><p>El archivo <b>{0}</b> no se ha podido leer.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1685"/> + <source>Fetching from a remote Git repository</source> + <translation>Haciendo fetch desde un repositorio Git remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1723"/> + <source>Pulling from a remote Git repository</source> + <translation>Haciendo pull desde un repositorio Git remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1764"/> + <source>Pushing to a remote Git repository</source> + <translation>Haciendo push a un repositorio Git remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1792"/> + <source>Committing failed merge</source> + <translation>Haciendo commit de un merge fallido</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1819"/> + <source>Aborting uncommitted/failed merge</source> + <translation>Abortando merge fallido/sin commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1969"/> + <source>Tagging in the Git repository</source> + <translation>Haciendo tag en el repositorio Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2200"/> + <source>Branching in the Git repository</source> + <translation>Haciendo branch en el repositorio Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2240"/> + <source>Delete Remote Branch</source> + <translation>Borrar Branch Remota</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2261"/> + <source>Current Branch</source> + <translation>Branch Actual</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2261"/> + <source><p>The current branch is <b>{0}</b>.</p></source> + <translation><p>La branch actual es <b>{0}</b>.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2325"/> + <source>Create Bundle</source> + <translation>Crear Bundle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2290"/> + <source>Git Bundle Files (*.bundle)</source> + <translation>Archivos de Git Bundle (*.bundle)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2307"/> + <source><p>The Git bundle file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation><p>El archivo de Git bundle <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2355"/> + <source>Verify Bundle</source> + <translation>Verificar Bundle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2485"/> + <source>Git Bundle Files (*.bundle);;All Files (*)</source> + <translation>Archivos de Git Bundle (*.bundle);;Todos los archivos (*)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2385"/> + <source>List Bundle Heads</source> + <translation>Listar Bundle Heads</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2485"/> + <source>Apply Bundle</source> + <translation>Aplicar Bundle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2508"/> + <source>Applying a bundle file (fetch)</source> + <translation>Aplicando un archivo de bundle (fetch)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2535"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation>Subcomando bisect ({0}) inválido.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2738"/> + <source>Git Bisect ({0})</source> + <translation>Git Bisect ({0})</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2634"/> + <source>Process Generation Error</source> + <translation>Error de Generación de Proceso</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2678"/> + <source>Create Bisect Replay File</source> + <translation>Crear Archivo de Bisect Replay</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2644"/> + <source>Git Bisect Replay Files (*.replay)</source> + <translation>Archivos de Git Bisect Replay (*.replay)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2661"/> + <source><p>The Git bisect replay file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation><p>El archivo de Git bisect replay <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2678"/> + <source><p>The file <b>{0}</b> could not be written.</p><p>Reason: {1}</p></source> + <translation><p>El archivo<b>{0}</b> no puede ser escrito.<br />Razón: {1}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2699"/> + <source>Edit Bisect Replay File</source> + <translation>Editar Archivo de Bisect Replay</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2726"/> + <source>Git Bisect Replay Files (*.replay);;All Files (*)</source> + <translation>Archivos de Git Bisect Replay (*.replay);;Todos los Archivos (*)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2726"/> + <source>Bisect Replay</source> + <translation>Repetir Bisect</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2980"/> + <source>Show Remote Info</source> + <translation>Mostrar Info Remota</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2927"/> + <source>Rename Remote Repository</source> + <translation>Renombrar Repositorio Remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2927"/> + <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="3004"/> + <source>Show Shortlog</source> + <translation>Mostrar Shortlog</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3062"/> + <source>Cherry-pick</source> + <translation>Cherry-pick</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3092"/> + <source>Copy Changesets (Continue)</source> + <translation>Copiar Changesets (Continuar)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3117"/> + <source>Copy Changesets (Quit)</source> + <translation>Copiar Changesets (Salir)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3143"/> + <source>Copy Changesets (Cancel)</source> + <translation>Copiar Changesets (Cancelar)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3223"/> + <source>Saving stash</source> + <translation>Guardando stash (guardado rápido)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3422"/> + <source>Show Stash</source> + <translation>Mostrar Stash</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3422"/> + <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="3334"/> + <source>Restore Stash</source> + <translation>Restaurar Stash</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3348"/> + <source>Restoring stash</source> + <translation>Restaurando Stash</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3382"/> + <source>Create Branch</source> + <translation>Crear Branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3372"/> + <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="3397"/> + <source>Creating branch</source> + <translation>Creando branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3431"/> + <source>Delete Stash</source> + <translation>Borrar Stash</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3431"/> + <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="3442"/> + <source>Deleting stash</source> + <translation>Borrando stash</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> + <source>Delete All Stashes</source> + <translation>Borrar todos los Stashes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> + <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="3470"/> + <source>Deleting all stashes</source> + <translation>Borrando todos los stashes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3542"/> + <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="3568"/> + <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="3593"/> + <source>Performing Repository Housekeeping</source> + <translation>Llevando a cabo Reorganización del Repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3637"/> + <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="3638"/> + <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="3642"/> + <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="3646"/> + <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="3650"/> + <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="3654"/> + <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="3658"/> + <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="3662"/> + <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="3666"/> + <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="3672"/> + <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="3738"/> + <source>Creating Archive</source> + <translation>Creando Archivo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="501"/> + <source>Switch</source> + <translation>Hacer switch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="501"/> + <source><p>Do you really want to switch to <b>{0}</b>?</p></source> + <translation><p>¿Desea realmente borrar hacer switch a <b>{0}</b>?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1852"/> + <source>Applying patch</source> + <translation>Aplicando patch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1884"/> + <source>Check patch files</source> + <translation>Comprobar archivos de parche</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1887"/> + <source>Apply patch files</source> + <translation>Aplicar archivos de parche</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3781"/> + <source>Add Submodule</source> + <translation>Añadir Submódulo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3840"/> + <source>List Submodules</source> + <translation>Listar Submódulos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3840"/> + <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="3855"/> + <source>All</source> + <translation>Todo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <source>Submodule Path</source> + <translation>Ruta del Submódulo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <source>Select a submodule path:</source> + <translation>Seleccionar ruta del submódulo:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3911"/> + <source>Initialize Submodules</source> + <translation>Inicializar Submódulos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3948"/> + <source>Unregister Submodules</source> + <translation>Desregistrar Submódulos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4028"/> + <source>Update Submodules</source> + <translation>Actualizar Submódulos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4062"/> + <source>Synchronize Submodules</source> + <translation>Sincronizar Submódulos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4120"/> + <source>Submodules Summary</source> + <translation>Resumen de Submódulos</translation> + </message> +</context> +<context> + <name>GitAddRemoteDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="14"/> + <source>Git Add Remote</source> + <translation>Git Add Remote</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="23"/> + <source>Name:</source> + <translation>Nombre:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="30"/> + <source>Enter the remote name</source> + <translation>Introducir el nombre remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="37"/> + <source>URL:</source> + <translation>URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="44"/> + <source>Enter the remote URL</source> + <translation>Introducir la URL remota</translation> + </message> +</context> +<context> + <name>GitApplyBundleDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="14"/> + <source>Git Apply Data</source> + <translation>Git Aplicar Datos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="23"/> + <source>Bundle Head:</source> + <translation>Bundle Head:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="36"/> + <source>Select a head to apply</source> + <translation>Seleccionar un head para aplicar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="43"/> + <source>Local Branch:</source> + <translation>Branch Local:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="56"/> + <source>Enter a local branch</source> + <translation>Introducir una branch local</translation> + </message> +</context> +<context> + <name>GitArchiveDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="14"/> + <source>Git Archive</source> + <translation>Archivo Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="23"/> + <source>Revision</source> + <translation>Revisión</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="29"/> + <source>Select to specify a revision by a revision expression</source> + <translation>Seleccionar para especificar una revisión por expresión de revisión</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="32"/> + <source>Commit:</source> + <translation>Commit:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="42"/> + <source>Enter a commit id</source> + <translation>Introducir un id de commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation>Seleccionar para especificar una revisión por tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="52"/> + <source>Tag:</source> + <translation>Tag:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="68"/> + <source>Enter a tag name</source> + <translation>Introducir un nombre de tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="78"/> + <source>Select to specify a revision by a branch</source> + <translation>Seleccionar para especificar una revisión por branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="81"/> + <source>Branch:</source> + <translation>Branch:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="97"/> + <source>Enter a branch name</source> + <translation>Introducir un nombre de branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="107"/> + <source>Select HEAD revision</source> + <translation>Seleccionar revisión HEAD</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="110"/> + <source>HEAD</source> + <translation>HEAD</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="125"/> + <source>Format:</source> + <translation>Formato:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="132"/> + <source>Select the archive format</source> + <translation>Seleccionar el formato de archivo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="139"/> + <source>File Name:</source> + <translation>Nombre de Archivo:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="146"/> + <source>Enter the name of the archive file</source> + <translation>Introducir el nombre del fichero de archivo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="153"/> + <source>Select the archive file via a file selection dialog</source> + <translation>Seleccionar el fichero de archivo vía un diálogo de selección de archivos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="160"/> + <source>Prefix:</source> + <translation>Prefijo:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="167"/> + <source>Enter a prefix to be prepended to each file</source> + <translation>Introducir un prefijo para añadir al principio de cada archivo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.py" line="88"/> + <source>Select Archive File</source> + <translation>Seleccionar Fichero de Archivo</translation> + </message> +</context> +<context> + <name>GitBisectLogBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="14"/> + <source>Git Bisect Log</source> + <translation>Log de Git Bisect</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="42"/> + <source>Commit</source> + <translation>Commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="47"/> + <source>Operation</source> + <translation>Operación</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="52"/> + <source>Subject</source> + <translation>Asunto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="66"/> + <source>Errors</source> + <translation>Errores</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="72"/> + <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/GitBisectLogBrowserDialog.ui" line="88"/> + <source>Input</source> + <translation>Input</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="110"/> + <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/GitBisectLogBrowserDialog.ui" line="113"/> + <source>&Send</source> + <translation>&Enviar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="116"/> + <source>Alt+S</source> + <translation>Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="123"/> + <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/GitBisectLogBrowserDialog.ui" line="130"/> + <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/GitBisectLogBrowserDialog.ui" line="133"/> + <source>&Password Mode</source> + <translation>&Modo de contraseña</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="136"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="57"/> + <source>&Refresh</source> + <translation>Actualiza&r</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="59"/> + <source>Press to refresh the list of commits</source> + <translation>Pulsar para actualizar la lista de commits</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="175"/> + <source>Process Generation Error</source> + <translation>Error de Generación de Proceso</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="175"/> + <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> +</context> +<context> + <name>GitBisectStartDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="14"/> + <source>Git Bisect Start</source> + <translation>Iniciar Git Bisect</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="23"/> + <source>Bad Commit:</source> + <translation>Commit Malo:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="30"/> + <source>Enter a bad commit</source> + <translation>Introducir un commit malo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="37"/> + <source>Good Commits:</source> + <translation>Commits Buenos:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="44"/> + <source>Enter a list of good commits separated by space</source> + <translation>Introducir una lista de commits buenos separados por espacio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="51"/> + <source>Select to not checkout the working tree</source> + <translation>Seleccionar no hacer checkout del árbol de trabajo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="54"/> + <source>Don't checkout working tree</source> + <translation>No hacer checkout del árbol de trabajo</translation> + </message> +</context> +<context> + <name>GitBlameDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="14"/> + <source>Git Blame</source> + <translation>Git Blame</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="45"/> + <source>Commit</source> + <translation>Commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="50"/> + <source>Author</source> + <translation>Autor</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="55"/> + <source>Date</source> + <translation>Fecha</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="60"/> + <source>Time</source> + <translation>Hora</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="65"/> + <source>Line</source> + <translation>Línea</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="79"/> + <source>Errors</source> + <translation>Errores</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="98"/> + <source>Input</source> + <translation>Input</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="120"/> + <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/GitBlameDialog.ui" line="123"/> + <source>&Send</source> + <translation>&Enviar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="126"/> + <source>Alt+S</source> + <translation>Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="133"/> + <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/GitBlameDialog.ui" line="140"/> + <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/GitBlameDialog.ui" line="143"/> + <source>&Password Mode</source> + <translation>&Modo de contraseña</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="146"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="119"/> + <source>Process Generation Error</source> + <translation>Error de Generación de Proceso</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="119"/> + <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> +</context> +<context> + <name>GitBranchDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="14"/> + <source>Git Branch</source> + <translation>Git Branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="23"/> + <source>Branch Action</source> + <translation>Acción de Branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="29"/> + <source>Select to create a branch</source> + <translation>Seleccionar para crear una branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="32"/> + <source><b>Create Branch</b> +<p>Select this entry in order to create a branch.</p></source> + <translation><b>Crear Branch</b> +<p>Seleccionar esta entrada para crear una branch.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="36"/> + <source>Create</source> + <translation>Crear</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="46"/> + <source>Select to rename a branch</source> + <translation>Seleccionar para renombrar una branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="49"/> + <source><b>Rename</b> +<p>Select this entry in order to rename the selected branch.</p></source> + <translation><b>Renombrar</b> +<p>Seleccionar esta entrada para renombrar la branch seleccionada.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="53"/> + <source>Rename</source> + <translation>Renombrar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="60"/> + <source>Select to delete a branch</source> + <translation>Seleccionar para borrar una branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="63"/> + <source><b>Delete Branch</b> +<p>Select this entry in order to delete the selected branch.</p></source> + <translation><b>Borrar Branch</b> +<p>Seleccione esta entrada para borrar la branch seleccionada.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="67"/> + <source>Delete</source> + <translation>Borrar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="74"/> + <source>Select to create a new branch and switch to it</source> + <translation>Seleccionar para crear una nueva branch y cambiar a ella</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="77"/> + <source><b>Create &amp; Switch</b>\n<p>Select this entry in order to create a new branch and switch the working tree to it.</p></source> + <translation><b>Crear &amp; Cambiar</b>\n<p>Seleccionar esta entrada para crear una nueva branch y cambiar el árbol de trabajo a ella.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="80"/> + <source>Create && Switch</source> + <translation>Crear && Switch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="87"/> + <source>Select to create a tracking branch and switch to it</source> + <translation>Seleccionar para crear una tracking branch y cambiar a ella</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="90"/> + <source><b>Create Tracking Branch &amp; Switch</b>\n<p>Select this entry in order to create a new branch tracking a remote repository branch. The working tree is switched to it.</p></source> + <translation><b>Crear Tracking Branch &amp; Cambiar</b>\n<p>Seleccionar esta entrada para crear una nueva branch de tracking de branch en repositorio remoto. El árbol de trabajo se cambia a esa nueva branch.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="93"/> + <source>Create Tracking Branch && Switch</source> + <translation>Crear Tracking Branch && Cambiar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="125"/> + <source>Name:</source> + <translation>Nombre:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="138"/> + <source>Enter the name of the branch</source> + <translation>Introducir el nombre de la branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="141"/> + <source><b>Branch Name</b> +<p>Enter the name of the branch to be created, deleted or moved.</p></source> + <translation><b>Nombre de Branch</b> +<p>Introduzca el nombre de la branch a crear, mover o borrar.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="157"/> + <source>Create Branch</source> + <translation>Crear Branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="163"/> + <source>Revision:</source> + <translation>Revisión:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="170"/> + <source>Enter a revision at which to start the branch</source> + <translation>Introducir una revisión sobre la que iniciar la branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="183"/> + <source>Rename Branch</source> + <translation>Renombrar Branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="189"/> + <source>New Name:</source> + <translation>Nuevo Nombre:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="196"/> + <source>Enter a new name for the selected branch</source> + <translation>Introducir el nuevo nombre para la branch seleccionada</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="238"/> + <source>Select to enforce the create operation</source> + <translation>Seleccionar para forzar la operación de creado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="241"/> + <source>Enforce Operation</source> + <translation>Forzar Operación</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="100"/> + <source>Select to associate a remote branch</source> + <translation>Seleccionar para asociar a una branch remota</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="209"/> + <source>Set Tracking Branch</source> + <translation>Establecer Tracking Branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="110"/> + <source>Select to de-associate a remote branch</source> + <translation>Seleccionar para deshacer asociación a branch remota</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="113"/> + <source>Unset Tracking Branch Information</source> + <translation>Deshacer Establecer Información de Tracking Branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="215"/> + <source>Remote Branch:</source> + <translation>Branch Remota:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="228"/> + <source>Select the remote branch to associate</source> + <translation>Seleccionar la branch remota a la que asociar</translation> + </message> +</context> +<context> + <name>GitBranchPushDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="14"/> + <source>Git Push Branch</source> + <translation>Git Push Branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="23"/> + <source>Branch Name:</source> + <translation>Nombre de Branch:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="36"/> + <source>Select the branch</source> + <translation>Seleccionar la branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="43"/> + <source>Remote Name:</source> + <translation>Nombre Remoto:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="56"/> + <source>Select the remote repository</source> + <translation>Seleccionar el repositorio remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.py" line="36"/> + <source><all branches></source> + <translation><todas las branches></translation> + </message> +</context> +<context> + <name>GitBundleDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="14"/> + <source>Git Bundle</source> + <translation>Git Bundle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="23"/> + <source>Revision</source> + <translation>Revisión</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="29"/> + <source>Select to specify a revision or revision range</source> + <translation>Seleccionar para especificar una revisión o rango de revisiones</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="32"/> + <source>Revisions:</source> + <translation>Revisiones:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="42"/> + <source>Enter revisions or revision range expressions</source> + <translation>Introducir revisiones o expresiones de rangos de revisiones</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation>Seleccionar para especificar una revisión por tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="52"/> + <source>Tag:</source> + <translation>Tag:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="62"/> + <source>Enter a tag name</source> + <translation>Introduzca un nombre de tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="72"/> + <source>Select to specify a revision by a branch</source> + <translation>Seleccionar para especificar una revisión por una branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="75"/> + <source>Branch:</source> + <translation>Branch:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="85"/> + <source>Enter a branch name</source> + <translation>Introducir un nombre de branch</translation> + </message> +</context> +<context> + <name>GitCherryPickDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="14"/> + <source>Git Cherry-pick</source> + <translation>Git Cherry-pick</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="23"/> + <source>Commits</source> + <translation>Commits</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="29"/> + <source>Enter commits by id, branch or tag one per line</source> + <translation>Introducir commits por id, branch o tag uno por línea</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="45"/> + <source>Select to append cherry-pick info to the commit message</source> + <translation>Seleccionar para añadir información de cherry-pick al mensaje de commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="48"/> + <source>Append Cherry-pick &Info</source> + <translation>Añadir &Info de Cherry-pick</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="58"/> + <source>Select to add a 'Signed-off-by' line to the commit message</source> + <translation>Seleccionar para añadir una línea 'Firmado por' al mensaje de commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="61"/> + <source>Append '&Signed-off-by' line</source> + <translation>Añadir línea '&Firmado por'</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="68"/> + <source>Select to not commit the cherry-pick</source> + <translation>Seleccionar no hacer commit del cherry-pick</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="71"/> + <source>Don't &commit</source> + <translation>No hacer &commit</translation> + </message> +</context> +<context> + <name>GitCommandDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="14"/> + <source>Git Command</source> + <translation>Comando Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="23"/> + <source>Git Command:</source> + <translation>Comando Git:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="36"/> + <source>Enter the Git command to be executed with all necessary parameters</source> + <translation>Introducir el comando Git a ejecutar con todos los parámetros necesarios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="39"/> + <source><b>Git Command</b> +<p>Enter the Git command to be executed including all necessary +parameters. If a parameter of the commandline includes a space you have to +surround this parameter by single or double quotes. Do not include the name +of the Git client executable (i.e. git).</p></source> + <translation><b>Comando Git</b> +<p>Introducir el comando Git a ejecutar incluyendo todos los parámetros +necesarios. Si un parámetro de la línea de comandos incluye un espacio, se +deberá rodear este parámetro con comillas (sencillas o dobles). No incluir el nombre del +ejecutable del cliente de Git (p.e. git).</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="65"/> + <source>Project Directory:</source> + <translation>Directorio del Proyecto:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="78"/> + <source>This shows the root directory of the current project.</source> + <translation>Muestra el directorio raíz del proyecto actual.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="81"/> + <source>project directory</source> + <translation>directorio del proyecto</translation> + </message> +</context> +<context> + <name>GitCommitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="14"/> + <source>Git</source> + <translation>Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="20"/> + <source>Commit Message</source> + <translation>Mensaje de Commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="26"/> + <source>Enter the log message.</source> + <translation>Introduzca el mensaje de log.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="29"/> + <source><b>Log Message</b> +<p>Enter the log message for the commit action.</p></source> + <translation><b>Mensaje de Log</b> +<p>Introduzca el mensaje de log para la acción commit.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="43"/> + <source>Recent commit messages</source> + <translation>Mensajes recientes de commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="50"/> + <source>Select a recent commit message to use</source> + <translation>Seleccionar un mensaje reciente de commit para utilizar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="70"/> + <source>Select to amend the last commit (leave message empty to keep it)</source> + <translation>Seleccionar para enmendar el último commit (dejar sin mensaje para conservar el existente)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="73"/> + <source>Amend the last commit</source> + <translation>Enmendar último commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="80"/> + <source>Select to reset the author information</source> + <translation>Seleccionar para restablecer la información de autor</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="83"/> + <source>Reset Author Info</source> + <translation>Restablecer Info de Autor</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="60"/> + <source>Select to commit only staged changes</source> + <translation>Seleccionar para hacer commit solamente de cambios en área de preparación (staged)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="63"/> + <source>Commit staged changes only</source> + <translation>Hacer commit solamente de cambios en el área de preparación (staged)</translation> + </message> +</context> +<context> + <name>GitCopyDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="14"/> + <source>Git Copy</source> + <translation>Git Copy</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="25"/> + <source>Source:</source> + <translation>Origen:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="32"/> + <source>Shows the name of the source</source> + <translation>Muestra el nombre del origen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="35"/> + <source><b>Source name</b> +<p>This field shows the name of the source.</p></source> + <translation><b>Nombre de origen</b> +<p>Este campo muestra el nombre del origen.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="46"/> + <source>Enter the target name</source> + <translation>Introducir el nombre de destino</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="49"/> + <source><b>Target name</b> +<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> + <translation><b>Nombre de destino</b> +<p>Introducir el nuevo nombre en este campo. El destino debe ser el nuevo nombre o una ruta absoluta.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="57"/> + <source>Target:</source> + <translation>Destino:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="64"/> + <source>Press to open a selection dialog</source> + <translation>Pulsar para abrir un diálogo de selección</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="67"/> + <source><b>Target directory</b> +<p>Select the target name for the operation via a selection dialog.</p></source> + <translation><b>Directorio de destino</b> +<p>Seleccionar el nombre de destino para la operación a través de un diálogo de selección.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="77"/> + <source>Select to force the operation</source> + <translation>Seleccionar para forzar la operación</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="80"/> + <source>Enforce operation</source> + <translation>Forzar operación</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.py" line="51"/> + <source>Git Move</source> + <translation>Git Move</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.py" line="89"/> + <source>Select target</source> + <translation>Seleccionar destino</translation> + </message> +</context> +<context> + <name>GitDescribeDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="14"/> + <source>Git Tag List</source> + <translation>Git Tag List</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="42"/> + <source>Commit</source> + <translation>Commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="47"/> + <source>Tag Info</source> + <translation>Info de Tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="61"/> + <source>Errors</source> + <translation>Errores</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="80"/> + <source>Input</source> + <translation>Input</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="102"/> + <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/GitDescribeDialog.ui" line="105"/> + <source>&Send</source> + <translation>&Enviar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="108"/> + <source>Alt+S</source> + <translation>Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="115"/> + <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/GitDescribeDialog.ui" line="122"/> + <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/GitDescribeDialog.ui" line="125"/> + <source>&Password Mode</source> + <translation>&Modo de contraseña</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="128"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py" line="117"/> + <source>Process Generation Error</source> + <translation>Error de Generación de Proceso</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py" line="117"/> + <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> +</context> +<context> + <name>GitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="14"/> + <source>Git</source> + <translation>Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="29"/> + <source>Output</source> + <translation>Output</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="57"/> + <source>Errors</source> + <translation>Errores</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="76"/> + <source>Input</source> + <translation>Input</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="98"/> + <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/GitDialog.ui" line="101"/> + <source>&Send</source> + <translation>&Enviar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="104"/> + <source>Alt+S</source> + <translation>Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="111"/> + <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/GitDialog.ui" line="118"/> + <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/GitDialog.ui" line="121"/> + <source>&Password Mode</source> + <translation>&Modo de contraseña</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="124"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="104"/> + <source>Process canceled.</source> + <translation>Proceso cancelado.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="116"/> + <source>Process finished successfully.</source> + <translation>Proceso terminado con éxito.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="118"/> + <source>Process crashed.</source> + <translation>El proceso ha fallado.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="120"/> + <source>Proces finished with exit code {0}</source> + <translation>El proceso ha terminado con código de salida {0}</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/> + <source>Process Generation Error</source> + <translation>Error de Generación de Proceso</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/> + <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/GitDialog.py" line="88"/> + <source>Additional Output</source> + <translation>Output Adicional</translation> + </message> +</context> +<context> + <name>GitDiffDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="14"/> + <source>Git Diff</source> + <translation>Git Diff</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="26"/> + <source>Difference</source> + <translation>Diferencia</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="39"/> + <source><b>Git Diff</b><p>This shows the output of the git diff command.</p></source> + <translation><b>Diff de Git</b><p>Muestra la salida del comando git diff.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="85"/> + <source>Errors</source> + <translation>Errores</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="179"/> + <source>Process Generation Error</source> + <translation>Error de Generación de Proceso</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="179"/> + <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/GitDiffDialog.py" line="206"/> + <source>There is no difference.</source> + <translation>No hay ninguna diferencia.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="227"/> + <source><Start></source> + <translation><Inicio></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="228"/> + <source><End></source> + <translation><Fin></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="356"/> + <source>Save Diff</source> + <translation>Guardar Diff</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="322"/> + <source>Patch Files (*.diff)</source> + <translation>Archivos de Parche (*.diff)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="339"/> + <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation><p>El archivo de parche <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="356"/> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation><p>El archivo de parche <b>{0}</b> no puede ser guardado.<br />Causa: {1}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="56"/> + <source><b>Git Diff</b><p>This shows the output of the git diff command (stage to repo) if the dialog was asked to show separate diffs.</p></source> + <translation><b>Git Diff</b><p>Muestra la salida del comando git diff (stage a repositorio) si al diálogo se le ha pedido mostrar diffs separados.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="48"/> + <source>Refresh</source> + <translation>Actualizar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="50"/> + <source>Press to refresh the display</source> + <translation>Pulsar para actualizar la pantalla</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="96"/> + <source>Working Tree to Staging Area</source> + <translation>Árbol de Trabajo a Área de Preparación (Staging Area)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="97"/> + <source>Staging Area to HEAD Commit</source> + <translation>Área de Preparación (Staging Area) a HEAD Commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="98"/> + <source>Working Tree to HEAD Commit</source> + <translation>Árbol de Trabajo a HEAD Commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="99"/> + <source>Working to Staging (top) and Staging to HEAD (bottom)</source> + <translation>Directorio de trabajo a Staging (área de preparación) y Staging a HEAD (fondo)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="101"/> + <source>Stash Contents</source> + <translation>Contenido de área de guardado rápido de cambios (stash)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="102"/> + <source>Stash Contents of {0}</source> + <translation>Contenido de área de guardado rápido de cambios (stash) de {0}</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="171"/> + <source>Difference ({0})</source> + <translation>Diferencia ({0})</translation> + </message> +</context> +<context> + <name>GitFetchDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="14"/> + <source>Git Fetch</source> + <translation>Git Fetch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="23"/> + <source>Remote Repository:</source> + <translation>Repositorio Remoto:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="30"/> + <source>Select the remote repository to fetch from</source> + <translation>Seleccionar el repositorio remoto desde el que recuperar (fetch)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="46"/> + <source>Remote Branches:</source> + <translation>Branches Remotas:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="56"/> + <source>Press to update the list of remote branches</source> + <translation>Pulsar para actualizar la lista de branches remotas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="59"/> + <source>Update</source> + <translation>Actualizar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="81"/> + <source>Select the remote branches to be fetched</source> + <translation>Seleccionar las branches remotas a recuperar (fetch)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="94"/> + <source>Local Branch:</source> + <translation>Branch Local:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="101"/> + <source>Select the local branch to fetch into</source> + <translation>Seleccionar la branch local en la que volcar el fetch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="111"/> + <source>Select to remove non-existing tracking references </source> + <translation>Seleccionar para eliminar referencias de tracking inexistentes </translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="114"/> + <source>Prune obsolete tracking references</source> + <translation>Eliminar (prune) referencias obsoletas de tracking</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="121"/> + <source>Select to fetch tags as well</source> + <translation>Seleccionar para recuperar (fetch) tags también</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="124"/> + <source>Include tags</source> + <translation>Incluir tags</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.py" line="36"/> + <source><All></source> + <translation><Todo></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.py" line="37"/> + <source><Custom></source> + <translation><Personalizado></translation> + </message> +</context> +<context> + <name>GitListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitListDialog.ui" line="14"/> + <source>Git Select</source> + <translation>Git Select</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitListDialog.ui" line="23"/> + <source>Select from the list:</source> + <translation>Seleccionar de la lista:</translation> + </message> +</context> +<context> + <name>GitLogBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="14"/> + <source>Git Log</source> + <translation>Git Log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="491"/> + <source>Errors</source> + <translation>Errores</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="497"/> + <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/GitLogBrowserDialog.ui" line="513"/> + <source>Input</source> + <translation>Input</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="535"/> + <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/GitLogBrowserDialog.ui" line="538"/> + <source>&Send</source> + <translation>&Enviar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="541"/> + <source>Alt+S</source> + <translation>Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="548"/> + <source>Enter data to be sent to the git process</source> + <translation>Introducir los datos a enviar al proceso de git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="555"/> + <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/GitLogBrowserDialog.ui" line="558"/> + <source>&Password Mode</source> + <translation>&Modo de contraseña</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="561"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="65"/> + <source>From:</source> + <translation>Desde:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="72"/> + <source>Enter the start date</source> + <translation>Introducir fecha de comienzo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="82"/> + <source>To:</source> + <translation>Hasta:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="89"/> + <source>Enter the end date</source> + <translation>Introducir fecha de fin</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="112"/> + <source>Select the field to filter on</source> + <translation>Seleccione el campo de filtrado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="102"/> + <source>Author</source> + <translation>Autor</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="103"/> + <source>Committer</source> + <translation>Autor de commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1812"/> + <source>Branch</source> + <translation>Branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="104"/> + <source>Subject</source> + <translation>Asunto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="174"/> + <source>Graph</source> + <translation>Graph</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="189"/> + <source>Date</source> + <translation>Fecha</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="199"/> + <source>Commit Date</source> + <translation>Fecha de Commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="214"/> + <source>Tags</source> + <translation>Tags</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="378"/> + <source>Action</source> + <translation>Acción</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="383"/> + <source>Path</source> + <translation>Ruta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="398"/> + <source>Copy from</source> + <translation>Copiar desde</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="257"/> + <source>Press to get the next bunch of log entries</source> + <translation>Pulse para recuperar el siguiente conjunto de entradas de log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="260"/> + <source>&Next</source> + <translation>Siguie&nte</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="267"/> + <source>Enter the limit of entries to fetch</source> + <translation>Introduzca el límite de entradas a recuperar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="286"/> + <source>Select to stop listing log messages at a copy or move</source> + <translation>Seleccione para detener el listado de mensajes de log de copy o move</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="289"/> + <source>Stop on Copy/Move</source> + <translation>Detener en Copy/Move</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="22"/> + <source>Select action from menu</source> + <translation>Seleccionar acción del menú</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="88"/> + <source>&Refresh</source> + <translation>Actualiza&r</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="90"/> + <source>Press to refresh the list of commits</source> + <translation>Pulsar para actualizar la lista de commits</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="198"/> + <source>Added</source> + <translation>Añadido</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="199"/> + <source>Deleted</source> + <translation>Borrado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="200"/> + <source>Modified</source> + <translation>Modificado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="201"/> + <source>Copied</source> + <translation>Copiado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="202"/> + <source>Renamed</source> + <translation>Renombrado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="203"/> + <source>Type changed</source> + <translation>Tipo cambiado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="204"/> + <source>Unmerged</source> + <translation>Merge Deshecho</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="205"/> + <source>Unknown</source> + <translation>Desconocido</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="251"/> + <source>Show Author Columns</source> + <translation>Mostrar Columnas de Autor</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="253"/> + <source>Press to show the author columns</source> + <translation>Pulsar para mostrar las columnas de autor</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="261"/> + <source>Show Committer Columns</source> + <translation>Mostrar Columnas de Autor del Commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="263"/> + <source>Press to show the committer columns</source> + <translation>Pulsar para mostrar las columnas de autor del commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="313"/> + <source>Copy Commits</source> + <translation>Copiar Commits</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="315"/> + <source>Cherry-pick the selected commits to the current branch</source> + <translation>Hacer cherry-pick de los commits seleccionados a la branch actual</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="320"/> + <source>Tag</source> + <translation>Tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="322"/> + <source>Tag the selected commit</source> + <translation>Hacer Tag del commit seleccionado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="326"/> + <source>Create a new branch at the selected commit.</source> + <translation>Crear una nueva branch desde el commit seleccionado.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="328"/> + <source>Branch && Switch</source> + <translation>Branch && Switch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="330"/> + <source>Create a new branch at the selected commit and switch the work tree to it.</source> + <translation>Crear una nueva branch desde el commit seleccionado y cambiar el árbol de trabajo a ella.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1864"/> + <source>Switch</source> + <translation>Hacer switch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="336"/> + <source>Switch the working directory to the selected commit</source> + <translation>Cambiar el directorio de trabajo al commit seleccionado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1890"/> + <source>Show Short Log</source> + <translation>Mostrar Shortlog</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="342"/> + <source>Show a dialog with a log output for release notes</source> + <translation>Mostrar un diálogo con una salida de log para release notes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="345"/> + <source>Describe</source> + <translation>Describir</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="347"/> + <source>Show the most recent tag reachable from a commit</source> + <translation>Mostrar la tag más reciente alcanzable desde un commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="648"/> + <source>The git process did not finish within 30s.</source> + <translation>El proceso git no terminó en un plazo de 30s.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="651"/> + <source>Could not start the git executable.</source> + <translation>No se ha podido iniciar el ejecutable de git.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="654"/> + <source>Git Error</source> + <translation>Error de Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="769"/> + <source>{0} ({1}%)</source> + <comment>action, confidence</comment> + <translation>{0} ({1}%)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="835"/> + <source>Process Generation Error</source> + <translation>Error de Generación de Proceso</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="835"/> + <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/GitLogBrowserDialog.py" line="1725"/> + <source>Copy Changesets</source> + <translation>Copiar Changesets</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1864"/> + <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/GitLogBrowserDialog.ui" line="209"/> + <source>Branches</source> + <translation>Branches</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1890"/> + <source>Select a branch</source> + <translation>Seleccionar una branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/> + <source>Select a default branch</source> + <translation>Seleccionar la branch por defecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/> + <source>Branch & Switch</source> + <translation>Branch & Switch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="45"/> + <source>Select the mode (find or filter)</source> + <translation>Seleccionar el modo (buscar o filtrar)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="126"/> + <source>Press to find the previous occurrence</source> + <translation>Pulsar para buscar la ocurrencia anterior</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="133"/> + <source>Press to find the next occurrence</source> + <translation>Pulsar para buscar la siguiente ocurrencia</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="101"/> + <source>Commit ID</source> + <translation>Commit ID</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="98"/> + <source>Find</source> + <translation>Buscar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="99"/> + <source>Filter</source> + <translation>Filtrar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="140"/> + <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="143"/> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Tags</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2073"/> + <source>'{0}' was not found.</source> + <translation>No se ha encontrado '{0}'.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2073"/> + <source>Find Commit</source> + <translation>Buscar Commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="119"/> + <source>Enter the regular expression to filter on or search for</source> + <translation>Introducir la expresión regular para filtrar o para buscar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="105"/> + <source>File</source> + <translation>Archivo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="224"/> + <source>Press to move up in the log list</source> + <translation>Pulsar para mover hacia arriba en la lista de log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="234"/> + <source>Press to move down in the log list</source> + <translation>Pulsar para mover hacia abajo en la lista de log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="388"/> + <source>Additions</source> + <translation>Adiciones</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="393"/> + <source>Deletions</source> + <translation>Eliminaciones</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2119"/> + <source>Differences</source> + <translation>Diferencias</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="445"/> + <source><a href="save:me">Save</a></source> + <translation><a href="save:me">Guardar</a></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="122"/> + <source><table><tr><td><b>Commit ID</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2} &lt;{3}&gt;</td></tr><tr><td><b>Commit Date</b></td><td>{4}</td></tr><tr><td><b>Committer</b></td><td>{5} &lt;{6}&gt;</td></tr>{7}<tr><td><b>Subject</b></td><td>{8}</td></tr>{9}</table></source> + <translation><table><tr><td><b>ID de Commit</b></td><td>{0}</td></tr><tr><td><b>Fecha</b></td><td>{1}</td></tr><tr><td><b>Autor</b></td><td>{2} &lt;{3}&gt;</td></tr><tr><td><b>Fecha de Commit</b></td><td>{4}</td></tr><tr><td><b>Committer</b></td><td>{5} &lt;{6}&gt;</td></tr>{7}<tr><td><b>Asunto</b></td><td>{8}</td></tr>{9}</table></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="134"/> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Padres</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="137"/> + <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Hijos</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="146"/> + <source><tr><td><b>Message</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Mensaje</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1275"/> + <source>Side-by-Side Diff to Parent {0}</source> + <translation>Diferencias lado a lado con Parent {0}</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1287"/> + <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> + <translation><a href="sbsdiff:{0}_{1}">Comparación lado a lado</a></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2133"/> + <source>Differences to Parent {0}</source> + <translation>Diferencias con Parent {0}</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2148"/> + <source>Diff to Parent {0}</source> + <translation>Diff con Parent {0}</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2174"/> + <source>There is no difference.</source> + <translation>No hay ninguna diferencia.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2337"/> + <source>Save Diff</source> + <translation>Guardar Diff</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2303"/> + <source>Patch Files (*.diff)</source> + <translation>Archivos de Parche (*.diff)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2320"/> + <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation><p>El archivo de parche <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2337"/> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation><p>El archivo de parche <b>{0}</b> no puede ser guardado.<br />Causa: {1}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="241"/> + <source>Show Commit ID Column</source> + <translation>Mostrar columna de Commit ID</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="243"/> + <source>Press to show the commit ID column</source> + <translation>Pulsar para mostrar la columna de ID de commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="271"/> + <source>Show Branches Column</source> + <translation>Mostrar Columna de Branches</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="273"/> + <source>Press to show the branches column</source> + <translation>Pulsar para mostrar la columna de branches</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="281"/> + <source>Show Tags Column</source> + <translation>Mostrar Columna de Tags</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="283"/> + <source>Press to show the Tags column</source> + <translation>Pulsar para mostrar la columna de autor</translation> + </message> +</context> +<context> + <name>GitMergeDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="14"/> + <source>Git Merge</source> + <translation>Git Merge</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="23"/> + <source>Revision</source> + <translation>Revisión</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="29"/> + <source>Select to specify a revision by changeset id</source> + <translation>Seleccionar para especificar una revisión por changeset id</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="32"/> + <source>Commit:</source> + <translation>Commit:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="42"/> + <source>Enter a commit id</source> + <translation>Introducir un id de commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation>Seleccionar para especificar una revisión por tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="52"/> + <source>Tag:</source> + <translation>Tag:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="62"/> + <source>Enter a tag name</source> + <translation>Introducir un nombre de tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="118"/> + <source>Select to not specify a specific revision</source> + <translation>Seleccionar para no especificar una revisión específica</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="121"/> + <source>No commit selected</source> + <translation>No se ha seleccionado commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="134"/> + <source>Select to commit the merge</source> + <translation>Seleccionar para hacer commit del merge</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="137"/> + <source>Commit Merge</source> + <translation>Commit Merge</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="146"/> + <source>Commit Message:</source> + <translation>Mensaje de Commit:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="153"/> + <source>Enter a message for the merge commit</source> + <translation>Introducir un mensaje para el commit del merge</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="163"/> + <source>Select to append the log summaries of merged commits</source> + <translation>Seleccionar para añadir los resúmenes de log de los commits de merge</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="166"/> + <source>Add Log Message Summary</source> + <translation>Añadir Resumen de Mensaje de Log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="176"/> + <source>Select to show diff statistics at the end of the merge</source> + <translation>Seleccionar para mostrar estadísticas de diff al final del merge</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="179"/> + <source>Show diff statistics</source> + <translation>Mostrar estadísticas de diff</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="72"/> + <source>Select to specify a revision by a local branch</source> + <translation>Seleccionar para especificar una revisión por branch local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="75"/> + <source>Local Branch:</source> + <translation>Branch Local:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="85"/> + <source>Enter a local branch name</source> + <translation>Introducir un nombre de branch local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="95"/> + <source>Select to specify a revision by a remote branch</source> + <translation>Seleccionar para especificar una revisión por branch remota</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="98"/> + <source>Remote Branch:</source> + <translation>Branch Remota:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="108"/> + <source>Enter a remote branch name</source> + <translation>Introducir un nombre de branch remota</translation> + </message> +</context> +<context> + <name>GitNewProjectOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="14"/> + <source>New Project from Repository</source> + <translation>Nuevo proyecto desde repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="17"/> + <source><b>New Project from Repository Dialog</b> +<p>Enter the various repository infos into the entry fields. These values are used, when the new project is retrieved from the repository.</p> +<p>For remote repositories the URL must contain the hostname.</p></source> + <translation><b>Diálogo de Nuevo Proyecto desde repositorio</b> +<p>Introducir la información necesaria en los distintos campos de entrada. Estos valores se usarán al recuperar el nuevo proyecto desde el repositorio.</p> +<p>Para repositorios remotos la URL debe contener el nombre de host.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="28"/> + <source>&URL:</source> + <translation>&URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="60"/> + <source>Select the repository url via a directory selection dialog</source> + <translation>Seleccionar la url del repositorio a través de un diálogo de selección de directorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="74"/> + <source>Project &Directory:</source> + <translation>&Directorio del Proyecto:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="84"/> + <source>Enter the directory of the new project.</source> + <translation>Introducir el directorio para el nuevo proyecto.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="87"/> + <source><b>Project Directory</b> +<p>Enter the directory of the new project. It will be retrieved from +the repository and be placed in this directory.</p></source> + <translation><b>Directorio del Proyecto</b> +<p>Introduzca el directorio del nuevo proyecto. Se recuperará del repositorio +y se ubicará en este directorio.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py" line="87"/> + <source>Select Repository-Directory</source> + <translation>Seleccionar Repositorio-Directorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py" line="102"/> + <source>Select Project Directory</source> + <translation>Seleccionar Directorio del Proyecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="44"/> + <source>Enter the URL of the repository</source> + <translation>Introducir la URL del repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="67"/> + <source>Press to clear the history of entered repository URLs</source> + <translation>Pulsar para limpiar historial de URLs de repositorio introducidas</translation> + </message> +</context> +<context> + <name>GitOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="29"/> + <source>Commit &Message:</source> + <translation>&Mensaje de Commit:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="39"/> + <source>Enter the log message for the new project.</source> + <translation>Introducir el mensaje de log para el nuevo proyecto.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="42"/> + <source><b>Log Message</b> +<p>Enter the log message to be used for the new project.</p></source> + <translation><b>Mensaje de Log</b> +<p>Introducir el mensaje de log para utilizar para el nuevo proyecto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="46"/> + <source>new project started</source> + <translation>se ha iniciado el nuevo proyecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="14"/> + <source>Initial Commit</source> + <translation>Commit Inicial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="17"/> + <source><b>Initial Commit Dialog</b> +<p>Enter the message for the initial commit.</p></source> + <translation><b>Diálogo de Commit Inicial</b> +<p>Introducir el mensaje para el commit inicial.</p></translation> + </message> +</context> +<context> + <name>GitPage</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="20"/> + <source><b>Configure Git Interface</b></source> + <translation><b>Configurar la Interfaz de Git</b></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="40"/> + <source>Log</source> + <translation>Log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="46"/> + <source>No. of log messages shown:</source> + <translation>Número de mensajes de registro mostrados:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="53"/> + <source>Enter the number of log messages to be shown</source> + <translation>Introducir el número de mensajes de registro a ser mostrados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="118"/> + <source>Commit</source> + <translation>Commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="124"/> + <source>No. of commit messages to remember:</source> + <translation>Número de mensajes de commit a recordar:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="131"/> + <source>Enter the number of commit messages to remember</source> + <translation>Introduzca el número de mensajes de commit a recordar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="199"/> + <source>Cleanup</source> + <translation>Limpieza</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="205"/> + <source>Pattern:</source> + <translation>Patrón:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="212"/> + <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> + <translation>Intruducir el patrón de nombres de archivo a utilizar para la limpieza (entradas separadas por un caracter de espacio)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="222"/> + <source>Repository Optimization</source> + <translation>Optimización de Repositorios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="228"/> + <source>Select this to use the '--aggressive' option for garbage collection</source> + <translation>Seleccionar aquí para utilizar la opción '--aggressive' para la recolección de basura</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="231"/> + <source>Perform aggressive repository optimization</source> + <translation>Llevar a cabo optimización de repositorios agresiva</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="241"/> + <source>Edit the Git configuration file</source> + <translation>Editar el archivo de configuración de Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="244"/> + <source>Edit configuration file</source> + <translation>Editar archivo de configuración</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="160"/> + <source>Commit ID length:</source> + <translation>Longitud de Commit ID:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="167"/> + <source>Enter the number of character to show for the commit ID</source> + <translation>Introducir el número de caracteres a mostrar para el commit ID</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="82"/> + <source>No. of subject characters shown in list:</source> + <translation>Núm. de caracteres del subject mostrados en la lista:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="89"/> + <source>Enter the number of characters of the commit subject to be shown in the list</source> + <translation>Introducir el número de caracteres del subject del commit a mostrar en la lista</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="14"/> + <source>Select to perform an expensive copy detection</source> + <translation>Seleccionar para llevar a cabo detección de copia costosa</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="95"/> + <source>All</source> + <translation>Todo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="108"/> + <source>Find copies harder</source> + <translation>Buscar copias intensivamente</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="105"/> + <source>Select to perform expensive copy detection</source> + <translation>Seleccionar para llevar a cabo detección de copia costosa (--find-copies-harder)</translation> + </message> +</context> +<context> + <name>GitPatchFilesDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py" line="83"/> + <source>Patch Files</source> + <translation>Archivos de Parche</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="37"/> + <source>Press to add patch files to the list</source> + <translation>Pulsar para añadir archivos de parche a la lista</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="44"/> + <source>Press to delete the selected patch files from the list</source> + <translation>Pulsar para borrar de la lista los archivos de parche seleccionados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="58"/> + <source>Press to move the selected file up</source> + <translation>Pulsar para mover el archivo seleccionado hacia arriba</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="65"/> + <source>Press to move the selected file down</source> + <translation>Pulsar para mover el archivo seleccionado hacia abajo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="91"/> + <source>Strip Count:</source> + <translation>Número a desechar:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="98"/> + <source>Enter number of leading directories to strip off (default 1)</source> + <translation>Introducir el número de directorios al principio a desechar (por defecto 1)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="129"/> + <source>Select, if the patch has inaccurate end-of-file markers</source> + <translation>Seleccionar si el parche tiene marcadores imprecisos de fin-de-archivo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="132"/> + <source>Patch has inaccurate end-of-file</source> + <translation>El parche tiene fin-de-archivo impreciso</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="139"/> + <source>Select, if the line counts of the patch header may be wrong</source> + <translation>Seleccionar si el conteo de líneas de la cabecera del parche puede estar equivocado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="142"/> + <source>Don't trust line counts</source> + <translation>No confiar en el conteo de líneas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py" line="83"/> + <source>Patch Files (*.diff *.patch);;All Files (*)</source> + <translation>Archivos de Parche (*.diff *.patch);;Todos los Archivos (*)</translation> + </message> +</context> +<context> + <name>GitPatchStatisticsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="14"/> + <source>Patch Statistics</source> + <translation>Estadísticas del Parche</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="23"/> + <source>Insertions and Deletions:</source> + <translation>Inserciones y Borrados:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="52"/> + <source># Insertions</source> + <translation># Inserciones</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="57"/> + <source># Deletions</source> + <translation># Borrados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="62"/> + <source>File</source> + <translation>Archivo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="70"/> + <source>Summary Information:</source> + <translation>Resumen de Información:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="122"/> + <source>Process Generation Error</source> + <translation>Error de Generación de Proceso</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="122"/> + <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> +</context> +<context> + <name>GitProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="488"/> + <source>Version Control</source> + <translation>Control de Versiones</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="499"/> + <source>Commit changes to repository...</source> + <translation>Hacer commit de los cambios al repositorio...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="505"/> + <source>Add/Stage to repository</source> + <translation>Añadir al repositorio/Llevar al área de preparación (stage) del repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="508"/> + <source>Unstage changes</source> + <translation>Sacar cambios del área de preparación (unstage)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="514"/> + <source>Remove from repository (and disk)</source> + <translation>Eliminar del repositorio (y del disco)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="588"/> + <source>Remove from repository only</source> + <translation>Eliminar solamente del repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="430"/> + <source>Copy</source> + <translation>Copiar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="432"/> + <source>Move</source> + <translation>Mover</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="435"/> + <source>Show log browser</source> + <translation>Mostrar navegador de log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="520"/> + <source>Show status</source> + <translation>Mostrar estado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="525"/> + <source>Show differences</source> + <translation>Mostrar diferencias</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="229"/> + <source>Show differences side-by-side</source> + <translation>Mostrar diferencias lado a lado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="529"/> + <source>Show differences (extended)</source> + <translation>Mostrar diferencias (extendido)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="238"/> + <source>Show differences side-by-side (extended)</source> + <translation>Mostrar diferencias lado a lado (extendido)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="244"/> + <source>Show annotated file</source> + <translation>Mostrar archivo anotado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="535"/> + <source>Revert changes</source> + <translation>Revertir cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="542"/> + <source>Select all local file entries</source> + <translation>Seleccionar todas las entradas de archivos locales</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="544"/> + <source>Select all versioned file entries</source> + <translation>Seleccionar todas las entradas de archivo versionadas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="546"/> + <source>Select all local directory entries</source> + <translation>Seleccionar todas las entradas de directorios locales</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="548"/> + <source>Select all versioned directory entries</source> + <translation>Seleccionar todas las entradas de directorios versionados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="551"/> + <source>Configure...</source> + <translation>Configurar...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="588"/> + <source>Do you really want to remove these files from the repository?</source> + <translation>¿Realmente quiere eliminar estos archivos del repositorio?</translation> + </message> +</context> +<context> + <name>GitProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="73"/> + <source>New from repository</source> + <translation>Nuevo desde repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="73"/> + <source>&New from repository...</source> + <translation>&Nuevo desde repositorio...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="78"/> + <source>Create (clone) a new project from a Git repository</source> + <translation>Crear (clonar) un nuevo proyecto desde un repositorio Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="81"/> + <source><b>New from repository</b><p>This creates (clones) a new local project from a Git repository.</p></source> + <translation><b>Nuevo desde repositorio</b><p>Crea (clona) un nuevo proyecto local desde un repositorio Git.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="89"/> + <source>Fetch changes</source> + <translation>Fetch (recuperación) de cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="94"/> + <source>Fetch changes from a remote repository</source> + <translation>Fetch (recuperación) de cambios desde un repositorio remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="97"/> + <source><b>Fetch changes</b><p>This fetches changes from a remote repository into the local repository.</p></source> + <translation><b>Recuperar cambios</b><p>Recupera los cambios desde un repositorio remoto hacia el repositorio local.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="105"/> + <source>Pull changes</source> + <translation>Hacer pull de cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="110"/> + <source>Pull changes from a remote repository and update the work area</source> + <translation>Hacer pull de cambios desde un repositorio remoto y actualizar el área de trabajo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="113"/> + <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository and updates the work area.</p></source> + <translation><b>Hacer pull de cambios</b><p>Hace un pull de cambios desde un repositorio remoto hacia el repositorio local, y actualiza el área de trabajo.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="137"/> + <source>Push changes</source> + <translation>Hacer push de cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="142"/> + <source>Push changes to a remote repository</source> + <translation>Hacer push de cambios hacia un repositorio remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="145"/> + <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> + <translation><b>Hacer push de cambios</b><p>Hace un push de cambios desde el repositorio local a un repositorio remoto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="153"/> + <source>Export from repository</source> + <translation>Exportar desde repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="153"/> + <source>&Export from repository...</source> + <translation>&Exportar desde repositorio...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="158"/> + <source>Export a project from the repository</source> + <translation>Exportar un proyecto desde el repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="161"/> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation><b>Exportar desde repositorio</b><p>Exporta un proyecto desde el repositorio.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="168"/> + <source>Show log browser</source> + <translation>Mostrar navegador de log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="173"/> + <source>Show a dialog to browse the log of the local project</source> + <translation>Mostrar un diálogo para navegar el log del proyecto local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="176"/> + <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation><b>Mostrar navegador de log</b><p>Muestra un diálogo para navegar el log del proyecto local. Al principio se muestra un número limitado de entradas. Se pueden recuperar más entradas después.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="185"/> + <source>Show reflog browser</source> + <translation>Mostrar navegador de reflog</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="190"/> + <source>Show a dialog to browse the reflog of the local project</source> + <translation>Mostrar un diálogo para navegar el reflog del proyecto local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="193"/> + <source><b>Show reflog browser</b><p>This shows a dialog to browse the reflog of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation><b>Mostrar navegador de reflog</b><p>Muestra un diálogo para navegar el reflog del proyecto local. Al principio se muestra un número limitado de entradas. Se pueden recuperar más entradas después.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="202"/> + <source>Show differences</source> + <translation>Mostrar diferencias</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="202"/> + <source>Show &differences...</source> + <translation>Mostrar &diferencias...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="207"/> + <source>Show the differences of the local project to the repository</source> + <translation>Mostrar las diferencias del proyecto local al repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="210"/> + <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> + <translation><b>Mostrar diferencias</b><p>Muestra diferencias entre el proyecto local y el repositorio.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="218"/> + <source>Show differences (extended)</source> + <translation>Mostrar diferencias (extendido)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="218"/> + <source>Show differences (extended) ...</source> + <translation>Mostrar diferencias (extendido) ...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="223"/> + <source>Show the difference of revisions of the project to the repository</source> + <translation>Muestra la diferencia de revisiones entre el proyecto local y el repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="226"/> + <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> + <translation><b>Mostrar diferencias (extendido)</b><p>Muestra diferencias entre revisiones seleccionables del proyecto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="234"/> + <source>Show status</source> + <translation>Mostrar estado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="234"/> + <source>Show &status...</source> + <translation>Mostrar e&stado...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="239"/> + <source>Show the status of the local project</source> + <translation>Mostrar el estado del proyecto local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="242"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation><b>Mostrar estado</b><p>Muestra el estado del proyecto local.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="249"/> + <source>Switch</source> + <translation>Hacer switch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="249"/> + <source>S&witch...</source> + <translation>Hacer s&witch...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="254"/> + <source>Switch the working directory to another revision</source> + <translation>Hacer switch del directorio de trabajo a otra revisión</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="257"/> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation><b>Hacer switch</b><p>Hace un switch del directorio de trabajo a otra revisión.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="265"/> + <source>Tag in repository</source> + <translation>Tag en repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="265"/> + <source>&Tag in repository...</source> + <translation>&Tag en repositorio...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="270"/> + <source>Perform tag operations for the local project</source> + <translation>Llevar a cabo operaciones de tag para el proyecto local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="273"/> + <source><b>Tag in repository</b><p>This performs selectable tag operations for the local project.</p></source> + <translation><b>Tag en repositorio</b><p>Lleva a cabo operaciones de tag seleccionable para el proyecto local.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="281"/> + <source>List tags</source> + <translation>Listar tags</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="281"/> + <source>&List tags...</source> + <translation>&Listar tags...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="285"/> + <source>List tags of the project</source> + <translation>Lista los tags del proyecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="288"/> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation><b>Listar tags</b><p>Lista los tags del proyecto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="295"/> + <source>Show most recent tag</source> + <translation>Mostrar tag más reciente</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="299"/> + <source>Show the most recent tag reachable from the work tree</source> + <translation>Mostrar el tag más reciente alcanzable desde el árbol de trabajo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="302"/> + <source><b>Show most recent tag</b><p>This shows the most recent tag reachable from the work tree.</p></source> + <translation><b>Mostrar el tag más reciente</b><p>Muestra el tag más reciente alcanzable desde el árbol de trabajo.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="310"/> + <source>List branches</source> + <translation>Listar branches</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="310"/> + <source>&List branches...</source> + <translation>&Listar branches...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="314"/> + <source>List branches of the project</source> + <translation>Listar las branches del proyecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="317"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Listar branches</b><p>Lista las branches del proyecto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="324"/> + <source>List merged branches</source> + <translation>Listar merged branches</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="324"/> + <source>List &merged branches...</source> + <translation>Listar &merged branches...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="328"/> + <source>List merged branches of the project</source> + <translation>Listar las merged branches del proyecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="331"/> + <source><b>List merged branches</b><p>This lists the merged branches of the project.</p></source> + <translation><b>Listar merged branches</b><p>Lista las merged branches del proyecto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="339"/> + <source>List non-merged branches</source> + <translation>Listar non-merged branches</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="339"/> + <source>List &non-merged branches...</source> + <translation>Listar &non-merged branches...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="343"/> + <source>List non-merged branches of the project</source> + <translation>Listar las non-merged branches del proyecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="346"/> + <source><b>List non-merged branches</b><p>This lists the non-merged branches of the project.</p></source> + <translation><b>Listar non-merged branches</b><p>Lista las non-merged branches del proyecto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="354"/> + <source>Branch in repository</source> + <translation>Branch en repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="354"/> + <source>&Branch in repository...</source> + <translation>&Branch en repositorio...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="359"/> + <source>Perform branch operations for the local project</source> + <translation>Llevar a cabo operaciones branch para el proyecto local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="362"/> + <source><b>Branch in repository</b><p>This performs selectable branch operations for the local project.</p></source> + <translation><b>Branch en repositorio</b><p>Lleva a cabo operaciones seleccionables de branch para el proyecto local.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="370"/> + <source>Delete Remote Branch</source> + <translation>Borrar Branch Remota</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="370"/> + <source>&Delete Remote Branch...</source> + <translation>&Borrar Branch Remota...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="374"/> + <source>Delete a branch from a remote repository</source> + <translation>Borrar una branch de un repositorio remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="377"/> + <source><b>Delete Remote Branch</b><p>This deletes a branch from a remote repository.</p></source> + <translation><b>Borrar Branch Remota</b><p>Borra una branch de un repositorio remoto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="384"/> + <source>Show current branch</source> + <translation>Mostrar la branch actual</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="388"/> + <source>Show the current branch of the project</source> + <translation>Mostrar la branch actual del proyecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="391"/> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation><b>Mostrar branch actual</b><p>Muestra la branch actual del proyecto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="398"/> + <source>Revert changes</source> + <translation>Revertir cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="398"/> + <source>Re&vert changes</source> + <translation>Re&vertir cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="403"/> + <source>Revert all changes made to the local project</source> + <translation>Revertir todos los cambios hechos al proyecto local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="406"/> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> + <translation><b>Revertir cambios</b><p>Revierte todos los cambios hechos al proyecto local.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="413"/> + <source>Unstage changes</source> + <translation>Sacar cambios del área de preparación (unstage)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="413"/> + <source>&Unstage changes</source> + <translation>Sacar cambios del área de preparación (&unstage)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="418"/> + <source>Unstage all changes made to the local project</source> + <translation>Sacar todos los cambios del área de preparación (unstage) en el proyecto local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="421"/> + <source><b>Unstage changes</b><p>This unstages all changes made to the local project.</p></source> + <translation><b>Sacar cambios del área de preparación (unstage)</b><p>Saca todos los cambios del área de preparación (unstage) en el proyecto local.</p> </translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="428"/> + <source>Merge</source> + <translation>Hacer merge</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="428"/> + <source>Mer&ge changes...</source> + <translation>Hacer mer&ge de los cambios...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="433"/> + <source>Merge changes into the local project</source> + <translation>Hacer merge de los dentro del proyecto local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="436"/> + <source><b>Merge</b><p>This merges changes into the local project.</p></source> + <translation><b>Merge</b><p>Hace merge de los cambios dentro del proyecto local.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="443"/> + <source>Cancel uncommitted/failed merge</source> + <translation>Cancelar merge sin commit/fallido</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="447"/> + <source>Cancel an uncommitted or failed merge and lose all changes</source> + <translation>Cancelar un merge sin commit o fallido y perder todos los cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="450"/> + <source><b>Cancel uncommitted/failed merge</b><p>This cancels an uncommitted or failed merge causing all changes to be lost.</p></source> + <translation><b>Cancelar merge sin/fallido</b><p>Cancela un merge sin commit o fallido causando que todos los cambios se pierdan.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="458"/> + <source>Commit failed merge</source> + <translation>Hacer commmit de merge fallido</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="462"/> + <source>Commit a failed merge after conflicts have been resolved</source> + <translation>Hacer commit de un merge fallido una vez resueltos todos los conflictos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="465"/> + <source><b>Commit failed merge</b><p>This commits a failed merge after conflicts have been resolved.</p></source> + <translation><b>Commit de merge fallido</b><p>Hace commit de un merge fallido despues de haber resuelto todos los conflictos.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="473"/> + <source>Cleanup</source> + <translation>Limpieza</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="473"/> + <source>Cleanu&p</source> + <translation>Lim&pieza (cleanup)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="477"/> + <source>Cleanup the local project</source> + <translation>Limpieza de proyecto local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="480"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Limpieza</b><p>Lleva a cabo tareas de limpieza en el proyecto local.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="487"/> + <source>Execute command</source> + <translation>Ejecutar comando</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="487"/> + <source>E&xecute command...</source> + <translation>E&jecutar comando...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="491"/> + <source>Execute an arbitrary Git command</source> + <translation>Ejecuta un comando Git arbitrario</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="494"/> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Git command.</p></source> + <translation><b>Ejecutar comando</b><p>Abre un diálogo para introducir un comando Git arbitrario.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="502"/> + <source>Configure</source> + <translation>Configurar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="502"/> + <source>Configure...</source> + <translation>Configurar...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="506"/> + <source>Show the configuration dialog with the Git page selected</source> + <translation>Mostrar el diálogo de configuración con la página de Git seleccionada</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="509"/> + <source><b>Configure</b><p>Show the configuration dialog with the Git page selected.</p></source> + <translation><b>Configurar</b><p>Mostrar el diálogo de configuración con la página de Git seleccionada.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="517"/> + <source>Show Remotes</source> + <translation>Mostrar Remotos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="517"/> + <source>Show Remotes...</source> + <translation>Mostrar Remotos...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="521"/> + <source>Show the available remote repositories</source> + <translation>Mostrar los repositorios remotos disponibles</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="539"/> + <source><b>Show Remotes</b><p>This shows the remote repositories available for pulling, fetching and pushing.</p></source> + <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"/> + <source>Show Remote Info</source> + <translation>Mostrar Info Remota</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="532"/> + <source>Show Remote Info...</source> + <translation>Mostrar Info Remota...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="536"/> + <source>Show information about a remote repository</source> + <translation>Mostrar información sobre un repositorio remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1161"/> + <source>Add</source> + <translation>Añadir</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="547"/> + <source>Add...</source> + <translation>Añadir...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="551"/> + <source>Add a remote repository</source> + <translation>Añadir un repositorio remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="554"/> + <source><b>Add</b><p>This adds a remote repository.</p></source> + <translation><b>Añadir</b><p>Añade un repositorio remoto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1785"/> + <source>Remove</source> + <translation>Eliminar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="561"/> + <source>Remove...</source> + <translation>Eliminar...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="565"/> + <source>Remove a remote repository</source> + <translation>Eliminar un repositorio remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="568"/> + <source><b>Remove</b><p>This removes a remote repository.</p></source> + <translation><b>Eliminar</b><p>Elimina un repositorio remoto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1799"/> + <source>Prune</source> + <translation>Prune</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="575"/> + <source>Prune...</source> + <translation>Prune...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="579"/> + <source>Prune stale remote-tracking branches of a remote repository</source> + <translation>Eliminar (prune) las tracking branches remotas que han quedado fuera de alcance en un repositorio remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="582"/> + <source><b>Prune</b><p>This prunes stale remote-tracking branches of a remote repository.</p></source> + <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"/> + <source>Rename</source> + <translation>Renombrar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="590"/> + <source>Rename...</source> + <translation>Renombrar...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="594"/> + <source>Rename a remote repository</source> + <translation>Renombrar un repositorio remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="597"/> + <source><b>Rename</b><p>This renames a remote repository.</p></source> + <translation><b>Renombrar</b><p>Renombra un repositorio remoto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1833"/> + <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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="649"/> + <source>Cancel Copying Session</source> + <translation>Cancelar 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> + </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> + </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> + </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> + </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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> + <source>Show stash</source> + <translation>Mostrar stash</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> + <source>Show stash...</source> + <translation>Mostrar 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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="702"/> + <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"/> + <source>Restore && Keep</source> + <translation>Restaurar && Conservar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="714"/> + <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"/> + <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"/> + <source>Restore && Delete</source> + <translation>Restaurar && Borrar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="728"/> + <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"/> + <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"/> + <source>Create Branch</source> + <translation>Crear Branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="742"/> + <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"/> + <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"/> + <source>Delete</source> + <translation>Borrar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="757"/> + <source>Delete a stash</source> + <translation>Borrar un stash (guardado rápido)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="760"/> + <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"/> + <source>Delete All</source> + <translation>Borrar todos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="771"/> + <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"/> + <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"/> + <source>Edit user configuration</source> + <translation>Editar configuración de usuario</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <source>Edit user configuration...</source> + <translation>Editar configuración de usuario...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="785"/> + <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"/> + <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"/> + <source>Edit repository configuration</source> + <translation>Editar configuración del repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <source>Edit repository configuration...</source> + <translation>Editar configuración del repositorio...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="799"/> + <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> + </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> + </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> + </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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="862"/> + <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"/> + <source>Repository Statistics</source> + <translation>Estadísticas del Repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <source>Repository Statistics...</source> + <translation>Estadísticas del Repositorio...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="873"/> + <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"/> + <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"/> + <source>Create Archive</source> + <translation>Crear Archivo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="887"/> + <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"/> + <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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> + <source>List bundle heads...</source> + <translation>Listar bundle heads...</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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="934"/> + <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"/> + <source>Apply Bundle (fetch)</source> + <translation>Aplicar Bundle (fetch)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <source>Apply Bundle (fetch)...</source> + <translation>Aplicar Bundle (fetch)...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="945"/> + <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"/> + <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"/> + <source>Apply Bundle (pull)</source> + <translation>Aplicar Bundle (pull)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="955"/> + <source>Apply Bundle (pull)...</source> + <translation>Aplicar Bundle (pull)...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="959"/> + <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"/> + <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> + </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> + </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> + </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> + </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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1020"/> + <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"/> + <source>Skip</source> + <translation>Saltar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <source>Skip...</source> + <translation>Ignorar...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1031"/> + <source>Skip a selectable revision</source> + <translation>Saltarse una revisión seleccionable</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1034"/> + <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"/> + <source>Reset</source> + <translation>Resetear</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <source>Reset...</source> + <translation>Resetear...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1045"/> + <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"/> + <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"/> + <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"/> + <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"/> + <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"/> + <source>Create replay file</source> + <translation>Crear archivo de replay</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1076"/> + <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"/> + <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"/> + <source>Edit replay file</source> + <translation>Editar archivo de replay</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1092"/> + <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"/> + <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"/> + <source>Replay session</source> + <translation>Replay de sesión</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1107"/> + <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"/> + <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"/> + <source>Administration</source> + <translation>Administración</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1360"/> + <source>Bundle Management</source> + <translation>Gestión de Bundles</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1690"/> + <source>Pull</source> + <translation>Hacer Pull</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2237"/> + <source>Bisect</source> + <translation>Bisect</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1397"/> + <source>Tags</source> + <translation></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1405"/> + <source>Branches</source> + <translation>Branches</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1418"/> + <source>Manage Changes</source> + <translation>Gestionar Cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1426"/> + <source>Remote Repositories</source> + <translation>Repositorios Remotos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1436"/> + <source>Cherry-pick</source> + <translation>Cherry-pick</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1444"/> + <source>Stash</source> + <translation>Stash (guardado rápido)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1646"/> + <source>Branch</source> + <translation>Branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <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"/> + <source>Revert Changes</source> + <translation>Revertir cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1734"/> + <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"/> + <source>Select a remote repository:</source> + <translation>Seleccionar repositorio-remoto:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1853"/> + <source>Copy Commits (Continue)</source> + <translation>Copiar Commits (Continuar)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1872"/> + <source>Copy Commits (Quit)</source> + <translation>Copiar Commits (Salir)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1892"/> + <source>Copy Commits (Cancel)</source> + <translation>Copiar Commits (Cancelar)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1911"/> + <source>Save Stash</source> + <translation>Guardar Stash (guardado rápido)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1961"/> + <source>Restore Stash</source> + <translation>Restaurar Stash (guardado rápido)</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>Abandonar Sesión de Copia</b><p>Abandona la sesión de copia actual.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="121"/> + <source>Commit changes to repository</source> + <translation>Hacer commit de los cambios al repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="121"/> + <source>Commit changes to repository...</source> + <translation>Hacer commit de los cambios al repositorio...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="126"/> + <source>Commit changes of the local project to the Git repository</source> + <translation>Hacer commit de los cambios del proyecto local al repositorio Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="129"/> + <source><b>Commit changes to repository</b><p>This commits changes of the local project to the Git repository.</p></source> + <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"/> + <source>Git</source> + <translation>Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1117"/> + <source>Check patch files</source> + <translation>Comprobar archivos de parche</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1121"/> + <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"/> + <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"/> + <source>Apply patch files</source> + <translation>Aplicar archivos de parche</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1136"/> + <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"/> + <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> + </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> + </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> + </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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1198"/> + <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> + </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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1244"/> + <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"/> + <source>Fetch and Update</source> + <translation>Fetch y Actualizar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1257"/> + <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>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"/> + <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"/> + <source>Show Status</source> + <translation>Mostrar estado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1306"/> + <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"/> + <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"/> + <source>Show Summary</source> + <translation>Mostrar Resumen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1322"/> + <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"/> + <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"/> + <source>Submodules</source> + <translation>Submódulos</translation> + </message> +</context> +<context> + <name>GitPullDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="14"/> + <source>Git Pull</source> + <translation>Git Pull</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="23"/> + <source>Remote Repository:</source> + <translation>Repositorio Remoto:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="30"/> + <source>Select the remote repository to pull from</source> + <translation>Seleccionar el repositorio remoto desde el que hacer pull</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="46"/> + <source>Remote Branches:</source> + <translation>Branches Remotas:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="56"/> + <source>Press to update the list of remote branches</source> + <translation>Pulsar para actualizar (update) la lista de branches remotas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="59"/> + <source>Update</source> + <translation>Actualizar (update)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="81"/> + <source>Select the remote branches to be pulled</source> + <translation>Seleccionar las branches remotas sobre las que hacer pull</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="94"/> + <source>Select to remove non-existing tracking references </source> + <translation>Seleccionar para eliminar referencias de tracking inexistentes </translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="97"/> + <source>Prune obsolete tracking references</source> + <translation>Eliminar (prune) referencias obsoletas de tracking</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.py" line="36"/> + <source><All></source> + <translation><Todo></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.py" line="37"/> + <source><Custom></source> + <translation><Personalizado></translation> + </message> +</context> +<context> + <name>GitPushDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="14"/> + <source>Git Push</source> + <translation>Git Push</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="25"/> + <source>Remote Repository:</source> + <translation>Repositorio Remoto:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="32"/> + <source>Select the remote repository to push to</source> + <translation>Seleccionar el repositorio remoto hacia el que hacer push</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="48"/> + <source>Branches to be pushed</source> + <translation>Branches a las que hacer push</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="70"/> + <source>Push?</source> + <translation>¿Push?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="75"/> + <source>Local</source> + <translation>Local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="80"/> + <source>Remote</source> + <translation>Remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="85"/> + <source>Force?</source> + <translation>¿Forzar (force)?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="93"/> + <source>Press to select all branches</source> + <translation>Pulsar para seleccionar todas las branches</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="96"/> + <source>Select All</source> + <translation>Seleccionar Todo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="106"/> + <source><b>WARNING: The "Force" option can result in dangling branches in the remote repository.</b></source> + <translation><b>ADVERTENCIA: La opción "Force" puede resultar en ramas huérfanas en el repositorio remoto.</b></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="119"/> + <source>Select to push tags as well</source> + <translation>Seleccionar para hacer push de tags también</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="122"/> + <source>Include tags</source> + <translation>Incluir tags</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="129"/> + <source>Select this to associate a remote tracking branch</source> + <translation>Seleccionar para asociar una tracking branch remota</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="132"/> + <source>Set tracking information</source> + <translation>Establecer información de tracking</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="139"/> + <source>Push Submodules</source> + <translation>Push de Submódulos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="145"/> + <source>Select to push submodules automatically</source> + <translation>Seleccionar para hacer push de los submódulos automaticamente</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="148"/> + <source>on-demand</source> + <translation>a la demanda</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="161"/> + <source>check</source> + <translation>comprobar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="168"/> + <source>Select to push submodules only</source> + <translation>Seleccionar para hacer push de los submodulos solamente</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="171"/> + <source>only</source> + <translation>solo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="178"/> + <source>Select to not push any submodule</source> + <translation>Seleccionar para no hacer push de ningún submódulo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="181"/> + <source>no</source> + <translation>no</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="158"/> + <source>Select to check, if submodules were pushed already</source> + <translation>Seleccionar para comprobar si a los submódulos ya se les ha hecho push</translation> + </message> +</context> +<context> + <name>GitReflogBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="14"/> + <source>Git Reflog</source> + <translation>Git Reflog</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="42"/> + <source>Commit</source> + <translation>Commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="47"/> + <source>Selector</source> + <translation>Selector</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="52"/> + <source>Name</source> + <translation>Nombre</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="57"/> + <source>Operation</source> + <translation>Operación</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="62"/> + <source>Subject</source> + <translation>Asunto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="72"/> + <source>Press to get the next bunch of log entries</source> + <translation>Pulsar para recuperar el siguiente conjunto de entradas de log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="75"/> + <source>&Next</source> + <translation>Siguie&nte</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="82"/> + <source>Enter the limit of entries to fetch</source> + <translation>Introduzca el límite de entradas a recuperar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="122"/> + <source>Errors</source> + <translation>Errores</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="128"/> + <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/GitReflogBrowserDialog.ui" line="144"/> + <source>Input</source> + <translation>Input</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="166"/> + <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/GitReflogBrowserDialog.ui" line="169"/> + <source>&Send</source> + <translation>&Enviar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="172"/> + <source>Alt+S</source> + <translation>Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="179"/> + <source>Enter data to be sent to the git process</source> + <translation>Introducir los datos a enviar al proceso de git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="186"/> + <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/GitReflogBrowserDialog.ui" line="189"/> + <source>&Password Mode</source> + <translation>&Modo de contraseña</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="192"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="59"/> + <source>&Refresh</source> + <translation>Actualiza&r</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="61"/> + <source>Press to refresh the list of commits</source> + <translation>Pulsar para actualizar la lista de commits</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="200"/> + <source>Process Generation Error</source> + <translation>Error de Generación de Proceso</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="200"/> + <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> +</context> +<context> + <name>GitRemoteRepositoriesDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="14"/> + <source>Git Remote Repositories</source> + <translation>Repositorios Remotos Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="17"/> + <source><b>Git Remote Repositories</b> +<p>This dialog shows the available remote repositories.</p></source> + <translation><b>Repositorios Remotos Git</b> +<p>Este diálogo muestra los repositorios remotos disponibles.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="30"/> + <source>Remote Repositories</source> + <translation>Repositorios Remotos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="46"/> + <source>Name</source> + <translation>Nombre</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="51"/> + <source>URL</source> + <translation>URL</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="56"/> + <source>Operation</source> + <translation>Operación</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="82"/> + <source>Press to add a remote repository</source> + <translation>Pulsar para añadir un repositorio remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="85"/> + <source>&Add</source> + <translation>&Añadir</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="92"/> + <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="95"/> + <source>&Rename</source> + <translation>&Renombrar</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> + </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"/> + <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"/> + <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>Alt+S</source> + <translation>Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="217"/> + <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"/> + <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"/> + <source>&Password Mode</source> + <translation>&Modo de contraseña</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="230"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="51"/> + <source>Refresh</source> + <translation>Actualizar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="53"/> + <source>Press to refresh the repositories display</source> + <translation>Pulsar para actualizar la vista de repositorios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="148"/> + <source>Process Generation Error</source> + <translation>Error de Generación de Proceso</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="148"/> + <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> +</context> +<context> + <name>GitRevisionSelectionDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="14"/> + <source>Git Revision</source> + <translation>Revisión Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="23"/> + <source>Revision</source> + <translation>Revisión</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="29"/> + <source>Select to specify a revision by a revision expression</source> + <translation>Seleccionar para especificar una revisión por expresión de revisión</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="32"/> + <source>Commit:</source> + <translation>Commit:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="42"/> + <source>Enter a commit id</source> + <translation>Introducir un id de commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation>Seleccionar para especificar una revisión por tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="52"/> + <source>Tag:</source> + <translation>Tag:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="68"/> + <source>Enter a tag name</source> + <translation>Introduzca un nombre de tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="78"/> + <source>Select to specify a revision by a branch</source> + <translation>Seleccionar para especificar una revisión por branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="81"/> + <source>Branch:</source> + <translation>Branch:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="97"/> + <source>Enter a branch name</source> + <translation>Introducir un nombre de branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="136"/> + <source>Select HEAD revision</source> + <translation>Seleccionar revisión HEAD</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="139"/> + <source>HEAD</source> + <translation>HEAD</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="146"/> + <source>No revision selected</source> + <translation>No se ha seleccionado revisión</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="107"/> + <source>Select to specify a revision by a remote branch</source> + <translation>Seleccionar para especificar una revisión por branch remota</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="110"/> + <source>Remote Branch:</source> + <translation>Branch Remota:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="126"/> + <source>Enter a remote branch name</source> + <translation>Introducir un nombre de branch remota</translation> + </message> +</context> +<context> + <name>GitRevisionsSelectionDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="14"/> + <source>Git Diff</source> + <translation>Git Diff</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="23"/> + <source>Revision &1</source> + <translation>Revisión &1</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="137"/> + <source>Select to specify a revision by a revision expression</source> + <translation>Seleccionar para especificar una revisión por expresión de revisión</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="140"/> + <source>Commit:</source> + <translation>Commit:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="150"/> + <source>Enter a commit id</source> + <translation>Introducir un id de commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="157"/> + <source>Select to specify a revision by a tag</source> + <translation>Seleccionar para especificar una revisión por tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="160"/> + <source>Tag:</source> + <translation>Tag:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="170"/> + <source>Enter a tag name</source> + <translation>Introduzca un nombre de tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="180"/> + <source>Select to specify a revision by a branch</source> + <translation>Seleccionar para especificar una revisión por branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="183"/> + <source>Branch:</source> + <translation>Branch:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="193"/> + <source>Enter a branch name</source> + <translation>Introducir un nombre de branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="203"/> + <source>Select HEAD revision</source> + <translation>Seleccionar revisión HEAD</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="206"/> + <source>HEAD</source> + <translation>HEAD</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="216"/> + <source>Select revision before HEAD</source> + <translation>Seleccionar revisión antes de HEAD</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="219"/> + <source>HEAD^</source> + <translation>HEAD^</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="226"/> + <source>No revision selected</source> + <translation>No se ha seleccionado revisión</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="131"/> + <source>Revision &2</source> + <translation>Revisión &2</translation> + </message> +</context> +<context> + <name>GitStashBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="14"/> + <source>Git Stash Browser</source> + <translation>Navegador de stash (guardado rápido) de Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="42"/> + <source>Name</source> + <translation>Nombre</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="47"/> + <source>Date</source> + <translation>Fecha</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="52"/> + <source>Message</source> + <translation>Mensaje</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="66"/> + <source>Statistics</source> + <translation>Estadísticas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="91"/> + <source>File</source> + <translation>Archivo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="96"/> + <source>Changes</source> + <translation>Cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="101"/> + <source>Lines added</source> + <translation>Líneas añadidas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="106"/> + <source>Lines deleted</source> + <translation>Líneas borradas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="153"/> + <source>Errors</source> + <translation>Errores</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="159"/> + <source><b>Git stash errors</b><p>This shows possible error messages of the git stash command.</p></source> + <translation><b>Errores de Git stash</b><p>Muestra posibles mensajes de error del comando git stash.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="175"/> + <source>Input</source> + <translation>Input</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="197"/> + <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/GitStashBrowserDialog.ui" line="200"/> + <source>&Send</source> + <translation>&Enviar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="203"/> + <source>Alt+S</source> + <translation>Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="210"/> + <source>Enter data to be sent to the git process</source> + <translation>Introducir los datos a enviar al proceso de git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="217"/> + <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/GitStashBrowserDialog.ui" line="220"/> + <source>&Password Mode</source> + <translation>&Modo de contraseña</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="223"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="65"/> + <source>&Refresh</source> + <translation>Actualiza&r</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="82"/> + <source>Show</source> + <translation>Mostrar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="85"/> + <source>Restore && Keep</source> + <translation>Restaurar && Conservar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="87"/> + <source>Restore && Delete</source> + <translation>Restaurar && Borrar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="90"/> + <source>Create Branch</source> + <translation>Crear Branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="93"/> + <source>Delete</source> + <translation>Borrar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="95"/> + <source>Delete All</source> + <translation>Borrar todas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="182"/> + <source>Process Generation Error</source> + <translation>Error de Generación de Proceso</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="182"/> + <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 numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="369"/> + <source>%n file(s) changed</source> + <translation> + <numerusform>%n archivo cambiado</numerusform> + <numerusform>%n archivos cambiados</numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="371"/> + <source>%n line(s) inserted</source> + <translation> + <numerusform>%n línea insertada</numerusform> + <numerusform>%n líneas insertadas</numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="373"/> + <source>%n line(s) deleted</source> + <translation> + <numerusform>%n línea borrada</numerusform> + <numerusform>%n líneas borradas</numerusform> + </translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="67"/> + <source>Press to refresh the list of stashes</source> + <translation>Pulsar para actualizar la lista de stashes</translation> + </message> +</context> +<context> + <name>GitStashDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="14"/> + <source>Git Stash</source> + <translation>Git Stash (guardado rápido)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="23"/> + <source>Message:</source> + <translation>Mensaje:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="33"/> + <source>Enter a message for the stash</source> + <translation>Introducir un mensaje para el stash (guardado rápido)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="40"/> + <source>Keep changes in staging area</source> + <translation>Guardar cambios en el área de preparación (stage)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="47"/> + <source>Untracked/Ignored Files</source> + <translation>Archivos sin seguimiento/ignorados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="53"/> + <source>Select to not stash untracked or ignored files</source> + <translation>Seleccionar para no hacer guardado rápido (stash) de los archivos sin seguimiento o ignorados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="56"/> + <source>Don't stash untracked or ignored files</source> + <translation>No hacer guardado rápido (stash) de los archivos sin seguimiento o ignorados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="66"/> + <source>Select to stash untracked files</source> + <translation>Seleccionar para hacer guardado rápido (stash) de archivos sin seguimiento</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="69"/> + <source>Stash untracked files</source> + <translation>Hacer guardado rápido (stash) de archivos sin seguimiento</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="76"/> + <source>Select to stash untracked and ignored files</source> + <translation>Seleccionar para hacer guardado rápido (stash) de los archivos sin seguimiento e ignorados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="79"/> + <source>Stash untracked and ignored files</source> + <translation>Hacer guardado rápido (stash) de los archivos sin seguimiento e ignorados</translation> + </message> +</context> +<context> + <name>GitStatusDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="395"/> + <source>Git Status</source> + <translation>Git Status</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="17"/> + <source><b>Git Status</b> +<p>This dialog shows the status of the selected file or project.</p></source> + <translation><b>Git Status</b> +<p>Este diálogo muestra el status del proyecto o archivo seleccionado.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="49"/> + <source>&Filter on Status:</source> + <translation>&Filtro sobre Status:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="59"/> + <source>Select the status of entries to be shown</source> + <translation>Seleccionar el status de las entradas a mostrar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="662"/> + <source>Commit</source> + <translation>Commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="105"/> + <source>Status (Work)</source> + <translation>Status (Trabajo)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="110"/> + <source>Status (Staging)</source> + <translation>Status (Staging - área de preparación)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="115"/> + <source>Path</source> + <translation>Ruta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="197"/> + <source>Commit the selected changes</source> + <translation>Hacer commit de los cambios seleccionados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="200"/> + <source>Amend the latest commit with the selected changes</source> + <translation>Enmendar (amend) el último commit con los cambios seleccionados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="252"/> + <source>Errors</source> + <translation>Errores</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="271"/> + <source>Input</source> + <translation>Input</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="293"/> + <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/GitStatusDialog.ui" line="296"/> + <source>&Send</source> + <translation>&Enviar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="299"/> + <source>Alt+S</source> + <translation>Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="306"/> + <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/GitStatusDialog.ui" line="313"/> + <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/GitStatusDialog.ui" line="316"/> + <source>&Password Mode</source> + <translation>&Modo de contraseña</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="319"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="65"/> + <source>Refresh</source> + <translation>Actualizar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="67"/> + <source>Press to refresh the status display</source> + <translation>Pulsar para actualizar el status visualizado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="202"/> + <source>Select all for commit</source> + <translation>Seleccionar todo para hacer commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="211"/> + <source>Stage changes</source> + <translation>Llevar cambios al área de preparación (stage)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="215"/> + <source>Unstage changes</source> + <translation>Sacar cambios del área de preparación (unstage)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="242"/> + <source>Forget missing</source> + <translation>Olvidar elementos perdidos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="246"/> + <source>Restore missing</source> + <translation>Restore sobre elementos perdidos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="253"/> + <source>Edit file</source> + <translation>Editar archivo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="260"/> + <source>Adjust column sizes</source> + <translation>Adjustar tamaño de columnas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="169"/> + <source>added</source> + <translation>añadido</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="170"/> + <source>copied</source> + <translation>copiado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="171"/> + <source>deleted</source> + <translation>borrado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="172"/> + <source>modified</source> + <translation>modificado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="173"/> + <source>renamed</source> + <translation>renombrado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="175"/> + <source>not tracked</source> + <translation>sin seguimiento</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="174"/> + <source>unmerged</source> + <translation>sin merge</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="168"/> + <source>unmodified</source> + <translation>sin modificar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="176"/> + <source>ignored</source> + <translation>ignorado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="423"/> + <source>Process Generation Error</source> + <translation>Error de Generación de Proceso</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="423"/> + <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/GitStatusDialog.py" line="596"/> + <source>all</source> + <translation>todo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="662"/> + <source>There are no entries selected to be committed.</source> + <translation>No hay entradas seleccionadas sobre las que aplicar commit.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="703"/> + <source>Add</source> + <translation>Añadir</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="703"/> + <source>There are no unversioned entries available/selected.</source> + <translation>No hay entradas sin versionar disponibles/seleccionadas.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="725"/> + <source>Stage</source> + <translation>Área de Preparación (Stage)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="725"/> + <source>There are no stageable entries available/selected.</source> + <translation>No hay entradas que se puedan llevar al área de preparación (stage) disponibles/seleccionadas.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="747"/> + <source>Unstage</source> + <translation>Unstage (sacar del área de preparación)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="747"/> + <source>There are no unstageable entries available/selected.</source> + <translation>No hay entradas que se puedan sacar del área de preparación (unstage) disponibles/seleccionadas.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="769"/> + <source>Forget Missing</source> + <translation>Olvidar elementos perdidos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="810"/> + <source>There are no missing entries available/selected.</source> + <translation>No hay entradas perdidas disponibles/seleccionadas.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="786"/> + <source>Revert</source> + <translation>Revertir</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="786"/> + <source>There are no uncommitted, unstaged changes available/selected.</source> + <translation>No hay cambios sin commit, fuera del área de preparación, disponibles/seleccionados.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="810"/> + <source>Restore Missing</source> + <translation>Restore sobre elementos perdidos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="839"/> + <source>Differences</source> + <translation>Diferencias</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="839"/> + <source>There are no uncommitted changes available/selected.</source> + <translation>No hay cambios pendientes de commit disponibles/seleccionados.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="891"/> + <source>Working Tree to Staging Area</source> + <translation>Árbol de Trabajo a Área de Preparación (Staging Area)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="870"/> + <source>Staging Area to HEAD Commit</source> + <translation>Área de Preparación (Staging Area) a HEAD Commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="892"/> + <source>Working Tree to HEAD Commit</source> + <translation>Árbol de Trabajo a HEAD Commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="894"/> + <source>Side-by-Side Difference</source> + <translation>Diferencias Lado a Lado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="894"/> + <source>Select the compare method.</source> + <translation>Seleccioanr el método compare.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="155"/> + <source>Difference Working to Staging</source> + <translation>Diferencia Directorio de trabajo con Staging (área de preparación)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="209"/> + <source>Difference Staging to HEAD</source> + <translation>Diferencia Staging (área de trabajo) con HEAD</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="105"/> + <source>Stage Selected Lines</source> + <translation>Llevar las Líneas Seleccionadas a Stage (área de preparación)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="109"/> + <source>Revert Selected Lines</source> + <translation>Revertir Líneas Seleccionadas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="113"/> + <source>Stage Hunk</source> + <translation>Llevar Fragmento (Hunk) a Stage (área de preparación)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="117"/> + <source>Revert Hunk</source> + <translation>Revertir Fragmento (Hunk)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="123"/> + <source>Unstage Selected Lines</source> + <translation>Sacar las Líneas Seleccionadas de Stage (área de preparación)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="127"/> + <source>Unstage Hunk</source> + <translation>Sacar Fragmento (Hunk) de Stage (área de preparación)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1201"/> + <source>Revert selected lines</source> + <translation>Revertir Líneas Seleccionadas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1203"/> + <source>Revert hunk</source> + <translation>Revertir Fragmento (Hunk)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1204"/> + <source>Are you sure you want to revert the selected changes?</source> + <translation>¿Realmente desea revertir los cambios seleccionados?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="26"/> + <source>Select action from menu</source> + <translation>Seleccionar acción del menú</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="198"/> + <source>Amend</source> + <translation>Enmendar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="204"/> + <source>Unselect all from commit</source> + <translation>Eliminar selección de todo del commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="210"/> + <source>Add the selected files</source> + <translation>Añadir archivos seleccionados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="213"/> + <source>Stages all changes of the selected files</source> + <translation>Todos los cambios al area de preparación (stage) para los archivos seleccionados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="217"/> + <source>Unstages all changes of the selected files</source> + <translation>Todos los cambios fuera del area de preparación (stage) para los archivos seleccionados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="224"/> + <source>Shows the differences of the selected entry in a separate dialog</source> + <translation>Muestra las diferencias de la entrada seleccionada en un diálogo separado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="227"/> + <source>Differences Side-By-Side</source> + <translation>Diferencias Lado a Lado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="229"/> + <source>Shows the differences of the selected entry side-by-side in a separate dialog</source> + <translation>Muestra las diferencias de la entrada seleccionada lado a lado en un diálogo separado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="237"/> + <source>Reverts the changes of the selected files</source> + <translation>Revertir cambios de archivos seleccionados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="244"/> + <source>Forgets about the selected missing files</source> + <translation>Olvidar los archivos perdidos seleccionados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="248"/> + <source>Restores the selected missing files</source> + <translation>Restaurar los archivos perdidos seleccionados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="255"/> + <source>Edit the selected conflicting file</source> + <translation>Editar el archivo con conflictos seleccionado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="262"/> + <source>Adjusts the width of all columns to their contents</source> + <translation>Ajustar el ancho de todas las columnas a su contenido</translation> + </message> +</context> +<context> + <name>GitStatusMonitorThread</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py" line="93"/> + <source>Could not start the Git process.</source> + <translation>No se pudo ejecutar el proceso Git.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py" line="133"/> + <source>Git status checked successfully</source> + <translation>El estado de Git se ha comprobado con éxito</translation> + </message> +</context> +<context> + <name>GitSubmoduleAddDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="14"/> + <source>Add Submodule</source> + <translation>Añadir Submódulo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="23"/> + <source>&URL:</source> + <translation>&URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="39"/> + <source>Enter the URL of the repository</source> + <translation>Introducir la URL del repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="55"/> + <source>Select the repository URL via a directory selection dialog</source> + <translation>Seleccionar la url del repositorio a través de un diálogo de selección de directorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="62"/> + <source>Press to clear the history of entered repository URLs</source> + <translation>Pulsar para limpiar historial de URLs de repositorio introducidas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="69"/> + <source>Submodule &Directory:</source> + <translation>&Directorio del Submodulo:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="79"/> + <source>Enter the directory for the submodule (leave empty to use default).</source> + <translation>Introducir el directorio para el submódulo (dejar en blanco para utilizar por defecto).</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="89"/> + <source>&Branch:</source> + <translation>&Branch:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="99"/> + <source>Enter a branch name</source> + <translation>Introducir un nombre de branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="106"/> + <source>&Logical Name:</source> + <translation>Nombre &Lógico:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="116"/> + <source>Enter a logical name</source> + <translation>Introducir un nombre lógico</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="123"/> + <source>Select to enforce the operation</source> + <translation>Seleccionar para forzar la operación</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="126"/> + <source>&Force Operation</source> + <translation>&Forzar Operación</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="92"/> + <source>Select Submodule Repository Directory</source> + <translation>Seleccionar Directorio de Repositorio del Submódulo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="118"/> + <source>Select Submodule Directory</source> + <translation>Seleccionar Directorio del Submódulo</translation> + </message> +</context> +<context> + <name>GitSubmodulesDeinitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="14"/> + <source>Unregister Submodules</source> + <translation>Desregistrar Submódulos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="23"/> + <source>Select to unregister all submodules</source> + <translation>Seleccionar para desregistrar todos los submódulos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="26"/> + <source>Unregister All Submodules</source> + <translation>Desregistrar Todos los Submódulos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="33"/> + <source>Selected Submodules:</source> + <translation>Submódulos Seleccionados:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="40"/> + <source>Select the submodules to be unregistered</source> + <translation>Seleccionar los submódulos para desregistrar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="53"/> + <source>Select to enforce unregistering</source> + <translation>Seleccionar para forzar el desregistrado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="56"/> + <source>Enforce Operation</source> + <translation>Forzar Operación</translation> + </message> +</context> +<context> + <name>GitSubmodulesListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="14"/> + <source>Defined Submodules</source> + <translation>Submódulos Definidos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="39"/> + <source>Name</source> + <translation>Nombre</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="44"/> + <source>Path</source> + <translation>Ruta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="49"/> + <source>URL</source> + <translation>URL</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="54"/> + <source>Branch</source> + <translation>Branch</translation> + </message> +</context> +<context> + <name>GitSubmodulesStatusDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="14"/> + <source>Submodules Status</source> + <translation>Status de Submódulos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="33"/> + <source>Submodule</source> + <translation>Submódulo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="38"/> + <source>Status</source> + <translation>Status</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="43"/> + <source>Commit ID</source> + <translation>Commit ID</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="48"/> + <source>Info</source> + <translation>Info</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="58"/> + <source>Select to show the status for the index</source> + <translation>Seleccionar para mostrar el status por índice</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="61"/> + <source>Show Status for Index</source> + <translation>Mostrar Status por Índice</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="68"/> + <source>Perform a recursive operation</source> + <translation>Efectuar una operación recursiva</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="71"/> + <source>Recursive</source> + <translation>Recursivo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="99"/> + <source>Errors</source> + <translation>Errores</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="46"/> + <source>up-to-date</source> + <translation>actualizados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="47"/> + <source>not initialized</source> + <translation>no inicializados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="48"/> + <source>different to index</source> + <translation>diferentes del índice</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="49"/> + <source>merge conflicts</source> + <translation>conflictos de merge</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="55"/> + <source>Refresh</source> + <translation>Actualizar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="57"/> + <source>Press to refresh the status display</source> + <translation>Pulsar para actualizar el status visualizado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="105"/> + <source>The process {0} did not finish within 30 seconds.</source> + <translation>El proceso {0} no terminó en un plazo de 30s.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="109"/> + <source>The process {0} finished with an error. +Error: {1}</source> + <translation>El proceso {0} terminó con error. +Error: {1}</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="115"/> + <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/GitSubmodulesStatusDialog.py" line="134"/> + <source>unknown</source> + <translation>desconocido</translation> + </message> +</context> +<context> + <name>GitSubmodulesSummaryOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="23"/> + <source>Selected Submodules:</source> + <translation>Submódulos Seleccionados:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="30"/> + <source>Select the submodules to show the summary for</source> + <translation>Seleccionar los submódulos para los que mostrar resumen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="43"/> + <source>Select to show summary information for the index of the superproject</source> + <translation>Seleccionar para mostrar información de resumen para el índice del superproyecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="46"/> + <source>Show Summary for Superproject Index</source> + <translation>Mostrar Resumen para el Índice del Superproyecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="53"/> + <source>Select to show summary information for the index</source> + <translation>Seleccionar para mostrar resumen de información para el índice</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="56"/> + <source>Show Summary for Index</source> + <translation>ÇMÇostrar Resumen para el Índice</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="63"/> + <source>Commit:</source> + <translation>Commit:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="70"/> + <source>Enter a commit ID to show summary information for</source> + <translation>Introducir commit ID para el que mostrar resumen de información</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="73"/> + <source>Enter Commit ID</source> + <translation>Introducir Commit ID</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="80"/> + <source>Limit:</source> + <translation>Límite:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="87"/> + <source>Enter the maximum number of entries to be shown per submodule</source> + <translation>Introducir el número máximo de entradas a mostrar por submódulo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="93"/> + <source>No Limit</source> + <translation>Sin Límite</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="14"/> + <source>Submodule Summary Options</source> + <translation>Opciones de Resumen de Submódulo</translation> + </message> +</context> +<context> + <name>GitSubmodulesSyncDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="14"/> + <source>Synchronize Submodule URLs</source> + <translation>Sincronizar URLs de Submódulos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="23"/> + <source>Selected Submodules:</source> + <translation>Submódulos Seleccionados:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="30"/> + <source>Select the submodules to be synchronized</source> + <translation>Seleccionar los submódulos a sincronizar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="43"/> + <source>Select to perform a recursive synchronization</source> + <translation>Seleccionar para efectuar sincronización recursiva</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="46"/> + <source>Recursive Operation</source> + <translation>Operación Recursiva</translation> + </message> +</context> +<context> + <name>GitSubmodulesUpdateOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="14"/> + <source>Submodule Update Options</source> + <translation>Opciones de Actualización de Submódulos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="23"/> + <source>Update Procedure</source> + <translation>Procedimiento de Actualización</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="29"/> + <source>Select to perform a 'checkout' procedure</source> + <translation>Seleccionar para efectuar un procedimiento de 'checkout'</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="32"/> + <source>checkout</source> + <translation>checkout</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="42"/> + <source>Select to perform a 'rebase' procedure</source> + <translation>Seleccionar para efectuar un procedimiento de 'rebase'</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="45"/> + <source>rebase</source> + <translation>rebase</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="52"/> + <source>Select to perform a 'merge' procedure</source> + <translation>Seleccionar para efectuar un procedimiento de 'merge'</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="55"/> + <source>merge</source> + <translation>merge</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="65"/> + <source>Select to initialize submodules before the update</source> + <translation>Seleccionar para inicializar submódulos antes de la actualización</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="68"/> + <source>Initialize before Update</source> + <translation>Inicializar antes de Actualizar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="75"/> + <source>Fetch remote changes before updating</source> + <translation>Recuperación (fetch) remota de cambios antes de actualizar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="78"/> + <source>Synchronize with remote</source> + <translation>Sincronizar con remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="88"/> + <source>Select to not fetch the remote</source> + <translation>Seleccionar para no hacer recuperación (fetch) remota</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="91"/> + <source>Don't Fetch</source> + <translation>No hacer Fetch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="98"/> + <source>Selected Submodules:</source> + <translation>Submódulos Seleccionados:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="105"/> + <source>Select the submodules to be updated</source> + <translation>Seleccionar los submódulos a actualizar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="118"/> + <source>Select to enforce the update</source> + <translation>Seleccionar forzar la actualización</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="121"/> + <source>Enforce Operation</source> + <translation>Forzar Operación</translation> + </message> +</context> +<context> + <name>GitTagBranchListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="14"/> + <source>Git Tag List</source> + <translation>Lista de Git Tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="17"/> + <source><b>Git Tag/Branch List</b> +<p>This dialog shows a list of the projects tags or branches.</p></source> + <translation><b>Listado de Tag/Branch de Git</b> +<p>Este diálogo muestra una lista de los tag o branches del proyecto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="33"/> + <source><b>Tag/Branches List</b> +<p>This shows a list of the projects tags or branches.</p></source> + <translation><b>Listado de Tag/Branches</b> +<p>Muestra una lista de los tags o branches del proyecto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="99"/> + <source>Commit</source> + <translation>Commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="99"/> + <source>Name</source> + <translation>Nombre</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="69"/> + <source>Errors</source> + <translation>Errores</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="88"/> + <source>Input</source> + <translation>Input</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="110"/> + <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/GitTagBranchListDialog.ui" line="113"/> + <source>&Send</source> + <translation>&Enviar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="116"/> + <source>Alt+S</source> + <translation>Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="123"/> + <source>Enter data to be sent to the git process</source> + <translation>Introducir los datos a enviar al proceso de git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="130"/> + <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/GitTagBranchListDialog.ui" line="133"/> + <source>&Password Mode</source> + <translation>&Modo de contraseña</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="136"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="94"/> + <source>Annotation Message</source> + <translation>Mensaje de Anotación</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="98"/> + <source>Git Branches List</source> + <translation>Listado de Git Branches</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="135"/> + <source>Process Generation Error</source> + <translation>Error de Generación de Proceso</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="135"/> + <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> +</context> +<context> + <name>GitTagDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="14"/> + <source>Git Tag</source> + <translation>Git Tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="23"/> + <source>Name:</source> + <translation>Nombre:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="36"/> + <source>Enter the name of the tag</source> + <translation>Introducir el nombre del tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="39"/> + <source><b>Tag Name</b> +<p>Enter the name of the tag to be created, deleted or verified.</p></source> + <translation><b>Nombre del Tag</b> +<p>Introduzca el nombre del tag a crear, borrar o verificar.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="53"/> + <source>Revision:</source> + <translation>Revisión:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="60"/> + <source>Enter a revision to set a tag for</source> + <translation>Introducir una revisión a la que aplicar tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="67"/> + <source>Tag Action</source> + <translation>Acción de Tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="73"/> + <source>Select to create a tag</source> + <translation>Seleccionar para crear tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="76"/> + <source><b>Create Tag</b> +<p>Select this entry in order to create a tag.</p></source> + <translation><b>Crear Tag</b> +<p>Seleccionar esta entrada para crear una tag.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="80"/> + <source>Create Tag</source> + <translation>Crear Tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="90"/> + <source>Select to delete a tag</source> + <translation>Seleccionar para borrar una tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="93"/> + <source><b>Delete Tag</b> +<p>Select this entry in order to delete the selected tag.</p></source> + <translation><b>Borrar Tag</b> +<p>Seleccione esta entrada para borrar la tag seleccionada.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="97"/> + <source>Delete Tag</source> + <translation>Borrar Tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="104"/> + <source>Select to verify a tag</source> + <translation>Seleccionar para verificar una tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="107"/> + <source><b>Verify Tag</b> +<p>Select this entry in order to verify the selected tag.</p></source> + <translation><b>Verificar Tag</b> +<p>Seleccione esta entrada para verificar la tag seleccionada.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="111"/> + <source>Verify Tag</source> + <translation>Verificar Tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="121"/> + <source>Tag Type</source> + <translation>Tipo de Tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="127"/> + <source>Select to create/delete/verify a global tag</source> + <translation>Seleccionar para crear/borrar/verificar una tag global</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="130"/> + <source>Global Tag</source> + <translation>Tag Global</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="140"/> + <source>Select to create/delete/verify a signed tag</source> + <translation>Seleccionar para crear/borrar/verificar una tag firmada</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="143"/> + <source>Signed Tag</source> + <translation>Tag Firmada</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="150"/> + <source>Select to create/delete/verify a local tag</source> + <translation>Seleccionar para crear/borrar/verificar una tag local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="153"/> + <source>Local Tag</source> + <translation>Tag Local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="163"/> + <source>Select to enforce the create operation</source> + <translation>Seleccionar para forzar la operación de creado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="166"/> + <source>Enforce Operation</source> + <translation>Forzar Operación</translation> + </message> +</context> +<context> + <name>GitUserConfigDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="14"/> + <source>Git User Data</source> + <translation>Datos de Usuario de Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="23"/> + <source>User Data</source> + <translation>Datos de Usuario</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="29"/> + <source>First Name:</source> + <translation>Nombre:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="36"/> + <source>Enter the first name</source> + <translation>Introducir el nombre</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="43"/> + <source>Last Name:</source> + <translation>Apellido:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="50"/> + <source>Enter the last name</source> + <translation>Introducir el apellido</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="57"/> + <source>Email:</source> + <translation>Email:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="64"/> + <source>Enter the email address</source> + <translation>Introducir la dirección de correo electrónico</translation> + </message> +</context> +<context> <name>GlosbeEngine</name> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/GlosbeEngine.py" line="88"/> @@ -69413,6 +76011,19 @@ </message> </context> <context> + <name>VcsGitPlugin</name> + <message> + <location filename="../Plugins/PluginVcsGit.py" line="60"/> + <source>Version Control - Git</source> + <translation>Control de Versiones - Git</translation> + </message> + <message> + <location filename="../Plugins/PluginVcsGit.py" line="135"/> + <source>Git</source> + <translation></translation> + </message> +</context> +<context> <name>VcsMercurialPlugin</name> <message> <location filename="../Plugins/PluginVcsMercurial.py" line="60"/>
--- a/i18n/eric6_fr.ts Sun Dec 10 16:43:11 2017 +0100 +++ b/i18n/eric6_fr.ts Sun Dec 10 17:42:11 2017 +0100 @@ -17807,6 +17807,6578 @@ </message> </context> <context> + <name>Git</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="211"/> + <source>The git process finished with the exit code {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1565"/> + <source>The git process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="218"/> + <source>Could not start the git executable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="246"/> + <source>Create project repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="246"/> + <source>The project repository could not be created.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="274"/> + <source>Creating Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="289"/> + <source>Adding files to Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="300"/> + <source>Initial commit to Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="330"/> + <source>Cloning project from a Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="419"/> + <source>Commit Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="419"/> + <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="478"/> + <source>Committing changes to Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="501"/> + <source>Switch</source> + <translation type="unfinished">Basculer de version</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="501"/> + <source><p>Do you really want to switch to <b>{0}</b>?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="532"/> + <source>Synchronizing with the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="579"/> + <source>Adding files/directories to the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="653"/> + <source>Removing files/directories from the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="710"/> + <source>Renaming {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="833"/> + <source>Unstage files/directories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="884"/> + <source>Revert changes</source> + <translation type="unfinished">Revenir avant les modifications</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="875"/> + <source>Do you really want to revert all changes to these files or directories?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="884"/> + <source>Do you really want to revert all changes of the project?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="890"/> + <source>Reverting changes</source> + <translation type="unfinished">Revenir avant les modifications</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="942"/> + <source>Merging</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="967"/> + <source>Master branch head</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1200"/> + <source>Git Command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1287"/> + <source><tr><td><b>Commit</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1291"/> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Parents</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1295"/> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Étiquettes</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1299"/> + <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1302"/> + <source><tr><td><b>Author</b></td><td>{0} &lt;{1}&gt;</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1305"/> + <source><tr><td><b>Date</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1308"/> + <source><tr><td><b>Committer</b></td><td>{0} &lt;{1}&gt;</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1311"/> + <source><tr><td><b>Committed Date</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1314"/> + <source><tr><td><b>Subject</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1322"/> + <source><h3>Repository information</h3> +<p><table> +<tr><td><b>Git V.</b></td><td>{0}</td></tr> +<tr></tr> +{1}</table></p> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1390"/> + <source>Create {0} file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1390"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1449"/> + <source>Git Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1434"/> + <source><p>Copying the directory <b>{0}</b> failed.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1449"/> + <source><p>Copying the file <b>{0}</b> failed.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2634"/> + <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/git.py" line="1636"/> + <source>Git Side-by-Side Difference</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1636"/> + <source><p>The file <b>{0}</b> could not be read.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1685"/> + <source>Fetching from a remote Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1723"/> + <source>Pulling from a remote Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1764"/> + <source>Pushing to a remote Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1792"/> + <source>Committing failed merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1819"/> + <source>Aborting uncommitted/failed merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1852"/> + <source>Applying patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1884"/> + <source>Check patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1887"/> + <source>Apply patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1969"/> + <source>Tagging in the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2200"/> + <source>Branching in the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2240"/> + <source>Delete Remote Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2261"/> + <source>Current Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2261"/> + <source><p>The current branch is <b>{0}</b>.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2325"/> + <source>Create Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2290"/> + <source>Git Bundle Files (*.bundle)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2307"/> + <source><p>The Git bundle file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2355"/> + <source>Verify Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2485"/> + <source>Git Bundle Files (*.bundle);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2385"/> + <source>List Bundle Heads</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2485"/> + <source>Apply Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2508"/> + <source>Applying a bundle file (fetch)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2535"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2738"/> + <source>Git Bisect ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2634"/> + <source>Process Generation Error</source> + <translation type="unfinished">Erreur du processus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2678"/> + <source>Create Bisect Replay File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2644"/> + <source>Git Bisect Replay Files (*.replay)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2661"/> + <source><p>The Git bisect replay file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2678"/> + <source><p>The file <b>{0}</b> could not be written.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2699"/> + <source>Edit Bisect Replay File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2726"/> + <source>Git Bisect Replay Files (*.replay);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2726"/> + <source>Bisect Replay</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2980"/> + <source>Show Remote Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2927"/> + <source>Rename Remote Repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2927"/> + <source>Enter new name for remote repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3004"/> + <source>Show Shortlog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3062"/> + <source>Cherry-pick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3092"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3117"/> + <source>Copy Changesets (Quit)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3143"/> + <source>Copy Changesets (Cancel)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3223"/> + <source>Saving stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3422"/> + <source>Show Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3422"/> + <source>Select a stash (empty for latest stash):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3334"/> + <source>Restore Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3348"/> + <source>Restoring stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3382"/> + <source>Create Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3372"/> + <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="3397"/> + <source>Creating branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3431"/> + <source>Delete Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3431"/> + <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="3442"/> + <source>Deleting stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> + <source>Delete All Stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> + <source>Do you really want to delete all stashes?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3470"/> + <source>Deleting all stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3542"/> + <source>Showing the combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3568"/> + <source>Verifying the integrity of the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3593"/> + <source>Performing Repository Housekeeping</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3637"/> + <source><tr><td><b>Statistics</b></td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3638"/> + <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="3642"/> + <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="3646"/> + <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="3650"/> + <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="3654"/> + <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="3658"/> + <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="3662"/> + <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="3666"/> + <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="3672"/> + <source><p><b>No statistics available.</b></p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3738"/> + <source>Creating Archive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3781"/> + <source>Add Submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3840"/> + <source>List Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3840"/> + <source>No submodules defined for the project.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3855"/> + <source>All</source> + <translation type="unfinished">Tous</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <source>Submodule Path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <source>Select a submodule path:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3911"/> + <source>Initialize Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3948"/> + <source>Unregister Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4028"/> + <source>Update Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4062"/> + <source>Synchronize Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4120"/> + <source>Submodules Summary</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitAddRemoteDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="14"/> + <source>Git Add Remote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished">Nom:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="30"/> + <source>Enter the remote name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="37"/> + <source>URL:</source> + <translation type="unfinished">URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="44"/> + <source>Enter the remote URL</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitApplyBundleDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="14"/> + <source>Git Apply Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="23"/> + <source>Bundle Head:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="36"/> + <source>Select a head to apply</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="43"/> + <source>Local Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="56"/> + <source>Enter a local branch</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitArchiveDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="14"/> + <source>Git Archive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Révision</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="29"/> + <source>Select to specify a revision by a revision expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="32"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="42"/> + <source>Enter a commit id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="52"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="68"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="78"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="81"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="97"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="107"/> + <source>Select HEAD revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="110"/> + <source>HEAD</source> + <translation type="unfinished">HEAD</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="125"/> + <source>Format:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="132"/> + <source>Select the archive format</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="139"/> + <source>File Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="146"/> + <source>Enter the name of the archive file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="153"/> + <source>Select the archive file via a file selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="160"/> + <source>Prefix:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="167"/> + <source>Enter a prefix to be prepended to each file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.py" line="88"/> + <source>Select Archive File</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBisectLogBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="14"/> + <source>Git Bisect Log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="42"/> + <source>Commit</source> + <translation type="unfinished">Commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="47"/> + <source>Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="52"/> + <source>Subject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="66"/> + <source>Errors</source> + <translation type="unfinished">Erreurs</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="72"/> + <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/GitBisectLogBrowserDialog.ui" line="88"/> + <source>Input</source> + <translation type="unfinished">Entrée</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="110"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="113"/> + <source>&Send</source> + <translation type="unfinished">&Envoyer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="116"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="123"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="130"/> + <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/GitBisectLogBrowserDialog.ui" line="133"/> + <source>&Password Mode</source> + <translation type="unfinished">Mode Mot de &Passe</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="136"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="57"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="59"/> + <source>Press to refresh the list of commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="175"/> + <source>Process Generation Error</source> + <translation type="unfinished">Erreur du processus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="175"/> + <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> +</context> +<context> + <name>GitBisectStartDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="14"/> + <source>Git Bisect Start</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="23"/> + <source>Bad Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="30"/> + <source>Enter a bad commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="37"/> + <source>Good Commits:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="44"/> + <source>Enter a list of good commits separated by space</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="51"/> + <source>Select to not checkout the working tree</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="54"/> + <source>Don't checkout working tree</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBlameDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="14"/> + <source>Git Blame</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="45"/> + <source>Commit</source> + <translation type="unfinished">Commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="50"/> + <source>Author</source> + <translation type="unfinished">Auteur</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="55"/> + <source>Date</source> + <translation type="unfinished">Date</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="60"/> + <source>Time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="65"/> + <source>Line</source> + <translation type="unfinished">Ligne</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="79"/> + <source>Errors</source> + <translation type="unfinished">Erreurs</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="98"/> + <source>Input</source> + <translation type="unfinished">Entrée</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="120"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="123"/> + <source>&Send</source> + <translation type="unfinished">&Envoyer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="126"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="133"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="140"/> + <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/GitBlameDialog.ui" line="143"/> + <source>&Password Mode</source> + <translation type="unfinished">Mode Mot de &Passe</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="146"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="119"/> + <source>Process Generation Error</source> + <translation type="unfinished">Erreur du processus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="119"/> + <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> +</context> +<context> + <name>GitBranchDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="14"/> + <source>Git Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="23"/> + <source>Branch Action</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="29"/> + <source>Select to create a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="32"/> + <source><b>Create Branch</b> +<p>Select this entry in order to create a branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="36"/> + <source>Create</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="46"/> + <source>Select to rename a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="49"/> + <source><b>Rename</b> +<p>Select this entry in order to rename the selected branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="53"/> + <source>Rename</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="60"/> + <source>Select to delete a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="63"/> + <source><b>Delete Branch</b> +<p>Select this entry in order to delete the selected branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="67"/> + <source>Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="74"/> + <source>Select to create a new branch and switch to it</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="77"/> + <source><b>Create &amp; Switch</b>\n<p>Select this entry in order to create a new branch and switch the working tree to it.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="80"/> + <source>Create && Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="87"/> + <source>Select to create a tracking branch and switch to it</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="90"/> + <source><b>Create Tracking Branch &amp; Switch</b>\n<p>Select this entry in order to create a new branch tracking a remote repository branch. The working tree is switched to it.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="93"/> + <source>Create Tracking Branch && Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="100"/> + <source>Select to associate a remote branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="209"/> + <source>Set Tracking Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="110"/> + <source>Select to de-associate a remote branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="113"/> + <source>Unset Tracking Branch Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="125"/> + <source>Name:</source> + <translation type="unfinished">Nom:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="138"/> + <source>Enter the name of the branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="141"/> + <source><b>Branch Name</b> +<p>Enter the name of the branch to be created, deleted or moved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="157"/> + <source>Create Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="163"/> + <source>Revision:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="170"/> + <source>Enter a revision at which to start the branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="183"/> + <source>Rename Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="189"/> + <source>New Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="196"/> + <source>Enter a new name for the selected branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="215"/> + <source>Remote Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="228"/> + <source>Select the remote branch to associate</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="238"/> + <source>Select to enforce the create operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="241"/> + <source>Enforce Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBranchPushDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="14"/> + <source>Git Push Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="23"/> + <source>Branch Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="36"/> + <source>Select the branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="43"/> + <source>Remote Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="56"/> + <source>Select the remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.py" line="36"/> + <source><all branches></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBundleDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="14"/> + <source>Git Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Révision</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="29"/> + <source>Select to specify a revision or revision range</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="32"/> + <source>Revisions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="42"/> + <source>Enter revisions or revision range expressions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="52"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="62"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="72"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="75"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="85"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitCherryPickDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="14"/> + <source>Git Cherry-pick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="23"/> + <source>Commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="29"/> + <source>Enter commits by id, branch or tag one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="45"/> + <source>Select to append cherry-pick info to the commit message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="48"/> + <source>Append Cherry-pick &Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="58"/> + <source>Select to add a 'Signed-off-by' line to the commit message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="61"/> + <source>Append '&Signed-off-by' line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="68"/> + <source>Select to not commit the cherry-pick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="71"/> + <source>Don't &commit</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitCommandDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="14"/> + <source>Git Command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="23"/> + <source>Git Command:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="36"/> + <source>Enter the Git command to be executed with all necessary parameters</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="39"/> + <source><b>Git Command</b> +<p>Enter the Git command to be executed including all necessary +parameters. If a parameter of the commandline includes a space you have to +surround this parameter by single or double quotes. Do not include the name +of the Git client executable (i.e. git).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="65"/> + <source>Project Directory:</source> + <translation type="unfinished">Répertoire du projet:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="78"/> + <source>This shows the root directory of the current project.</source> + <translation type="unfinished">Montre le répertoire racine du projet en cours.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="81"/> + <source>project directory</source> + <translation type="unfinished">répertoire du projet</translation> + </message> +</context> +<context> + <name>GitCommitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="14"/> + <source>Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="20"/> + <source>Commit Message</source> + <translation type="unfinished">Message de commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="26"/> + <source>Enter the log message.</source> + <translation type="unfinished">Entrer un message log.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="29"/> + <source><b>Log Message</b> +<p>Enter the log message for the commit action.</p></source> + <translation type="unfinished"><b> Message Log</b> +<p>Entrer un message log pour la mise à jour 'commit'.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="43"/> + <source>Recent commit messages</source> + <translation type="unfinished">Messages de commit récents</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="50"/> + <source>Select a recent commit message to use</source> + <translation type="unfinished">Sélectionner un message de commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="60"/> + <source>Select to commit only staged changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="63"/> + <source>Commit staged changes only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="70"/> + <source>Select to amend the last commit (leave message empty to keep it)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="73"/> + <source>Amend the last commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="80"/> + <source>Select to reset the author information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="83"/> + <source>Reset Author Info</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitCopyDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="14"/> + <source>Git Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="25"/> + <source>Source:</source> + <translation type="unfinished">Source:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="32"/> + <source>Shows the name of the source</source> + <translation type="unfinished">Affiche le nom de la source</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="35"/> + <source><b>Source name</b> +<p>This field shows the name of the source.</p></source> + <translation type="unfinished"><b>Source name</b> +<p>Ce champ donne le nom de la source.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="46"/> + <source>Enter the target name</source> + <translation type="unfinished">Entrer le nom de la cible</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="49"/> + <source><b>Target name</b> +<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="57"/> + <source>Target:</source> + <translation type="unfinished">Cible:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="64"/> + <source>Press to open a selection dialog</source> + <translation type="unfinished">Cliquer pour choisir un fichier</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="67"/> + <source><b>Target directory</b> +<p>Select the target name for the operation via a selection dialog.</p></source> + <translation type="unfinished"><b>Répertoire cible</b> +<p>Selectionne manuellement le nom de la cible.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="77"/> + <source>Select to force the operation</source> + <translation type="unfinished">Cocher pour forcer l'opération</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="80"/> + <source>Enforce operation</source> + <translation type="unfinished">Forcer l'opération</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.py" line="51"/> + <source>Git Move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.py" line="89"/> + <source>Select target</source> + <translation type="unfinished">Sélectionner la cible</translation> + </message> +</context> +<context> + <name>GitDescribeDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="14"/> + <source>Git Tag List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="42"/> + <source>Commit</source> + <translation type="unfinished">Commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="47"/> + <source>Tag Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="61"/> + <source>Errors</source> + <translation type="unfinished">Erreurs</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="80"/> + <source>Input</source> + <translation type="unfinished">Entrée</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="102"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="105"/> + <source>&Send</source> + <translation type="unfinished">&Envoyer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="108"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="115"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="122"/> + <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/GitDescribeDialog.ui" line="125"/> + <source>&Password Mode</source> + <translation type="unfinished">Mode Mot de &Passe</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="128"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py" line="117"/> + <source>Process Generation Error</source> + <translation type="unfinished">Erreur du processus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py" line="117"/> + <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> +</context> +<context> + <name>GitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="14"/> + <source>Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="29"/> + <source>Output</source> + <translation type="unfinished">Sortie</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="57"/> + <source>Errors</source> + <translation type="unfinished">Erreurs</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="76"/> + <source>Input</source> + <translation type="unfinished">Entrée</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="98"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="101"/> + <source>&Send</source> + <translation type="unfinished">&Envoyer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="104"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="111"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="118"/> + <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/GitDialog.ui" line="121"/> + <source>&Password Mode</source> + <translation type="unfinished">Mode Mot de &Passe</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="124"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="88"/> + <source>Additional Output</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="104"/> + <source>Process canceled.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="116"/> + <source>Process finished successfully.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="118"/> + <source>Process crashed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="120"/> + <source>Proces finished with exit code {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/> + <source>Process Generation Error</source> + <translation type="unfinished">Erreur du processus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/> + <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> +</context> +<context> + <name>GitDiffDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="14"/> + <source>Git Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="26"/> + <source>Difference</source> + <translation type="unfinished">Différence</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="39"/> + <source><b>Git Diff</b><p>This shows the output of the git diff command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="56"/> + <source><b>Git Diff</b><p>This shows the output of the git diff command (stage to repo) if the dialog was asked to show separate diffs.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="85"/> + <source>Errors</source> + <translation type="unfinished">Erreurs</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="48"/> + <source>Refresh</source> + <translation type="unfinished">Rafraichir</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="50"/> + <source>Press to refresh the display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="96"/> + <source>Working Tree to Staging Area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="97"/> + <source>Staging Area to HEAD Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="98"/> + <source>Working Tree to HEAD Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="99"/> + <source>Working to Staging (top) and Staging to HEAD (bottom)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="101"/> + <source>Stash Contents</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="102"/> + <source>Stash Contents of {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="171"/> + <source>Difference ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="179"/> + <source>Process Generation Error</source> + <translation type="unfinished">Erreur du processus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="179"/> + <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/GitDiffDialog.py" line="206"/> + <source>There is no difference.</source> + <translation type="unfinished">Aucune différence.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="227"/> + <source><Start></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="228"/> + <source><End></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="356"/> + <source>Save Diff</source> + <translation type="unfinished">Enregistrer Diff</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="322"/> + <source>Patch Files (*.diff)</source> + <translation type="unfinished">Fichiers Patch (*.diff)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="339"/> + <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="356"/> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitFetchDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="14"/> + <source>Git Fetch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="23"/> + <source>Remote Repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="30"/> + <source>Select the remote repository to fetch from</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="46"/> + <source>Remote Branches:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="56"/> + <source>Press to update the list of remote branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="59"/> + <source>Update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="81"/> + <source>Select the remote branches to be fetched</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="94"/> + <source>Local Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="101"/> + <source>Select the local branch to fetch into</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="111"/> + <source>Select to remove non-existing tracking references </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="114"/> + <source>Prune obsolete tracking references</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="121"/> + <source>Select to fetch tags as well</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="124"/> + <source>Include tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.py" line="36"/> + <source><All></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.py" line="37"/> + <source><Custom></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitListDialog.ui" line="14"/> + <source>Git Select</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitListDialog.ui" line="23"/> + <source>Select from the list:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitLogBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="14"/> + <source>Git Log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="22"/> + <source>Select action from menu</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="45"/> + <source>Select the mode (find or filter)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="65"/> + <source>From:</source> + <translation type="unfinished">Depuis:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="72"/> + <source>Enter the start date</source> + <translation type="unfinished">Entrer une date de début</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="82"/> + <source>To:</source> + <translation type="unfinished">Jusqu'au:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="89"/> + <source>Enter the end date</source> + <translation type="unfinished">Entrer une date de fin</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="112"/> + <source>Select the field to filter on</source> + <translation type="unfinished">Sélectionner le champ à filtrer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="119"/> + <source>Enter the regular expression to filter on or search for</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="126"/> + <source>Press to find the previous occurrence</source> + <translation type="unfinished">Cliquer pour rechercher l'occurence précédente</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="133"/> + <source>Press to find the next occurrence</source> + <translation type="unfinished">Cliquer pour rechercher l'occurence suivante</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="174"/> + <source>Graph</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="101"/> + <source>Commit ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="102"/> + <source>Author</source> + <translation type="unfinished">Auteur</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="189"/> + <source>Date</source> + <translation type="unfinished">Date</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="103"/> + <source>Committer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="199"/> + <source>Commit Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="104"/> + <source>Subject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="209"/> + <source>Branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="214"/> + <source>Tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="224"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="234"/> + <source>Press to move down in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="257"/> + <source>Press to get the next bunch of log entries</source> + <translation type="unfinished">Cliquer pour obtenir les messages log suivants</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="260"/> + <source>&Next</source> + <translation type="unfinished">&Suivant</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="267"/> + <source>Enter the limit of entries to fetch</source> + <translation type="unfinished">Entrer le nombre de messages max à rechercher</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="286"/> + <source>Select to stop listing log messages at a copy or move</source> + <translation type="unfinished">Cocher pour arrêter le listing des messages de log lors d'une copie ou d'un déplacement</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="289"/> + <source>Stop on Copy/Move</source> + <translation type="unfinished">Arrêt lors de copie/déplacement</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="378"/> + <source>Action</source> + <translation type="unfinished">Action</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="383"/> + <source>Path</source> + <translation type="unfinished">Chemin</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="388"/> + <source>Additions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="393"/> + <source>Deletions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="398"/> + <source>Copy from</source> + <translation type="unfinished">Copie depuis</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2119"/> + <source>Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="445"/> + <source><a href="save:me">Save</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="491"/> + <source>Errors</source> + <translation type="unfinished">Erreurs</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="497"/> + <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/GitLogBrowserDialog.ui" line="513"/> + <source>Input</source> + <translation type="unfinished">Entrée</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="535"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="538"/> + <source>&Send</source> + <translation type="unfinished">&Envoyer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="541"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="548"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="555"/> + <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/GitLogBrowserDialog.ui" line="558"/> + <source>&Password Mode</source> + <translation type="unfinished">Mode Mot de &Passe</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="561"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="88"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="90"/> + <source>Press to refresh the list of commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="98"/> + <source>Find</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="99"/> + <source>Filter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="105"/> + <source>File</source> + <translation type="unfinished">Fichier</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="122"/> + <source><table><tr><td><b>Commit ID</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2} &lt;{3}&gt;</td></tr><tr><td><b>Commit Date</b></td><td>{4}</td></tr><tr><td><b>Committer</b></td><td>{5} &lt;{6}&gt;</td></tr>{7}<tr><td><b>Subject</b></td><td>{8}</td></tr>{9}</table></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="134"/> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Parents</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="137"/> + <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="140"/> + <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="143"/> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Étiquettes</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="146"/> + <source><tr><td><b>Message</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="198"/> + <source>Added</source> + <translation type="unfinished">Ajouté</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="199"/> + <source>Deleted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="200"/> + <source>Modified</source> + <translation type="unfinished">Modifié</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="201"/> + <source>Copied</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="202"/> + <source>Renamed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="203"/> + <source>Type changed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="204"/> + <source>Unmerged</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="205"/> + <source>Unknown</source> + <translation type="unfinished">Inconnu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="241"/> + <source>Show Commit ID Column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="243"/> + <source>Press to show the commit ID column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="251"/> + <source>Show Author Columns</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="253"/> + <source>Press to show the author columns</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="261"/> + <source>Show Committer Columns</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="263"/> + <source>Press to show the committer columns</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="271"/> + <source>Show Branches Column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="273"/> + <source>Press to show the branches column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="281"/> + <source>Show Tags Column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="283"/> + <source>Press to show the Tags column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="313"/> + <source>Copy Commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="315"/> + <source>Cherry-pick the selected commits to the current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="320"/> + <source>Tag</source> + <translation type="unfinished">Tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="322"/> + <source>Tag the selected commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1812"/> + <source>Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="326"/> + <source>Create a new branch at the selected commit.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="328"/> + <source>Branch && Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="330"/> + <source>Create a new branch at the selected commit and switch the work tree to it.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1864"/> + <source>Switch</source> + <translation type="unfinished">Basculer de version</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="336"/> + <source>Switch the working directory to the selected commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1890"/> + <source>Show Short Log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="342"/> + <source>Show a dialog with a log output for release notes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="345"/> + <source>Describe</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="347"/> + <source>Show the most recent tag reachable from a commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="648"/> + <source>The git process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="651"/> + <source>Could not start the git executable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="654"/> + <source>Git Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="769"/> + <source>{0} ({1}%)</source> + <comment>action, confidence</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="835"/> + <source>Process Generation Error</source> + <translation type="unfinished">Erreur du processus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="835"/> + <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/GitLogBrowserDialog.py" line="1275"/> + <source>Side-by-Side Diff to Parent {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1287"/> + <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1725"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1864"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1890"/> + <source>Select a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/> + <source>Select a default branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/> + <source>Branch & Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2073"/> + <source>Find Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2073"/> + <source>'{0}' was not found.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2133"/> + <source>Differences to Parent {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2148"/> + <source>Diff to Parent {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2174"/> + <source>There is no difference.</source> + <translation type="unfinished">Aucune différence.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2337"/> + <source>Save Diff</source> + <translation type="unfinished">Enregistrer Diff</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2303"/> + <source>Patch Files (*.diff)</source> + <translation type="unfinished">Fichiers Patch (*.diff)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2320"/> + <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2337"/> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitMergeDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="14"/> + <source>Git Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Révision</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="29"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="32"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="42"/> + <source>Enter a commit id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="52"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="62"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="72"/> + <source>Select to specify a revision by a local branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="75"/> + <source>Local Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="85"/> + <source>Enter a local branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="95"/> + <source>Select to specify a revision by a remote branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="98"/> + <source>Remote Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="108"/> + <source>Enter a remote branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="118"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="121"/> + <source>No commit selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="134"/> + <source>Select to commit the merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="137"/> + <source>Commit Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="146"/> + <source>Commit Message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="153"/> + <source>Enter a message for the merge commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="163"/> + <source>Select to append the log summaries of merged commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="166"/> + <source>Add Log Message Summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="176"/> + <source>Select to show diff statistics at the end of the merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="179"/> + <source>Show diff statistics</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitNewProjectOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="14"/> + <source>New Project from Repository</source> + <translation type="unfinished">Nouveau projet à partir du référentiel</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="17"/> + <source><b>New Project from Repository Dialog</b> +<p>Enter the various repository infos into the entry fields. These values are used, when the new project is retrieved from the repository.</p> +<p>For remote repositories the URL must contain the hostname.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="28"/> + <source>&URL:</source> + <translation type="unfinished">&URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="44"/> + <source>Enter the URL of the repository</source> + <translation type="unfinished">Entrer l'URL du référentiel</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="60"/> + <source>Select the repository url via a directory selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="67"/> + <source>Press to clear the history of entered repository URLs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="74"/> + <source>Project &Directory:</source> + <translation type="unfinished">&Répertoire du projet:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="84"/> + <source>Enter the directory of the new project.</source> + <translation type="unfinished">Entrer le répertoire du nouveau projet.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="87"/> + <source><b>Project Directory</b> +<p>Enter the directory of the new project. It will be retrieved from +the repository and be placed in this directory.</p></source> + <translation type="unfinished"><b>Répertoire du projet</b> +<p>Entrer le répertoire du nouveau projet. Le projet sera rappatrié +depuis le référentiel vers ce répertoire.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py" line="87"/> + <source>Select Repository-Directory</source> + <translation type="unfinished">Sélection du répertoire référentiel</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py" line="102"/> + <source>Select Project Directory</source> + <translation type="unfinished">Selection d'un répertoire projet</translation> + </message> +</context> +<context> + <name>GitOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="14"/> + <source>Initial Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="17"/> + <source><b>Initial Commit Dialog</b> +<p>Enter the message for the initial commit.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="29"/> + <source>Commit &Message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="39"/> + <source>Enter the log message for the new project.</source> + <translation type="unfinished">Entrer le message log pour le nouveau projet.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="42"/> + <source><b>Log Message</b> +<p>Enter the log message to be used for the new project.</p></source> + <translation type="unfinished"><b>Message Log</b><p>Entrer le message log à utiliser pour le nouveau projet.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="46"/> + <source>new project started</source> + <translation type="unfinished">nouveau projet démarré</translation> + </message> +</context> +<context> + <name>GitPage</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="14"/> + <source>Select to perform an expensive copy detection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="20"/> + <source><b>Configure Git Interface</b></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="40"/> + <source>Log</source> + <translation type="unfinished">Log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="46"/> + <source>No. of log messages shown:</source> + <translation type="unfinished">Nb. de messages log affichés:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="53"/> + <source>Enter the number of log messages to be shown</source> + <translation type="unfinished">Entrer le nombre de messages log à afficher</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="82"/> + <source>No. of subject characters shown in list:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="89"/> + <source>Enter the number of characters of the commit subject to be shown in the list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="95"/> + <source>All</source> + <translation type="unfinished">Tous</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="105"/> + <source>Select to perform expensive copy detection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="108"/> + <source>Find copies harder</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="118"/> + <source>Commit</source> + <translation type="unfinished">Commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="124"/> + <source>No. of commit messages to remember:</source> + <translation type="unfinished">Nb. de messages de commit à conserver:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="131"/> + <source>Enter the number of commit messages to remember</source> + <translation type="unfinished">Entrer le nombre de messages de commit à conserver</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="160"/> + <source>Commit ID length:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="167"/> + <source>Enter the number of character to show for the commit ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="199"/> + <source>Cleanup</source> + <translation type="unfinished">Nettoyer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="205"/> + <source>Pattern:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="212"/> + <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="222"/> + <source>Repository Optimization</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="228"/> + <source>Select this to use the '--aggressive' option for garbage collection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="231"/> + <source>Perform aggressive repository optimization</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="241"/> + <source>Edit the Git configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="244"/> + <source>Edit configuration file</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitPatchFilesDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py" line="83"/> + <source>Patch Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="37"/> + <source>Press to add patch files to the list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="44"/> + <source>Press to delete the selected patch files from the list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="58"/> + <source>Press to move the selected file up</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="65"/> + <source>Press to move the selected file down</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="91"/> + <source>Strip Count:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="98"/> + <source>Enter number of leading directories to strip off (default 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="129"/> + <source>Select, if the patch has inaccurate end-of-file markers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="132"/> + <source>Patch has inaccurate end-of-file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="139"/> + <source>Select, if the line counts of the patch header may be wrong</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="142"/> + <source>Don't trust line counts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py" line="83"/> + <source>Patch Files (*.diff *.patch);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitPatchStatisticsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="14"/> + <source>Patch Statistics</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="23"/> + <source>Insertions and Deletions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="52"/> + <source># Insertions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="57"/> + <source># Deletions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="62"/> + <source>File</source> + <translation type="unfinished">Fichier</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="70"/> + <source>Summary Information:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="122"/> + <source>Process Generation Error</source> + <translation type="unfinished">Erreur du processus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="122"/> + <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> +</context> +<context> + <name>GitProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="488"/> + <source>Version Control</source> + <translation type="unfinished">Contrôle de version</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="499"/> + <source>Commit changes to repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="505"/> + <source>Add/Stage to repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="508"/> + <source>Unstage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="514"/> + <source>Remove from repository (and disk)</source> + <translation type="unfinished">Supprimer du référentiel (et du disque)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="588"/> + <source>Remove from repository only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="430"/> + <source>Copy</source> + <translation type="unfinished">Copier</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="432"/> + <source>Move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="435"/> + <source>Show log browser</source> + <translation type="unfinished">Afficher le navigateur de logs</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="520"/> + <source>Show status</source> + <translation type="unfinished">Afficher l'état (status)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="525"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="229"/> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="529"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="238"/> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="244"/> + <source>Show annotated file</source> + <translation type="unfinished">Afficher les fichiers annotés</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="535"/> + <source>Revert changes</source> + <translation type="unfinished">Revenir avant les modifications</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="542"/> + <source>Select all local file entries</source> + <translation type="unfinished">Sélectionner tous les fichiers locaux</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="544"/> + <source>Select all versioned file entries</source> + <translation type="unfinished">Sélectionner tous les fichiers ayant une version</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="546"/> + <source>Select all local directory entries</source> + <translation type="unfinished">Sélectionner tous les répertoires locaux</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="548"/> + <source>Select all versioned directory entries</source> + <translation type="unfinished">Sélectionner tous les répertoires ayant une version</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="551"/> + <source>Configure...</source> + <translation type="unfinished">Configuration...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="588"/> + <source>Do you really want to remove these files from the repository?</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="73"/> + <source>New from repository</source> + <translation type="unfinished">Nouveau à partir du référentiel</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="73"/> + <source>&New from repository...</source> + <translation type="unfinished">&Nouveau depuis un référentiel...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="78"/> + <source>Create (clone) a new project from a Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="81"/> + <source><b>New from repository</b><p>This creates (clones) a new local project from a Git repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="89"/> + <source>Fetch changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="94"/> + <source>Fetch changes from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="97"/> + <source><b>Fetch changes</b><p>This fetches changes from a remote repository into the local repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="105"/> + <source>Pull changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="110"/> + <source>Pull changes from a remote repository and update the work area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="113"/> + <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository and updates the work area.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="121"/> + <source>Commit changes to repository</source> + <translation type="unfinished">"Commiter" les modifications au référentiel</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="121"/> + <source>Commit changes to repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="126"/> + <source>Commit changes of the local project to the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="129"/> + <source><b>Commit changes to repository</b><p>This commits changes of the local project to the Git repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="137"/> + <source>Push changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="142"/> + <source>Push changes to a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="145"/> + <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="153"/> + <source>Export from repository</source> + <translation type="unfinished">Exporter du référentiel</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="153"/> + <source>&Export from repository...</source> + <translation type="unfinished">&Exporter du référentiel...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="158"/> + <source>Export a project from the repository</source> + <translation type="unfinished">Exporte un projet d'un référentiel VCS</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="161"/> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation type="unfinished"><b>Exporter du référentiel</b><p>Exporte un projet d'un référentiel VCS.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="168"/> + <source>Show log browser</source> + <translation type="unfinished">Afficher le navigateur de logs</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="173"/> + <source>Show a dialog to browse the log of the local project</source> + <translation type="unfinished">Affiche une fenêtre permettant de parcourir les logs du projet local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="176"/> + <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation type="unfinished"><b>Navigateur de logs</b><p>Affiche une fenêtre permettant de parcourir les messages logs du projet local. La fenêtre n'affiche qu'un nombre limité d'entrées, mais un bouton permet d'afficher les logs plus anciens.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="185"/> + <source>Show reflog browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="190"/> + <source>Show a dialog to browse the reflog of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="193"/> + <source><b>Show reflog browser</b><p>This shows a dialog to browse the reflog of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="202"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="202"/> + <source>Show &differences...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="207"/> + <source>Show the differences of the local project to the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="210"/> + <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="218"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="218"/> + <source>Show differences (extended) ...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="223"/> + <source>Show the difference of revisions of the project to the repository</source> + <translation type="unfinished">Affiche les différences entre le référentiel et les différentes révisions du projet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="226"/> + <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="234"/> + <source>Show status</source> + <translation type="unfinished">Afficher l'état (status)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="234"/> + <source>Show &status...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="239"/> + <source>Show the status of the local project</source> + <translation type="unfinished">Affiche l'état du projet local par rapport au référentiel VCS</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="242"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation type="unfinished"><b>Afficher l'état VCS</b><p>Affiche l'état du projet local par rapport au référentiel VCS.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="249"/> + <source>Switch</source> + <translation type="unfinished">Basculer de version</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="249"/> + <source>S&witch...</source> + <translation type="unfinished">&Basculer de version...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="254"/> + <source>Switch the working directory to another revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="257"/> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="265"/> + <source>Tag in repository</source> + <translation type="unfinished">Etiqueter au niveau du référentiel (tag)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="265"/> + <source>&Tag in repository...</source> + <translation type="unfinished">&Etiqueter dans le référentiel...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="270"/> + <source>Perform tag operations for the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="273"/> + <source><b>Tag in repository</b><p>This performs selectable tag operations for the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="281"/> + <source>List tags</source> + <translation type="unfinished">Lister les étiquettes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="281"/> + <source>&List tags...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="285"/> + <source>List tags of the project</source> + <translation type="unfinished">Liste les étiquettes du projet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="288"/> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation type="unfinished"><b>Liste des étiquettes</b><p>Liste les étiquettes du projet.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="295"/> + <source>Show most recent tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="299"/> + <source>Show the most recent tag reachable from the work tree</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="302"/> + <source><b>Show most recent tag</b><p>This shows the most recent tag reachable from the work tree.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="310"/> + <source>List branches</source> + <translation type="unfinished">Lister les branches</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="310"/> + <source>&List branches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="314"/> + <source>List branches of the project</source> + <translation type="unfinished">Liste les branches du projet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="317"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation type="unfinished"><b>Liste des branches</b><p>Effectue la liste de toutes les branches de développement du projet.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="324"/> + <source>List merged branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="324"/> + <source>List &merged branches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="328"/> + <source>List merged branches of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="331"/> + <source><b>List merged branches</b><p>This lists the merged branches of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="339"/> + <source>List non-merged branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="339"/> + <source>List &non-merged branches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="343"/> + <source>List non-merged branches of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="346"/> + <source><b>List non-merged branches</b><p>This lists the non-merged branches of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="354"/> + <source>Branch in repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="354"/> + <source>&Branch in repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="359"/> + <source>Perform branch operations for the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="362"/> + <source><b>Branch in repository</b><p>This performs selectable branch operations for the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="370"/> + <source>Delete Remote Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="370"/> + <source>&Delete Remote Branch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="374"/> + <source>Delete a branch from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="377"/> + <source><b>Delete Remote Branch</b><p>This deletes a branch from a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="384"/> + <source>Show current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="388"/> + <source>Show the current branch of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="391"/> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="398"/> + <source>Revert changes</source> + <translation type="unfinished">Revenir avant les modifications</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="398"/> + <source>Re&vert changes</source> + <translation type="unfinished">&Recharger le projet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="403"/> + <source>Revert all changes made to the local project</source> + <translation type="unfinished">Recharger le projet et écraser toutes les modifications locales</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="406"/> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> + <translation type="unfinished"><b>Recharger le projet</b><p>Recharge le projet et écrase toutes les modifications effectuées localement.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="413"/> + <source>Unstage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="413"/> + <source>&Unstage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="418"/> + <source>Unstage all changes made to the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="421"/> + <source><b>Unstage changes</b><p>This unstages all changes made to the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="428"/> + <source>Merge</source> + <translation type="unfinished">Fusionner</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="428"/> + <source>Mer&ge changes...</source> + <translation type="unfinished">&Fusionner les modifications...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="433"/> + <source>Merge changes into the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="436"/> + <source><b>Merge</b><p>This merges changes into the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="443"/> + <source>Cancel uncommitted/failed merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="447"/> + <source>Cancel an uncommitted or failed merge and lose all changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="450"/> + <source><b>Cancel uncommitted/failed merge</b><p>This cancels an uncommitted or failed merge causing all changes to be lost.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="458"/> + <source>Commit failed merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="462"/> + <source>Commit a failed merge after conflicts have been resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="465"/> + <source><b>Commit failed merge</b><p>This commits a failed merge after conflicts have been resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="473"/> + <source>Cleanup</source> + <translation type="unfinished">Nettoyer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="473"/> + <source>Cleanu&p</source> + <translation type="unfinished">&Nettoyer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="477"/> + <source>Cleanup the local project</source> + <translation type="unfinished">Nettoyer le projet local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="480"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation type="unfinished"><b>Nettoyer</b><p>Permet de nettoyer le projet local.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="487"/> + <source>Execute command</source> + <translation type="unfinished">Exécuter une commande</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="487"/> + <source>E&xecute command...</source> + <translation type="unfinished">E&xécuter une commande...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="491"/> + <source>Execute an arbitrary Git command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="494"/> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Git command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="502"/> + <source>Configure</source> + <translation type="unfinished">Configuration</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="502"/> + <source>Configure...</source> + <translation type="unfinished">Configuration...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="506"/> + <source>Show the configuration dialog with the Git page selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="509"/> + <source><b>Configure</b><p>Show the configuration dialog with the Git page selected.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="517"/> + <source>Show Remotes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="517"/> + <source>Show Remotes...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="521"/> + <source>Show the available remote repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="539"/> + <source><b>Show Remotes</b><p>This shows the remote repositories available for pulling, fetching and pushing.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1765"/> + <source>Show Remote Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="532"/> + <source>Show Remote Info...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="536"/> + <source>Show information about a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1161"/> + <source>Add</source> + <translation type="unfinished">Ajouter</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="547"/> + <source>Add...</source> + <translation type="unfinished">Ajouter...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="551"/> + <source>Add a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="554"/> + <source><b>Add</b><p>This adds a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1785"/> + <source>Remove</source> + <translation type="unfinished">Supprimer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="561"/> + <source>Remove...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="565"/> + <source>Remove a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="568"/> + <source><b>Remove</b><p>This removes a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1799"/> + <source>Prune</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="575"/> + <source>Prune...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="579"/> + <source>Prune stale remote-tracking branches of a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="582"/> + <source><b>Prune</b><p>This prunes stale remote-tracking branches of a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <source>Rename</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="590"/> + <source>Rename...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="594"/> + <source>Rename a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="597"/> + <source><b>Rename</b><p>This renames a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1833"/> + <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> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="649"/> + <source>Cancel 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> + <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> + <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> + <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> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> + <source>Show stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> + <source>Show stash...</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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="702"/> + <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"/> + <source>Restore && Keep</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="714"/> + <source>Restore a stash but keep it</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="717"/> + <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"/> + <source>Restore && Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="728"/> + <source>Restore a stash and delete it</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="731"/> + <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"/> + <source>Create Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="742"/> + <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"/> + <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"/> + <source>Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="757"/> + <source>Delete a stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="760"/> + <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"/> + <source>Delete All</source> + <translation type="unfinished">Tous supprimer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="771"/> + <source>Delete all stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="774"/> + <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"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="785"/> + <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"/> + <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"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="799"/> + <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> + <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> + <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> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="862"/> + <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"/> + <source>Repository Statistics</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <source>Repository Statistics...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="873"/> + <source>Show some statistics of the local repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="876"/> + <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"/> + <source>Create Archive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="887"/> + <source>Create an archive from the local repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="890"/> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> + <source>List bundle heads...</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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="934"/> + <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"/> + <source>Apply Bundle (fetch)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <source>Apply Bundle (fetch)...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="945"/> + <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"/> + <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"/> + <source>Apply Bundle (pull)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="955"/> + <source>Apply Bundle (pull)...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="959"/> + <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"/> + <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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1003"/> + <source>Mark a selectable revision as good</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> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1017"/> + <source>Mark a selectable revision as bad</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1020"/> + <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"/> + <source>Skip</source> + <translation type="unfinished">Passer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <source>Skip...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1031"/> + <source>Skip a selectable revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1034"/> + <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"/> + <source>Reset</source> + <translation type="unfinished">Réinitialiser</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <source>Reset...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1045"/> + <source>Reset the bisect session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1048"/> + <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"/> + <source>Show bisect log browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1060"/> + <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"/> + <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"/> + <source>Create replay file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1076"/> + <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"/> + <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"/> + <source>Edit replay file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1092"/> + <source>Edit a bisect replay file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1095"/> + <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"/> + <source>Replay session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1107"/> + <source>Replay a bisect session from file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1110"/> + <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"/> + <source>Check patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1121"/> + <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"/> + <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"/> + <source>Apply patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1136"/> + <source>Apply a list of patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1139"/> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1180"/> + <source>List the submodule of the current project</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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1195"/> + <source>Initialize the submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1198"/> + <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> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1244"/> + <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"/> + <source>Fetch and Update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1257"/> + <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>Synchronize URLs of submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1293"/> + <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"/> + <source>Show Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1306"/> + <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"/> + <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"/> + <source>Show Summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1322"/> + <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"/> + <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"/> + <source>Administration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1360"/> + <source>Bundle Management</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="2237"/> + <source>Bisect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1397"/> + <source>Tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1405"/> + <source>Branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1418"/> + <source>Manage Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1426"/> + <source>Remote Repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1436"/> + <source>Cherry-pick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1444"/> + <source>Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1459"/> + <source>Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1541"/> + <source>Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1646"/> + <source>Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <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"/> + <source>Pull</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1715"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1734"/> + <source>Unstage Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <source>Select a remote repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1853"/> + <source>Copy Commits (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1872"/> + <source>Copy Commits (Quit)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1892"/> + <source>Copy Commits (Cancel)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1911"/> + <source>Save Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1961"/> + <source>Restore Stash</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitPullDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="14"/> + <source>Git Pull</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="23"/> + <source>Remote Repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="30"/> + <source>Select the remote repository to pull from</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="46"/> + <source>Remote Branches:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="56"/> + <source>Press to update the list of remote branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="59"/> + <source>Update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="81"/> + <source>Select the remote branches to be pulled</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="94"/> + <source>Select to remove non-existing tracking references </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="97"/> + <source>Prune obsolete tracking references</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.py" line="36"/> + <source><All></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.py" line="37"/> + <source><Custom></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitPushDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="14"/> + <source>Git Push</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="25"/> + <source>Remote Repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="32"/> + <source>Select the remote repository to push to</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="48"/> + <source>Branches to be pushed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="70"/> + <source>Push?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="75"/> + <source>Local</source> + <translation type="unfinished">Local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="80"/> + <source>Remote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="85"/> + <source>Force?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="93"/> + <source>Press to select all branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="96"/> + <source>Select All</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="106"/> + <source><b>WARNING: The "Force" option can result in dangling branches in the remote repository.</b></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="119"/> + <source>Select to push tags as well</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="122"/> + <source>Include tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="129"/> + <source>Select this to associate a remote tracking branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="132"/> + <source>Set tracking information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="139"/> + <source>Push Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="145"/> + <source>Select to push submodules automatically</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="148"/> + <source>on-demand</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="158"/> + <source>Select to check, if submodules were pushed already</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="161"/> + <source>check</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="168"/> + <source>Select to push submodules only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="171"/> + <source>only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="178"/> + <source>Select to not push any submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="181"/> + <source>no</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitReflogBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="14"/> + <source>Git Reflog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="42"/> + <source>Commit</source> + <translation type="unfinished">Commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="47"/> + <source>Selector</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="52"/> + <source>Name</source> + <translation type="unfinished">Nom</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="57"/> + <source>Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="62"/> + <source>Subject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="72"/> + <source>Press to get the next bunch of log entries</source> + <translation type="unfinished">Cliquer pour obtenir les messages log suivants</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="75"/> + <source>&Next</source> + <translation type="unfinished">&Suivant</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="82"/> + <source>Enter the limit of entries to fetch</source> + <translation type="unfinished">Entrer le nombre de messages max à rechercher</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="122"/> + <source>Errors</source> + <translation type="unfinished">Erreurs</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="128"/> + <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/GitReflogBrowserDialog.ui" line="144"/> + <source>Input</source> + <translation type="unfinished">Entrée</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="166"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="169"/> + <source>&Send</source> + <translation type="unfinished">&Envoyer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="172"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="179"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="186"/> + <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/GitReflogBrowserDialog.ui" line="189"/> + <source>&Password Mode</source> + <translation type="unfinished">Mode Mot de &Passe</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="192"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="59"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="61"/> + <source>Press to refresh the list of commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="200"/> + <source>Process Generation Error</source> + <translation type="unfinished">Erreur du processus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="200"/> + <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> +</context> +<context> + <name>GitRemoteRepositoriesDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="14"/> + <source>Git Remote Repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="17"/> + <source><b>Git Remote Repositories</b> +<p>This dialog shows the available remote repositories.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="30"/> + <source>Remote Repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="46"/> + <source>Name</source> + <translation type="unfinished">Nom</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="51"/> + <source>URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="56"/> + <source>Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="82"/> + <source>Press to add a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="85"/> + <source>&Add</source> + <translation type="unfinished">&Ajouter</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="92"/> + <source>Press to rename the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="95"/> + <source>&Rename</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="102"/> + <source>Press to remove 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"/> + <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"/> + <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>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="217"/> + <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"/> + <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"/> + <source>&Password Mode</source> + <translation type="unfinished">Mode Mot de &Passe</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="230"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="51"/> + <source>Refresh</source> + <translation type="unfinished">Rafraichir</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="53"/> + <source>Press to refresh the repositories display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="148"/> + <source>Process Generation Error</source> + <translation type="unfinished">Erreur du processus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="148"/> + <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> +</context> +<context> + <name>GitRevisionSelectionDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="14"/> + <source>Git Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Révision</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="29"/> + <source>Select to specify a revision by a revision expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="32"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="42"/> + <source>Enter a commit id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="52"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="68"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="78"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="81"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="97"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="107"/> + <source>Select to specify a revision by a remote branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="110"/> + <source>Remote Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="126"/> + <source>Enter a remote branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="136"/> + <source>Select HEAD revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="139"/> + <source>HEAD</source> + <translation type="unfinished">HEAD</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="146"/> + <source>No revision selected</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitRevisionsSelectionDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="14"/> + <source>Git Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="23"/> + <source>Revision &1</source> + <translation type="unfinished">Révision &1</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="137"/> + <source>Select to specify a revision by a revision expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="140"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="150"/> + <source>Enter a commit id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="157"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="160"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="170"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="180"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="183"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="193"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="203"/> + <source>Select HEAD revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="206"/> + <source>HEAD</source> + <translation type="unfinished">HEAD</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="216"/> + <source>Select revision before HEAD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="219"/> + <source>HEAD^</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="226"/> + <source>No revision selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="131"/> + <source>Revision &2</source> + <translation type="unfinished">Révision &2</translation> + </message> +</context> +<context> + <name>GitStashBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="14"/> + <source>Git Stash Browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="42"/> + <source>Name</source> + <translation type="unfinished">Nom</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="47"/> + <source>Date</source> + <translation type="unfinished">Date</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="52"/> + <source>Message</source> + <translation type="unfinished">Message</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="66"/> + <source>Statistics</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="91"/> + <source>File</source> + <translation type="unfinished">Fichier</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="96"/> + <source>Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="101"/> + <source>Lines added</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="106"/> + <source>Lines deleted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="153"/> + <source>Errors</source> + <translation type="unfinished">Erreurs</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="159"/> + <source><b>Git stash errors</b><p>This shows possible error messages of the git stash command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="175"/> + <source>Input</source> + <translation type="unfinished">Entrée</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="197"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="200"/> + <source>&Send</source> + <translation type="unfinished">&Envoyer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="203"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="210"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="217"/> + <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/GitStashBrowserDialog.ui" line="220"/> + <source>&Password Mode</source> + <translation type="unfinished">Mode Mot de &Passe</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="223"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="65"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="67"/> + <source>Press to refresh the list of stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="82"/> + <source>Show</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="85"/> + <source>Restore && Keep</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="87"/> + <source>Restore && Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="90"/> + <source>Create Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="93"/> + <source>Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="95"/> + <source>Delete All</source> + <translation type="unfinished">Tous supprimer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="182"/> + <source>Process Generation Error</source> + <translation type="unfinished">Erreur du processus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="182"/> + <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 numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="369"/> + <source>%n file(s) changed</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="371"/> + <source>%n line(s) inserted</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="373"/> + <source>%n line(s) deleted</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> +</context> +<context> + <name>GitStashDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="14"/> + <source>Git Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="23"/> + <source>Message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="33"/> + <source>Enter a message for the stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="40"/> + <source>Keep changes in staging area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="47"/> + <source>Untracked/Ignored Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="53"/> + <source>Select to not stash untracked or ignored files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="56"/> + <source>Don't stash untracked or ignored files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="66"/> + <source>Select to stash untracked files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="69"/> + <source>Stash untracked files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="76"/> + <source>Select to stash untracked and ignored files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="79"/> + <source>Stash untracked and ignored files</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitStatusDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="395"/> + <source>Git Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="17"/> + <source><b>Git Status</b> +<p>This dialog shows the status of the selected file or project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="26"/> + <source>Select action from menu</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="49"/> + <source>&Filter on Status:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="59"/> + <source>Select the status of entries to be shown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="662"/> + <source>Commit</source> + <translation type="unfinished">Commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="105"/> + <source>Status (Work)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="110"/> + <source>Status (Staging)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="115"/> + <source>Path</source> + <translation type="unfinished">Chemin</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="155"/> + <source>Difference Working to Staging</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="209"/> + <source>Difference Staging to HEAD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="252"/> + <source>Errors</source> + <translation type="unfinished">Erreurs</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="271"/> + <source>Input</source> + <translation type="unfinished">Entrée</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="293"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="296"/> + <source>&Send</source> + <translation type="unfinished">&Envoyer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="299"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="306"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="313"/> + <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/GitStatusDialog.ui" line="316"/> + <source>&Password Mode</source> + <translation type="unfinished">Mode Mot de &Passe</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="319"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="65"/> + <source>Refresh</source> + <translation type="unfinished">Rafraichir</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="67"/> + <source>Press to refresh the status display</source> + <translation type="unfinished">Cliquer pour rafraichir l'affichage</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="105"/> + <source>Stage Selected Lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="109"/> + <source>Revert Selected Lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="113"/> + <source>Stage Hunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="117"/> + <source>Revert Hunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="123"/> + <source>Unstage Selected Lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="127"/> + <source>Unstage Hunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="169"/> + <source>added</source> + <translation type="unfinished">ajouté</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="170"/> + <source>copied</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="171"/> + <source>deleted</source> + <translation type="unfinished">effacé</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="172"/> + <source>modified</source> + <translation type="unfinished">modifié</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="173"/> + <source>renamed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="175"/> + <source>not tracked</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="174"/> + <source>unmerged</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="168"/> + <source>unmodified</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="176"/> + <source>ignored</source> + <translation type="unfinished">ignoré</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="197"/> + <source>Commit the selected changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="198"/> + <source>Amend</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="200"/> + <source>Amend the latest commit with the selected changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="202"/> + <source>Select all for commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="204"/> + <source>Unselect all from commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="703"/> + <source>Add</source> + <translation type="unfinished">Ajouter</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="210"/> + <source>Add the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="211"/> + <source>Stage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="213"/> + <source>Stages all changes of the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="215"/> + <source>Unstage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="217"/> + <source>Unstages all changes of the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="839"/> + <source>Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="224"/> + <source>Shows the differences of the selected entry in a separate dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="227"/> + <source>Differences Side-By-Side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="229"/> + <source>Shows the differences of the selected entry side-by-side in a separate dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="786"/> + <source>Revert</source> + <translation type="unfinished">Recouvrir</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="237"/> + <source>Reverts the changes of the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="242"/> + <source>Forget missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="244"/> + <source>Forgets about the selected missing files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="246"/> + <source>Restore missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="248"/> + <source>Restores the selected missing files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="253"/> + <source>Edit file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="255"/> + <source>Edit the selected conflicting file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="260"/> + <source>Adjust column sizes</source> + <translation type="unfinished">Ajuster la largeur des colonnes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="262"/> + <source>Adjusts the width of all columns to their contents</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="423"/> + <source>Process Generation Error</source> + <translation type="unfinished">Erreur du processus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="423"/> + <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/GitStatusDialog.py" line="596"/> + <source>all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="662"/> + <source>There are no entries selected to be committed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="703"/> + <source>There are no unversioned entries available/selected.</source> + <translation type="unfinished">Aucune entrée "non-versionnée" disponible/sélectionnée.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="725"/> + <source>Stage</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="725"/> + <source>There are no stageable entries available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="747"/> + <source>Unstage</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="747"/> + <source>There are no unstageable entries available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="769"/> + <source>Forget Missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="810"/> + <source>There are no missing entries available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="786"/> + <source>There are no uncommitted, unstaged changes available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="810"/> + <source>Restore Missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="839"/> + <source>There are no uncommitted changes available/selected.</source> + <translation type="unfinished">Il n'y a pas de modification non commitée disponible/sélectionnée.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="891"/> + <source>Working Tree to Staging Area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="870"/> + <source>Staging Area to HEAD Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="892"/> + <source>Working Tree to HEAD Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="894"/> + <source>Side-by-Side Difference</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="894"/> + <source>Select the compare method.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1201"/> + <source>Revert selected lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1203"/> + <source>Revert hunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1204"/> + <source>Are you sure you want to revert the selected changes?</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitStatusMonitorThread</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py" line="93"/> + <source>Could not start the Git process.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py" line="133"/> + <source>Git status checked successfully</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmoduleAddDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="14"/> + <source>Add Submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="23"/> + <source>&URL:</source> + <translation type="unfinished">&URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="39"/> + <source>Enter the URL of the repository</source> + <translation type="unfinished">Entrer l'URL du référentiel</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="55"/> + <source>Select the repository URL via a directory selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="62"/> + <source>Press to clear the history of entered repository URLs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="69"/> + <source>Submodule &Directory:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="79"/> + <source>Enter the directory for the submodule (leave empty to use default).</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="89"/> + <source>&Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="99"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="106"/> + <source>&Logical Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="116"/> + <source>Enter a logical name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="123"/> + <source>Select to enforce the operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="126"/> + <source>&Force Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="92"/> + <source>Select Submodule Repository Directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="118"/> + <source>Select Submodule Directory</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesDeinitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="14"/> + <source>Unregister Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="23"/> + <source>Select to unregister all submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="26"/> + <source>Unregister All Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="33"/> + <source>Selected Submodules:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="40"/> + <source>Select the submodules to be unregistered</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="53"/> + <source>Select to enforce unregistering</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="56"/> + <source>Enforce Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="14"/> + <source>Defined Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="39"/> + <source>Name</source> + <translation type="unfinished">Nom</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="44"/> + <source>Path</source> + <translation type="unfinished">Chemin</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="49"/> + <source>URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="54"/> + <source>Branch</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesStatusDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="14"/> + <source>Submodules Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="33"/> + <source>Submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="38"/> + <source>Status</source> + <translation type="unfinished">Etat (status)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="43"/> + <source>Commit ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="48"/> + <source>Info</source> + <translation type="unfinished">Info</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="58"/> + <source>Select to show the status for the index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="61"/> + <source>Show Status for Index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="68"/> + <source>Perform a recursive operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="71"/> + <source>Recursive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="99"/> + <source>Errors</source> + <translation type="unfinished">Erreurs</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="46"/> + <source>up-to-date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="47"/> + <source>not initialized</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="48"/> + <source>different to index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="49"/> + <source>merge conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="55"/> + <source>Refresh</source> + <translation type="unfinished">Rafraichir</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="57"/> + <source>Press to refresh the status display</source> + <translation type="unfinished">Cliquer pour rafraichir l'affichage</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="105"/> + <source>The process {0} did not finish within 30 seconds.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="109"/> + <source>The process {0} finished with an error. +Error: {1}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="115"/> + <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/GitSubmodulesStatusDialog.py" line="134"/> + <source>unknown</source> + <translation type="unfinished">inconnu</translation> + </message> +</context> +<context> + <name>GitSubmodulesSummaryOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="14"/> + <source>Submodule Summary Options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="23"/> + <source>Selected Submodules:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="30"/> + <source>Select the submodules to show the summary for</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="43"/> + <source>Select to show summary information for the index of the superproject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="46"/> + <source>Show Summary for Superproject Index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="53"/> + <source>Select to show summary information for the index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="56"/> + <source>Show Summary for Index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="63"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="70"/> + <source>Enter a commit ID to show summary information for</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="73"/> + <source>Enter Commit ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="80"/> + <source>Limit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="87"/> + <source>Enter the maximum number of entries to be shown per submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="93"/> + <source>No Limit</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesSyncDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="14"/> + <source>Synchronize Submodule URLs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="23"/> + <source>Selected Submodules:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="30"/> + <source>Select the submodules to be synchronized</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="43"/> + <source>Select to perform a recursive synchronization</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="46"/> + <source>Recursive Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesUpdateOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="14"/> + <source>Submodule Update Options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="23"/> + <source>Update Procedure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="29"/> + <source>Select to perform a 'checkout' procedure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="32"/> + <source>checkout</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="42"/> + <source>Select to perform a 'rebase' procedure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="45"/> + <source>rebase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="52"/> + <source>Select to perform a 'merge' procedure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="55"/> + <source>merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="65"/> + <source>Select to initialize submodules before the update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="68"/> + <source>Initialize before Update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="75"/> + <source>Fetch remote changes before updating</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="78"/> + <source>Synchronize with remote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="88"/> + <source>Select to not fetch the remote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="91"/> + <source>Don't Fetch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="98"/> + <source>Selected Submodules:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="105"/> + <source>Select the submodules to be updated</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="118"/> + <source>Select to enforce the update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="121"/> + <source>Enforce Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitTagBranchListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="14"/> + <source>Git Tag List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="17"/> + <source><b>Git Tag/Branch List</b> +<p>This dialog shows a list of the projects tags or branches.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="33"/> + <source><b>Tag/Branches List</b> +<p>This shows a list of the projects tags or branches.</p></source> + <translation type="unfinished"><b>Liste des étiquettes/branches Subversion</b> +<p>Cette fenêtre affiche la liste des étiquettes ou branches du projet.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="99"/> + <source>Commit</source> + <translation type="unfinished">Commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="99"/> + <source>Name</source> + <translation type="unfinished">Nom</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="69"/> + <source>Errors</source> + <translation type="unfinished">Erreurs</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="88"/> + <source>Input</source> + <translation type="unfinished">Entrée</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="110"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="113"/> + <source>&Send</source> + <translation type="unfinished">&Envoyer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="116"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="123"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="130"/> + <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/GitTagBranchListDialog.ui" line="133"/> + <source>&Password Mode</source> + <translation type="unfinished">Mode Mot de &Passe</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="136"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="94"/> + <source>Annotation Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="98"/> + <source>Git Branches List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="135"/> + <source>Process Generation Error</source> + <translation type="unfinished">Erreur du processus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="135"/> + <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> +</context> +<context> + <name>GitTagDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="14"/> + <source>Git Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished">Nom:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="36"/> + <source>Enter the name of the tag</source> + <translation type="unfinished">Entrer le nom de l'étiquette</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="39"/> + <source><b>Tag Name</b> +<p>Enter the name of the tag to be created, deleted or verified.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="53"/> + <source>Revision:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="60"/> + <source>Enter a revision to set a tag for</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="67"/> + <source>Tag Action</source> + <translation type="unfinished">Création d'étiquette</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="73"/> + <source>Select to create a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="76"/> + <source><b>Create Tag</b> +<p>Select this entry in order to create a tag.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="80"/> + <source>Create Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="90"/> + <source>Select to delete a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="93"/> + <source><b>Delete Tag</b> +<p>Select this entry in order to delete the selected tag.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="97"/> + <source>Delete Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="104"/> + <source>Select to verify a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="107"/> + <source><b>Verify Tag</b> +<p>Select this entry in order to verify the selected tag.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="111"/> + <source>Verify Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="121"/> + <source>Tag Type</source> + <translation type="unfinished">Type d'étiquette</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="127"/> + <source>Select to create/delete/verify a global tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="130"/> + <source>Global Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="140"/> + <source>Select to create/delete/verify a signed tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="143"/> + <source>Signed Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="150"/> + <source>Select to create/delete/verify a local tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="153"/> + <source>Local Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="163"/> + <source>Select to enforce the create operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="166"/> + <source>Enforce Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitUserConfigDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="14"/> + <source>Git User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="23"/> + <source>User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="29"/> + <source>First Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="36"/> + <source>Enter the first name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="43"/> + <source>Last Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="50"/> + <source>Enter the last name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="57"/> + <source>Email:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="64"/> + <source>Enter the email address</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GlosbeEngine</name> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/GlosbeEngine.py" line="88"/> @@ -70480,6 +77052,19 @@ </message> </context> <context> + <name>VcsGitPlugin</name> + <message> + <location filename="../Plugins/PluginVcsGit.py" line="60"/> + <source>Version Control - Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/PluginVcsGit.py" line="135"/> + <source>Git</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>VcsMercurialPlugin</name> <message> <location filename="../Plugins/PluginVcsMercurial.py" line="60"/>
--- a/i18n/eric6_it.ts Sun Dec 10 16:43:11 2017 +0100 +++ b/i18n/eric6_it.ts Sun Dec 10 17:42:11 2017 +0100 @@ -17332,6 +17332,6579 @@ </message> </context> <context> + <name>Git</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="211"/> + <source>The git process finished with the exit code {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1565"/> + <source>The git process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="218"/> + <source>Could not start the git executable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="246"/> + <source>Create project repository</source> + <translation type="unfinished">Crea il repository del progetto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="246"/> + <source>The project repository could not be created.</source> + <translation type="unfinished">Il repository del progetto non può essere creato.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="274"/> + <source>Creating Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="289"/> + <source>Adding files to Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="300"/> + <source>Initial commit to Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="330"/> + <source>Cloning project from a Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="419"/> + <source>Commit Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="419"/> + <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="478"/> + <source>Committing changes to Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="501"/> + <source>Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="501"/> + <source><p>Do you really want to switch to <b>{0}</b>?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="532"/> + <source>Synchronizing with the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="579"/> + <source>Adding files/directories to the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="653"/> + <source>Removing files/directories from the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="710"/> + <source>Renaming {0}</source> + <translation type="unfinished">Rinomino {0}</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="833"/> + <source>Unstage files/directories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="884"/> + <source>Revert changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="875"/> + <source>Do you really want to revert all changes to these files or directories?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="884"/> + <source>Do you really want to revert all changes of the project?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="890"/> + <source>Reverting changes</source> + <translation type="unfinished">Annullamento modifiche</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="942"/> + <source>Merging</source> + <translation type="unfinished">Merge</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="967"/> + <source>Master branch head</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1200"/> + <source>Git Command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1287"/> + <source><tr><td><b>Commit</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1291"/> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Origini</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1295"/> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Tags</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1299"/> + <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1302"/> + <source><tr><td><b>Author</b></td><td>{0} &lt;{1}&gt;</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1305"/> + <source><tr><td><b>Date</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1308"/> + <source><tr><td><b>Committer</b></td><td>{0} &lt;{1}&gt;</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1311"/> + <source><tr><td><b>Committed Date</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1314"/> + <source><tr><td><b>Subject</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1322"/> + <source><h3>Repository information</h3> +<p><table> +<tr><td><b>Git V.</b></td><td>{0}</td></tr> +<tr></tr> +{1}</table></p> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1390"/> + <source>Create {0} file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1390"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation type="unfinished"><p>Il file <b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1449"/> + <source>Git Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1434"/> + <source><p>Copying the directory <b>{0}</b> failed.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1449"/> + <source><p>Copying the file <b>{0}</b> failed.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2634"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1636"/> + <source>Git Side-by-Side Difference</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1636"/> + <source><p>The file <b>{0}</b> could not be read.</p></source> + <translation type="unfinished"><p>Il file <b>{0}</b> non può essere letto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1685"/> + <source>Fetching from a remote Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1723"/> + <source>Pulling from a remote Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1764"/> + <source>Pushing to a remote Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1792"/> + <source>Committing failed merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1819"/> + <source>Aborting uncommitted/failed merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1852"/> + <source>Applying patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1884"/> + <source>Check patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1887"/> + <source>Apply patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1969"/> + <source>Tagging in the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2200"/> + <source>Branching in the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2240"/> + <source>Delete Remote Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2261"/> + <source>Current Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2261"/> + <source><p>The current branch is <b>{0}</b>.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2325"/> + <source>Create Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2290"/> + <source>Git Bundle Files (*.bundle)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2307"/> + <source><p>The Git bundle file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2355"/> + <source>Verify Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2485"/> + <source>Git Bundle Files (*.bundle);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2385"/> + <source>List Bundle Heads</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2485"/> + <source>Apply Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2508"/> + <source>Applying a bundle file (fetch)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2535"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation type="unfinished">Sottocomando Bisect ({0}) non valido.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2738"/> + <source>Git Bisect ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2634"/> + <source>Process Generation Error</source> + <translation type="unfinished">Errore Generazione Processo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2678"/> + <source>Create Bisect Replay File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2644"/> + <source>Git Bisect Replay Files (*.replay)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2661"/> + <source><p>The Git bisect replay file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2678"/> + <source><p>The file <b>{0}</b> could not be written.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2699"/> + <source>Edit Bisect Replay File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2726"/> + <source>Git Bisect Replay Files (*.replay);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2726"/> + <source>Bisect Replay</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2980"/> + <source>Show Remote Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2927"/> + <source>Rename Remote Repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2927"/> + <source>Enter new name for remote repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3004"/> + <source>Show Shortlog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3062"/> + <source>Cherry-pick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3092"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3117"/> + <source>Copy Changesets (Quit)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3143"/> + <source>Copy Changesets (Cancel)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3223"/> + <source>Saving stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3422"/> + <source>Show Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3422"/> + <source>Select a stash (empty for latest stash):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3334"/> + <source>Restore Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3348"/> + <source>Restoring stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3382"/> + <source>Create Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3372"/> + <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="3397"/> + <source>Creating branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3431"/> + <source>Delete Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3431"/> + <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="3442"/> + <source>Deleting stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> + <source>Delete All Stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> + <source>Do you really want to delete all stashes?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3470"/> + <source>Deleting all stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3542"/> + <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="3568"/> + <source>Verifying the integrity of the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3593"/> + <source>Performing Repository Housekeeping</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3637"/> + <source><tr><td><b>Statistics</b></td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3638"/> + <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="3642"/> + <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="3646"/> + <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="3650"/> + <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="3654"/> + <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="3658"/> + <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="3662"/> + <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="3666"/> + <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="3672"/> + <source><p><b>No statistics available.</b></p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3738"/> + <source>Creating Archive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3781"/> + <source>Add Submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3840"/> + <source>List Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3840"/> + <source>No submodules defined for the project.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3855"/> + <source>All</source> + <translation type="unfinished">Tutti</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <source>Submodule Path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <source>Select a submodule path:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3911"/> + <source>Initialize Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3948"/> + <source>Unregister Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4028"/> + <source>Update Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4062"/> + <source>Synchronize Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4120"/> + <source>Submodules Summary</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitAddRemoteDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="14"/> + <source>Git Add Remote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished">Nome:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="30"/> + <source>Enter the remote name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="37"/> + <source>URL:</source> + <translation type="unfinished">URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="44"/> + <source>Enter the remote URL</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitApplyBundleDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="14"/> + <source>Git Apply Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="23"/> + <source>Bundle Head:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="36"/> + <source>Select a head to apply</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="43"/> + <source>Local Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="56"/> + <source>Enter a local branch</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitArchiveDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="14"/> + <source>Git Archive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Revisione</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="29"/> + <source>Select to specify a revision by a revision expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="32"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="42"/> + <source>Enter a commit id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished">Seleziona per specificare una revisione con un tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="52"/> + <source>Tag:</source> + <translation type="unfinished">Tag:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="68"/> + <source>Enter a tag name</source> + <translation type="unfinished">Inserisci il nome del tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="78"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished">Seleziona per specificare una revisione con un branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="81"/> + <source>Branch:</source> + <translation type="unfinished">Branch:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="97"/> + <source>Enter a branch name</source> + <translation type="unfinished">Inserisci un nome di branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="107"/> + <source>Select HEAD revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="110"/> + <source>HEAD</source> + <translation type="unfinished">HEAD</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="125"/> + <source>Format:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="132"/> + <source>Select the archive format</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="139"/> + <source>File Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="146"/> + <source>Enter the name of the archive file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="153"/> + <source>Select the archive file via a file selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="160"/> + <source>Prefix:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="167"/> + <source>Enter a prefix to be prepended to each file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.py" line="88"/> + <source>Select Archive File</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBisectLogBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="14"/> + <source>Git Bisect Log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="42"/> + <source>Commit</source> + <translation type="unfinished">Commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="47"/> + <source>Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="52"/> + <source>Subject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="66"/> + <source>Errors</source> + <translation type="unfinished">Errori</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="72"/> + <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/GitBisectLogBrowserDialog.ui" line="88"/> + <source>Input</source> + <translation type="unfinished">Input</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="110"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="113"/> + <source>&Send</source> + <translation type="unfinished">&Spedisci</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="116"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="123"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="130"/> + <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/GitBisectLogBrowserDialog.ui" line="133"/> + <source>&Password Mode</source> + <translation type="unfinished">Modo &Password</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="136"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="57"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="59"/> + <source>Press to refresh the list of commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="175"/> + <source>Process Generation Error</source> + <translation type="unfinished">Errore Generazione Processo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="175"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBisectStartDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="14"/> + <source>Git Bisect Start</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="23"/> + <source>Bad Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="30"/> + <source>Enter a bad commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="37"/> + <source>Good Commits:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="44"/> + <source>Enter a list of good commits separated by space</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="51"/> + <source>Select to not checkout the working tree</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="54"/> + <source>Don't checkout working tree</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBlameDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="14"/> + <source>Git Blame</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="45"/> + <source>Commit</source> + <translation type="unfinished">Commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="50"/> + <source>Author</source> + <translation type="unfinished">Autore</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="55"/> + <source>Date</source> + <translation type="unfinished">Data</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="60"/> + <source>Time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="65"/> + <source>Line</source> + <translation type="unfinished">Linea</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="79"/> + <source>Errors</source> + <translation type="unfinished">Errori</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="98"/> + <source>Input</source> + <translation type="unfinished">Input</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="120"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="123"/> + <source>&Send</source> + <translation type="unfinished">&Spedisci</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="126"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="133"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="140"/> + <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/GitBlameDialog.ui" line="143"/> + <source>&Password Mode</source> + <translation type="unfinished">Modo &Password</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="146"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="119"/> + <source>Process Generation Error</source> + <translation type="unfinished">Errore Generazione Processo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="119"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBranchDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="14"/> + <source>Git Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="23"/> + <source>Branch Action</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="29"/> + <source>Select to create a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="32"/> + <source><b>Create Branch</b> +<p>Select this entry in order to create a branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="36"/> + <source>Create</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="46"/> + <source>Select to rename a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="49"/> + <source><b>Rename</b> +<p>Select this entry in order to rename the selected branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="53"/> + <source>Rename</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="60"/> + <source>Select to delete a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="63"/> + <source><b>Delete Branch</b> +<p>Select this entry in order to delete the selected branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="67"/> + <source>Delete</source> + <translation type="unfinished">Cancella</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="74"/> + <source>Select to create a new branch and switch to it</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="77"/> + <source><b>Create &amp; Switch</b>\n<p>Select this entry in order to create a new branch and switch the working tree to it.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="80"/> + <source>Create && Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="87"/> + <source>Select to create a tracking branch and switch to it</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="90"/> + <source><b>Create Tracking Branch &amp; Switch</b>\n<p>Select this entry in order to create a new branch tracking a remote repository branch. The working tree is switched to it.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="93"/> + <source>Create Tracking Branch && Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="100"/> + <source>Select to associate a remote branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="209"/> + <source>Set Tracking Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="110"/> + <source>Select to de-associate a remote branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="113"/> + <source>Unset Tracking Branch Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="125"/> + <source>Name:</source> + <translation type="unfinished">Nome:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="138"/> + <source>Enter the name of the branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="141"/> + <source><b>Branch Name</b> +<p>Enter the name of the branch to be created, deleted or moved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="157"/> + <source>Create Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="163"/> + <source>Revision:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="170"/> + <source>Enter a revision at which to start the branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="183"/> + <source>Rename Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="189"/> + <source>New Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="196"/> + <source>Enter a new name for the selected branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="215"/> + <source>Remote Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="228"/> + <source>Select the remote branch to associate</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="238"/> + <source>Select to enforce the create operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="241"/> + <source>Enforce Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBranchPushDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="14"/> + <source>Git Push Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="23"/> + <source>Branch Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="36"/> + <source>Select the branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="43"/> + <source>Remote Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="56"/> + <source>Select the remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.py" line="36"/> + <source><all branches></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBundleDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="14"/> + <source>Git Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Revisione</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="29"/> + <source>Select to specify a revision or revision range</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="32"/> + <source>Revisions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="42"/> + <source>Enter revisions or revision range expressions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished">Seleziona per specificare una revisione con un tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="52"/> + <source>Tag:</source> + <translation type="unfinished">Tag:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="62"/> + <source>Enter a tag name</source> + <translation type="unfinished">Inserisci il nome del tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="72"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished">Seleziona per specificare una revisione con un branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="75"/> + <source>Branch:</source> + <translation type="unfinished">Branch:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="85"/> + <source>Enter a branch name</source> + <translation type="unfinished">Inserisci un nome di branch</translation> + </message> +</context> +<context> + <name>GitCherryPickDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="14"/> + <source>Git Cherry-pick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="23"/> + <source>Commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="29"/> + <source>Enter commits by id, branch or tag one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="45"/> + <source>Select to append cherry-pick info to the commit message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="48"/> + <source>Append Cherry-pick &Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="58"/> + <source>Select to add a 'Signed-off-by' line to the commit message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="61"/> + <source>Append '&Signed-off-by' line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="68"/> + <source>Select to not commit the cherry-pick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="71"/> + <source>Don't &commit</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitCommandDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="14"/> + <source>Git Command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="23"/> + <source>Git Command:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="36"/> + <source>Enter the Git command to be executed with all necessary parameters</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="39"/> + <source><b>Git Command</b> +<p>Enter the Git command to be executed including all necessary +parameters. If a parameter of the commandline includes a space you have to +surround this parameter by single or double quotes. Do not include the name +of the Git client executable (i.e. git).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="65"/> + <source>Project Directory:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="78"/> + <source>This shows the root directory of the current project.</source> + <translation type="unfinished">Mostra la directory radice del progetto corrente.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="81"/> + <source>project directory</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitCommitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="14"/> + <source>Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="20"/> + <source>Commit Message</source> + <translation type="unfinished">Messaggio di commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="26"/> + <source>Enter the log message.</source> + <translation type="unfinished">Inserisci messaggio di log.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="29"/> + <source><b>Log Message</b> +<p>Enter the log message for the commit action.</p></source> + <translation type="unfinished"><b>Messaggio di log</b> +<p>Inserisci il messaggio di log per la commit.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="43"/> + <source>Recent commit messages</source> + <translation type="unfinished">Messagi di commit recenti</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="50"/> + <source>Select a recent commit message to use</source> + <translation type="unfinished">Seleziona un messaggio di commit recete da usare</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="60"/> + <source>Select to commit only staged changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="63"/> + <source>Commit staged changes only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="70"/> + <source>Select to amend the last commit (leave message empty to keep it)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="73"/> + <source>Amend the last commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="80"/> + <source>Select to reset the author information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="83"/> + <source>Reset Author Info</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitCopyDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="14"/> + <source>Git Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="25"/> + <source>Source:</source> + <translation type="unfinished">Sorgente:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="32"/> + <source>Shows the name of the source</source> + <translation type="unfinished">Mostra il nome della sorgente</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="35"/> + <source><b>Source name</b> +<p>This field shows the name of the source.</p></source> + <translation type="unfinished"><b>Nome sorgente</b> +<p>Questo campo mostra il nome della sorgente.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="46"/> + <source>Enter the target name</source> + <translation type="unfinished">Inserisci il nome del target</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="49"/> + <source><b>Target name</b> +<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="57"/> + <source>Target:</source> + <translation type="unfinished">Target:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="64"/> + <source>Press to open a selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="67"/> + <source><b>Target directory</b> +<p>Select the target name for the operation via a selection dialog.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="77"/> + <source>Select to force the operation</source> + <translation type="unfinished">Seleziona per forzae l'operazione</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="80"/> + <source>Enforce operation</source> + <translation type="unfinished">Forza operazione</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.py" line="51"/> + <source>Git Move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.py" line="89"/> + <source>Select target</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitDescribeDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="14"/> + <source>Git Tag List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="42"/> + <source>Commit</source> + <translation type="unfinished">Commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="47"/> + <source>Tag Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="61"/> + <source>Errors</source> + <translation type="unfinished">Errori</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="80"/> + <source>Input</source> + <translation type="unfinished">Input</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="102"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="105"/> + <source>&Send</source> + <translation type="unfinished">&Spedisci</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="108"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="115"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="122"/> + <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/GitDescribeDialog.ui" line="125"/> + <source>&Password Mode</source> + <translation type="unfinished">Modo &Password</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="128"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py" line="117"/> + <source>Process Generation Error</source> + <translation type="unfinished">Errore Generazione Processo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py" line="117"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="14"/> + <source>Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="29"/> + <source>Output</source> + <translation type="unfinished">Output</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="57"/> + <source>Errors</source> + <translation type="unfinished">Errori</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="76"/> + <source>Input</source> + <translation type="unfinished">Input</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="98"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="101"/> + <source>&Send</source> + <translation type="unfinished">&Spedisci</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="104"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="111"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="118"/> + <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/GitDialog.ui" line="121"/> + <source>&Password Mode</source> + <translation type="unfinished">Modo &Password</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="124"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="88"/> + <source>Additional Output</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="104"/> + <source>Process canceled.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="116"/> + <source>Process finished successfully.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="118"/> + <source>Process crashed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="120"/> + <source>Proces finished with exit code {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/> + <source>Process Generation Error</source> + <translation type="unfinished">Errore Generazione Processo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitDiffDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="14"/> + <source>Git Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="26"/> + <source>Difference</source> + <translation type="unfinished">Difference</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="39"/> + <source><b>Git Diff</b><p>This shows the output of the git diff command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="56"/> + <source><b>Git Diff</b><p>This shows the output of the git diff command (stage to repo) if the dialog was asked to show separate diffs.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="85"/> + <source>Errors</source> + <translation type="unfinished">Errori</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="48"/> + <source>Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="50"/> + <source>Press to refresh the display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="96"/> + <source>Working Tree to Staging Area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="97"/> + <source>Staging Area to HEAD Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="98"/> + <source>Working Tree to HEAD Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="99"/> + <source>Working to Staging (top) and Staging to HEAD (bottom)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="101"/> + <source>Stash Contents</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="102"/> + <source>Stash Contents of {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="171"/> + <source>Difference ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="179"/> + <source>Process Generation Error</source> + <translation type="unfinished">Errore Generazione Processo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="179"/> + <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/GitDiffDialog.py" line="206"/> + <source>There is no difference.</source> + <translation type="unfinished">Non ci sono differenze.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="227"/> + <source><Start></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="228"/> + <source><End></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="356"/> + <source>Save Diff</source> + <translation type="unfinished">Salva Diff</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="322"/> + <source>Patch Files (*.diff)</source> + <translation type="unfinished">File Patch (*.diff)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="339"/> + <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"><p>Il file patch <b>{0}</b> esiste già.Sovrascriverlo ?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="356"/> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation type="unfinished"><p>Il file <b>{0}</b> non può essere salvato.<br />Motivo: {1}</p></translation> + </message> +</context> +<context> + <name>GitFetchDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="14"/> + <source>Git Fetch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="23"/> + <source>Remote Repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="30"/> + <source>Select the remote repository to fetch from</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="46"/> + <source>Remote Branches:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="56"/> + <source>Press to update the list of remote branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="59"/> + <source>Update</source> + <translation type="unfinished">Aggiorna</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="81"/> + <source>Select the remote branches to be fetched</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="94"/> + <source>Local Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="101"/> + <source>Select the local branch to fetch into</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="111"/> + <source>Select to remove non-existing tracking references </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="114"/> + <source>Prune obsolete tracking references</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="121"/> + <source>Select to fetch tags as well</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="124"/> + <source>Include tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.py" line="36"/> + <source><All></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.py" line="37"/> + <source><Custom></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitListDialog.ui" line="14"/> + <source>Git Select</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitListDialog.ui" line="23"/> + <source>Select from the list:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitLogBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="14"/> + <source>Git Log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="22"/> + <source>Select action from menu</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="45"/> + <source>Select the mode (find or filter)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="65"/> + <source>From:</source> + <translation type="unfinished">Da:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="72"/> + <source>Enter the start date</source> + <translation type="unfinished">Inserisci la data iniziale</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="82"/> + <source>To:</source> + <translation type="unfinished">A:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="89"/> + <source>Enter the end date</source> + <translation type="unfinished">Inserisci la data finale</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="112"/> + <source>Select the field to filter on</source> + <translation type="unfinished">Seleziona il campo su cui filtrare</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="119"/> + <source>Enter the regular expression to filter on or search for</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="126"/> + <source>Press to find the previous occurrence</source> + <translation type="unfinished">Premi per trovare l'occorrenza precedente</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="133"/> + <source>Press to find the next occurrence</source> + <translation type="unfinished">Premi per trovare la prossima occorrenza</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="174"/> + <source>Graph</source> + <translation type="unfinished">Graph</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="101"/> + <source>Commit ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="102"/> + <source>Author</source> + <translation type="unfinished">Autore</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="189"/> + <source>Date</source> + <translation type="unfinished">Data</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="103"/> + <source>Committer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="199"/> + <source>Commit Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="104"/> + <source>Subject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="209"/> + <source>Branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="214"/> + <source>Tags</source> + <translation type="unfinished">Tags</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="224"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="234"/> + <source>Press to move down in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="257"/> + <source>Press to get the next bunch of log entries</source> + <translation type="unfinished">Premi per predere il prossimo blocco di entry del log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="260"/> + <source>&Next</source> + <translation type="unfinished">Succ&essivo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="267"/> + <source>Enter the limit of entries to fetch</source> + <translation type="unfinished">Inserisci il limite degli elementi da scaricare</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="286"/> + <source>Select to stop listing log messages at a copy or move</source> + <translation type="unfinished">Seleziona per fermare l'ascolto dei messaggi di log al copy o al move</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="289"/> + <source>Stop on Copy/Move</source> + <translation type="unfinished">Ferma su Copy/Move</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="378"/> + <source>Action</source> + <translation type="unfinished">Azione</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="383"/> + <source>Path</source> + <translation type="unfinished">Percorso</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="388"/> + <source>Additions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="393"/> + <source>Deletions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="398"/> + <source>Copy from</source> + <translation type="unfinished">Copia da</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2119"/> + <source>Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="445"/> + <source><a href="save:me">Save</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="491"/> + <source>Errors</source> + <translation type="unfinished">Errori</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="497"/> + <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/GitLogBrowserDialog.ui" line="513"/> + <source>Input</source> + <translation type="unfinished">Input</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="535"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="538"/> + <source>&Send</source> + <translation type="unfinished">&Spedisci</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="541"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="548"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="555"/> + <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/GitLogBrowserDialog.ui" line="558"/> + <source>&Password Mode</source> + <translation type="unfinished">Modo &Password</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="561"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="88"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="90"/> + <source>Press to refresh the list of commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="98"/> + <source>Find</source> + <translation type="unfinished">Trova</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="99"/> + <source>Filter</source> + <translation type="unfinished">Filtro</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="105"/> + <source>File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="122"/> + <source><table><tr><td><b>Commit ID</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2} &lt;{3}&gt;</td></tr><tr><td><b>Commit Date</b></td><td>{4}</td></tr><tr><td><b>Committer</b></td><td>{5} &lt;{6}&gt;</td></tr>{7}<tr><td><b>Subject</b></td><td>{8}</td></tr>{9}</table></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="134"/> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Origini</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="137"/> + <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="140"/> + <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="143"/> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Tags</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="146"/> + <source><tr><td><b>Message</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="198"/> + <source>Added</source> + <translation type="unfinished">Aggiunto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="199"/> + <source>Deleted</source> + <translation type="unfinished">Cancellato</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="200"/> + <source>Modified</source> + <translation type="unfinished">Modificato</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="201"/> + <source>Copied</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="202"/> + <source>Renamed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="203"/> + <source>Type changed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="204"/> + <source>Unmerged</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="205"/> + <source>Unknown</source> + <translation type="unfinished">Sconosciuto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="241"/> + <source>Show Commit ID Column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="243"/> + <source>Press to show the commit ID column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="251"/> + <source>Show Author Columns</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="253"/> + <source>Press to show the author columns</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="261"/> + <source>Show Committer Columns</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="263"/> + <source>Press to show the committer columns</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="271"/> + <source>Show Branches Column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="273"/> + <source>Press to show the branches column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="281"/> + <source>Show Tags Column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="283"/> + <source>Press to show the Tags column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="313"/> + <source>Copy Commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="315"/> + <source>Cherry-pick the selected commits to the current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="320"/> + <source>Tag</source> + <translation type="unfinished">Tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="322"/> + <source>Tag the selected commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1812"/> + <source>Branch</source> + <translation type="unfinished">Branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="326"/> + <source>Create a new branch at the selected commit.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="328"/> + <source>Branch && Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="330"/> + <source>Create a new branch at the selected commit and switch the work tree to it.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1864"/> + <source>Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="336"/> + <source>Switch the working directory to the selected commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1890"/> + <source>Show Short Log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="342"/> + <source>Show a dialog with a log output for release notes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="345"/> + <source>Describe</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="347"/> + <source>Show the most recent tag reachable from a commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="648"/> + <source>The git process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="651"/> + <source>Could not start the git executable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="654"/> + <source>Git Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="769"/> + <source>{0} ({1}%)</source> + <comment>action, confidence</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="835"/> + <source>Process Generation Error</source> + <translation type="unfinished">Errore Generazione Processo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="835"/> + <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/GitLogBrowserDialog.py" line="1275"/> + <source>Side-by-Side Diff to Parent {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1287"/> + <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1725"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1864"/> + <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/GitLogBrowserDialog.py" line="1890"/> + <source>Select a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/> + <source>Select a default branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/> + <source>Branch & Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2073"/> + <source>Find Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2073"/> + <source>'{0}' was not found.</source> + <translation type="unfinished">'{0}' non è stato trovato.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2133"/> + <source>Differences to Parent {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2148"/> + <source>Diff to Parent {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2174"/> + <source>There is no difference.</source> + <translation type="unfinished">Non ci sono differenze.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2337"/> + <source>Save Diff</source> + <translation type="unfinished">Salva Diff</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2303"/> + <source>Patch Files (*.diff)</source> + <translation type="unfinished">File Patch (*.diff)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2320"/> + <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"><p>Il file patch <b>{0}</b> esiste già.Sovrascriverlo ?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2337"/> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation type="unfinished"><p>Il file <b>{0}</b> non può essere salvato.<br />Motivo: {1}</p></translation> + </message> +</context> +<context> + <name>GitMergeDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="14"/> + <source>Git Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Revisione</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="29"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished">Seleziona per specificare la revisione dall'id del changeset</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="32"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="42"/> + <source>Enter a commit id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished">Seleziona per specificare una revisione con un tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="52"/> + <source>Tag:</source> + <translation type="unfinished">Tag:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="62"/> + <source>Enter a tag name</source> + <translation type="unfinished">Inserisci il nome del tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="72"/> + <source>Select to specify a revision by a local branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="75"/> + <source>Local Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="85"/> + <source>Enter a local branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="95"/> + <source>Select to specify a revision by a remote branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="98"/> + <source>Remote Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="108"/> + <source>Enter a remote branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="118"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished">Seleziona per non indicare una specifica revisione</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="121"/> + <source>No commit selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="134"/> + <source>Select to commit the merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="137"/> + <source>Commit Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="146"/> + <source>Commit Message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="153"/> + <source>Enter a message for the merge commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="163"/> + <source>Select to append the log summaries of merged commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="166"/> + <source>Add Log Message Summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="176"/> + <source>Select to show diff statistics at the end of the merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="179"/> + <source>Show diff statistics</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitNewProjectOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="14"/> + <source>New Project from Repository</source> + <translation type="unfinished">Nuovo progetto dal repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="17"/> + <source><b>New Project from Repository Dialog</b> +<p>Enter the various repository infos into the entry fields. These values are used, when the new project is retrieved from the repository.</p> +<p>For remote repositories the URL must contain the hostname.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="28"/> + <source>&URL:</source> + <translation type="unfinished">&URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="44"/> + <source>Enter the URL of the repository</source> + <translation type="unfinished">Inserisci l'URL del repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="60"/> + <source>Select the repository url via a directory selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="67"/> + <source>Press to clear the history of entered repository URLs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="74"/> + <source>Project &Directory:</source> + <translation type="unfinished">&Directory progetto:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="84"/> + <source>Enter the directory of the new project.</source> + <translation type="unfinished">Inserisci la directory per il nuovo progetto.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="87"/> + <source><b>Project Directory</b> +<p>Enter the directory of the new project. It will be retrieved from +the repository and be placed in this directory.</p></source> + <translation type="unfinished"><b>Directory progetto</b> +<p>Inserisci la directory del nuovo progetto. Questo verrà scaricato dal repository +a messo in questa directory.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py" line="87"/> + <source>Select Repository-Directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py" line="102"/> + <source>Select Project Directory</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="14"/> + <source>Initial Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="17"/> + <source><b>Initial Commit Dialog</b> +<p>Enter the message for the initial commit.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="29"/> + <source>Commit &Message:</source> + <translation type="unfinished">&Messaggio di commit:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="39"/> + <source>Enter the log message for the new project.</source> + <translation type="unfinished">Inserisci il messaggio di log per il nuovo progetto.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="42"/> + <source><b>Log Message</b> +<p>Enter the log message to be used for the new project.</p></source> + <translation type="unfinished"><b>Messaggi di Log</b> +<p>Inserisci il messaggio di log da usare per il nuovo progetto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="46"/> + <source>new project started</source> + <translation type="unfinished">nuovo progetto avviato</translation> + </message> +</context> +<context> + <name>GitPage</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="14"/> + <source>Select to perform an expensive copy detection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="20"/> + <source><b>Configure Git Interface</b></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="40"/> + <source>Log</source> + <translation type="unfinished">Log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="46"/> + <source>No. of log messages shown:</source> + <translation type="unfinished">N. di messaggi del log da mostrare:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="53"/> + <source>Enter the number of log messages to be shown</source> + <translation type="unfinished">Inserisci il numero di messaggi di log da mostrare</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="82"/> + <source>No. of subject characters shown in list:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="89"/> + <source>Enter the number of characters of the commit subject to be shown in the list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="95"/> + <source>All</source> + <translation type="unfinished">Tutti</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="105"/> + <source>Select to perform expensive copy detection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="108"/> + <source>Find copies harder</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="118"/> + <source>Commit</source> + <translation type="unfinished">Commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="124"/> + <source>No. of commit messages to remember:</source> + <translation type="unfinished">N. di messaggi di commit da ricordare:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="131"/> + <source>Enter the number of commit messages to remember</source> + <translation type="unfinished">Inserisci il numero di messaggi di commit da ricordare</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="160"/> + <source>Commit ID length:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="167"/> + <source>Enter the number of character to show for the commit ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="199"/> + <source>Cleanup</source> + <translation type="unfinished">Pulisci</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="205"/> + <source>Pattern:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="212"/> + <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="222"/> + <source>Repository Optimization</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="228"/> + <source>Select this to use the '--aggressive' option for garbage collection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="231"/> + <source>Perform aggressive repository optimization</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="241"/> + <source>Edit the Git configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="244"/> + <source>Edit configuration file</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitPatchFilesDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py" line="83"/> + <source>Patch Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="37"/> + <source>Press to add patch files to the list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="44"/> + <source>Press to delete the selected patch files from the list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="58"/> + <source>Press to move the selected file up</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="65"/> + <source>Press to move the selected file down</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="91"/> + <source>Strip Count:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="98"/> + <source>Enter number of leading directories to strip off (default 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="129"/> + <source>Select, if the patch has inaccurate end-of-file markers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="132"/> + <source>Patch has inaccurate end-of-file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="139"/> + <source>Select, if the line counts of the patch header may be wrong</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="142"/> + <source>Don't trust line counts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py" line="83"/> + <source>Patch Files (*.diff *.patch);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitPatchStatisticsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="14"/> + <source>Patch Statistics</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="23"/> + <source>Insertions and Deletions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="52"/> + <source># Insertions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="57"/> + <source># Deletions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="62"/> + <source>File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="70"/> + <source>Summary Information:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="122"/> + <source>Process Generation Error</source> + <translation type="unfinished">Errore Generazione Processo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="122"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="488"/> + <source>Version Control</source> + <translation type="unfinished">Controllo di Versione</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="499"/> + <source>Commit changes to repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="505"/> + <source>Add/Stage to repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="508"/> + <source>Unstage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="514"/> + <source>Remove from repository (and disk)</source> + <translation type="unfinished">Rimuovi dal repository (e dal disco)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="588"/> + <source>Remove from repository only</source> + <translation type="unfinished">Rimuovi solo dal repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="430"/> + <source>Copy</source> + <translation type="unfinished">Copia</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="432"/> + <source>Move</source> + <translation type="unfinished">Sposta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="435"/> + <source>Show log browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="520"/> + <source>Show status</source> + <translation type="unfinished">Mostra stato</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="525"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="229"/> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="529"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="238"/> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="244"/> + <source>Show annotated file</source> + <translation type="unfinished">Mostra file appuntati</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="535"/> + <source>Revert changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="542"/> + <source>Select all local file entries</source> + <translation type="unfinished">Seleziona tutt i file locali</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="544"/> + <source>Select all versioned file entries</source> + <translation type="unfinished">Seleziona tutti i file controllati</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="546"/> + <source>Select all local directory entries</source> + <translation type="unfinished">Seleziona tutte le directory locali</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="548"/> + <source>Select all versioned directory entries</source> + <translation type="unfinished">Seleziona tutte le directory controllate</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="551"/> + <source>Configure...</source> + <translation type="unfinished">Configura...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="588"/> + <source>Do you really want to remove these files from the repository?</source> + <translation type="unfinished">Vuoi veramente rimuovere questi file dal repository ?</translation> + </message> +</context> +<context> + <name>GitProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="73"/> + <source>New from repository</source> + <translation type="unfinished">Nuovo dal repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="73"/> + <source>&New from repository...</source> + <translation type="unfinished">&Nuovo dal repository...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="78"/> + <source>Create (clone) a new project from a Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="81"/> + <source><b>New from repository</b><p>This creates (clones) a new local project from a Git repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="89"/> + <source>Fetch changes</source> + <translation type="unfinished">Recupero modifiche</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="94"/> + <source>Fetch changes from a remote repository</source> + <translation type="unfinished">Recupero modifiche da un repository remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="97"/> + <source><b>Fetch changes</b><p>This fetches changes from a remote repository into the local repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="105"/> + <source>Pull changes</source> + <translation type="unfinished">Pull modifiche</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="110"/> + <source>Pull changes from a remote repository and update the work area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="113"/> + <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository and updates the work area.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="121"/> + <source>Commit changes to repository</source> + <translation type="unfinished">Committa le modifica nel repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="121"/> + <source>Commit changes to repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="126"/> + <source>Commit changes of the local project to the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="129"/> + <source><b>Commit changes to repository</b><p>This commits changes of the local project to the Git repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="137"/> + <source>Push changes</source> + <translation type="unfinished">Push modifiche</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="142"/> + <source>Push changes to a remote repository</source> + <translation type="unfinished">Push modifiche ad un repository remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="145"/> + <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> + <translation type="unfinished"><b>Push delle modifiche</b><p>Push delle modifiche dal repository locale a quello remoto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="153"/> + <source>Export from repository</source> + <translation type="unfinished">Esporta dal repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="153"/> + <source>&Export from repository...</source> + <translation type="unfinished">&Esporta dal repository...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="158"/> + <source>Export a project from the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="161"/> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation type="unfinished"><b>Esporta dal repository</b><p>Esporta un progetto dal repository.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="168"/> + <source>Show log browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="173"/> + <source>Show a dialog to browse the log of the local project</source> + <translation type="unfinished">Mostra un dialogo per navigare i log del progetto locale</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="176"/> + <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation type="unfinished"><b>Mostra borwser log</b><p>Mostra un dialogo per navigare i log del progetto locale. Inizialmente viene mostrato un numero limitato di elementi. Altri possono essere scaricati in seguito.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="185"/> + <source>Show reflog browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="190"/> + <source>Show a dialog to browse the reflog of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="193"/> + <source><b>Show reflog browser</b><p>This shows a dialog to browse the reflog of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="202"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="202"/> + <source>Show &differences...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="207"/> + <source>Show the differences of the local project to the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="210"/> + <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="218"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="218"/> + <source>Show differences (extended) ...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="223"/> + <source>Show the difference of revisions of the project to the repository</source> + <translation type="unfinished">Mostra le differenze tra la revisione del progetto e il repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="226"/> + <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="234"/> + <source>Show status</source> + <translation type="unfinished">Mostra stato</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="234"/> + <source>Show &status...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="239"/> + <source>Show the status of the local project</source> + <translation type="unfinished">Mostra lo stato del progetto locale</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="242"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation type="unfinished"><b>Mostra stato</b><p>Mostra lo stato del progetto locale.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="249"/> + <source>Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="249"/> + <source>S&witch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="254"/> + <source>Switch the working directory to another revision</source> + <translation type="unfinished">Switch della directory di lavoro ad un'altra revisione</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="257"/> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation type="unfinished"><b>Switch</b><p>Switch della directory di lavoro ad un'altra revisione.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="265"/> + <source>Tag in repository</source> + <translation type="unfinished">Tag nel repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="265"/> + <source>&Tag in repository...</source> + <translation type="unfinished">&Tag nel repository...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="270"/> + <source>Perform tag operations for the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="273"/> + <source><b>Tag in repository</b><p>This performs selectable tag operations for the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="281"/> + <source>List tags</source> + <translation type="unfinished">Elenca tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="281"/> + <source>&List tags...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="285"/> + <source>List tags of the project</source> + <translation type="unfinished">Elenca i tag del progetto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="288"/> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation type="unfinished"><b>Elenca tag</b><p>Elenca i tag del progetto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="295"/> + <source>Show most recent tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="299"/> + <source>Show the most recent tag reachable from the work tree</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="302"/> + <source><b>Show most recent tag</b><p>This shows the most recent tag reachable from the work tree.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="310"/> + <source>List branches</source> + <translation type="unfinished">Elenca branches</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="310"/> + <source>&List branches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="314"/> + <source>List branches of the project</source> + <translation type="unfinished">Elenca i branches del progetto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="317"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation type="unfinished"><b>Elenca branches</b><p>Elenca i branch del progetto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="324"/> + <source>List merged branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="324"/> + <source>List &merged branches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="328"/> + <source>List merged branches of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="331"/> + <source><b>List merged branches</b><p>This lists the merged branches of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="339"/> + <source>List non-merged branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="339"/> + <source>List &non-merged branches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="343"/> + <source>List non-merged branches of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="346"/> + <source><b>List non-merged branches</b><p>This lists the non-merged branches of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="354"/> + <source>Branch in repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="354"/> + <source>&Branch in repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="359"/> + <source>Perform branch operations for the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="362"/> + <source><b>Branch in repository</b><p>This performs selectable branch operations for the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="370"/> + <source>Delete Remote Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="370"/> + <source>&Delete Remote Branch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="374"/> + <source>Delete a branch from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="377"/> + <source><b>Delete Remote Branch</b><p>This deletes a branch from a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="384"/> + <source>Show current branch</source> + <translation type="unfinished">Mostra branch corrente</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="388"/> + <source>Show the current branch of the project</source> + <translation type="unfinished">Mostra il brach corrente del progetto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="391"/> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation type="unfinished"><b>Mostra il branch corrente</b><p>Mostra il branch corrente del progetto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="398"/> + <source>Revert changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="398"/> + <source>Re&vert changes</source> + <translation type="unfinished">In&verti modifiche</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="403"/> + <source>Revert all changes made to the local project</source> + <translation type="unfinished">Inverti tutte le modifiche fatte al progetto locale</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="406"/> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> + <translation type="unfinished"><b>Inverti modifiche</b><p>Inverte tutte le modifiche fatte al progetto locale.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="413"/> + <source>Unstage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="413"/> + <source>&Unstage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="418"/> + <source>Unstage all changes made to the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="421"/> + <source><b>Unstage changes</b><p>This unstages all changes made to the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="428"/> + <source>Merge</source> + <translation type="unfinished">Fondi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="428"/> + <source>Mer&ge changes...</source> + <translation type="unfinished">Fon&di modifiche...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="433"/> + <source>Merge changes into the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="436"/> + <source><b>Merge</b><p>This merges changes into the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="443"/> + <source>Cancel uncommitted/failed merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="447"/> + <source>Cancel an uncommitted or failed merge and lose all changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="450"/> + <source><b>Cancel uncommitted/failed merge</b><p>This cancels an uncommitted or failed merge causing all changes to be lost.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="458"/> + <source>Commit failed merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="462"/> + <source>Commit a failed merge after conflicts have been resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="465"/> + <source><b>Commit failed merge</b><p>This commits a failed merge after conflicts have been resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="473"/> + <source>Cleanup</source> + <translation type="unfinished">Pulisci</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="473"/> + <source>Cleanu&p</source> + <translation type="unfinished">&Pulisci</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="477"/> + <source>Cleanup the local project</source> + <translation type="unfinished">Pulisci il progetto locale</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="480"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation type="unfinished"><b>Pulizia</b><p>Esegue la pulizia del progetto locale.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="487"/> + <source>Execute command</source> + <translation type="unfinished">Esegui comando</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="487"/> + <source>E&xecute command...</source> + <translation type="unfinished">&Esegui comando...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="491"/> + <source>Execute an arbitrary Git command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="494"/> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Git command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="502"/> + <source>Configure</source> + <translation type="unfinished">Configura</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="502"/> + <source>Configure...</source> + <translation type="unfinished">Configura...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="506"/> + <source>Show the configuration dialog with the Git page selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="509"/> + <source><b>Configure</b><p>Show the configuration dialog with the Git page selected.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="517"/> + <source>Show Remotes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="517"/> + <source>Show Remotes...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="521"/> + <source>Show the available remote repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="539"/> + <source><b>Show Remotes</b><p>This shows the remote repositories available for pulling, fetching and pushing.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1765"/> + <source>Show Remote Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="532"/> + <source>Show Remote Info...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="536"/> + <source>Show information about a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1161"/> + <source>Add</source> + <translation type="unfinished">Aggiungi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="547"/> + <source>Add...</source> + <translation type="unfinished">Aggiungi...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="551"/> + <source>Add a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="554"/> + <source><b>Add</b><p>This adds a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1785"/> + <source>Remove</source> + <translation type="unfinished">Rimuovi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="561"/> + <source>Remove...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="565"/> + <source>Remove a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="568"/> + <source><b>Remove</b><p>This removes a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1799"/> + <source>Prune</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="575"/> + <source>Prune...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="579"/> + <source>Prune stale remote-tracking branches of a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="582"/> + <source><b>Prune</b><p>This prunes stale remote-tracking branches of a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <source>Rename</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="590"/> + <source>Rename...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="594"/> + <source>Rename a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="597"/> + <source><b>Rename</b><p>This renames a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1833"/> + <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> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="649"/> + <source>Cancel 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> + <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> + <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> + <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> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> + <source>Show stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> + <source>Show stash...</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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="702"/> + <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"/> + <source>Restore && Keep</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="714"/> + <source>Restore a stash but keep it</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="717"/> + <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"/> + <source>Restore && Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="728"/> + <source>Restore a stash and delete it</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="731"/> + <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"/> + <source>Create Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="742"/> + <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"/> + <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"/> + <source>Delete</source> + <translation type="unfinished">Cancella</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="757"/> + <source>Delete a stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="760"/> + <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"/> + <source>Delete All</source> + <translation type="unfinished">Cancella tutto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="771"/> + <source>Delete all stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="774"/> + <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"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="785"/> + <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"/> + <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"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="799"/> + <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> + <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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="844"/> + <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="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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="862"/> + <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"/> + <source>Repository Statistics</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <source>Repository Statistics...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="873"/> + <source>Show some statistics of the local repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="876"/> + <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"/> + <source>Create Archive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="887"/> + <source>Create an archive from the local repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="890"/> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> + <source>List bundle heads...</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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="934"/> + <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"/> + <source>Apply Bundle (fetch)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <source>Apply Bundle (fetch)...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="945"/> + <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"/> + <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"/> + <source>Apply Bundle (pull)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="955"/> + <source>Apply Bundle (pull)...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="959"/> + <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"/> + <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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1003"/> + <source>Mark a selectable revision as good</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> + <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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1017"/> + <source>Mark a selectable revision as bad</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1020"/> + <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"/> + <source>Skip</source> + <translation type="unfinished">Salta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <source>Skip...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1031"/> + <source>Skip a selectable revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1034"/> + <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"/> + <source>Reset</source> + <translation type="unfinished">Resetta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <source>Reset...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1045"/> + <source>Reset the bisect session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1048"/> + <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"/> + <source>Show bisect log browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1060"/> + <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"/> + <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"/> + <source>Create replay file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1076"/> + <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"/> + <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"/> + <source>Edit replay file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1092"/> + <source>Edit a bisect replay file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1095"/> + <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"/> + <source>Replay session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1107"/> + <source>Replay a bisect session from file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1110"/> + <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"/> + <source>Check patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1121"/> + <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"/> + <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"/> + <source>Apply patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1136"/> + <source>Apply a list of patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1139"/> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1180"/> + <source>List the submodule of the current project</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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1195"/> + <source>Initialize the submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1198"/> + <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> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1244"/> + <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"/> + <source>Fetch and Update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1257"/> + <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>Synchronize URLs of submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1293"/> + <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"/> + <source>Show Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1306"/> + <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"/> + <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"/> + <source>Show Summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1322"/> + <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"/> + <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"/> + <source>Administration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1360"/> + <source>Bundle Management</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="2237"/> + <source>Bisect</source> + <translation type="unfinished">Bisect</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1397"/> + <source>Tags</source> + <translation type="unfinished">Tags</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1405"/> + <source>Branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1418"/> + <source>Manage Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1426"/> + <source>Remote Repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1436"/> + <source>Cherry-pick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1444"/> + <source>Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1459"/> + <source>Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1541"/> + <source>Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1646"/> + <source>Branch</source> + <translation type="unfinished">Branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <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"/> + <source>Pull</source> + <translation type="unfinished">Pull</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1715"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1734"/> + <source>Unstage Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <source>Select a remote repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1853"/> + <source>Copy Commits (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1872"/> + <source>Copy Commits (Quit)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1892"/> + <source>Copy Commits (Cancel)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1911"/> + <source>Save Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1961"/> + <source>Restore Stash</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitPullDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="14"/> + <source>Git Pull</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="23"/> + <source>Remote Repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="30"/> + <source>Select the remote repository to pull from</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="46"/> + <source>Remote Branches:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="56"/> + <source>Press to update the list of remote branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="59"/> + <source>Update</source> + <translation type="unfinished">Aggiorna</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="81"/> + <source>Select the remote branches to be pulled</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="94"/> + <source>Select to remove non-existing tracking references </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="97"/> + <source>Prune obsolete tracking references</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.py" line="36"/> + <source><All></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.py" line="37"/> + <source><Custom></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitPushDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="14"/> + <source>Git Push</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="25"/> + <source>Remote Repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="32"/> + <source>Select the remote repository to push to</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="48"/> + <source>Branches to be pushed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="70"/> + <source>Push?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="75"/> + <source>Local</source> + <translation type="unfinished">Locale</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="80"/> + <source>Remote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="85"/> + <source>Force?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="93"/> + <source>Press to select all branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="96"/> + <source>Select All</source> + <translation type="unfinished">Seleziona tutti</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="106"/> + <source><b>WARNING: The "Force" option can result in dangling branches in the remote repository.</b></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="119"/> + <source>Select to push tags as well</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="122"/> + <source>Include tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="129"/> + <source>Select this to associate a remote tracking branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="132"/> + <source>Set tracking information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="139"/> + <source>Push Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="145"/> + <source>Select to push submodules automatically</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="148"/> + <source>on-demand</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="158"/> + <source>Select to check, if submodules were pushed already</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="161"/> + <source>check</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="168"/> + <source>Select to push submodules only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="171"/> + <source>only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="178"/> + <source>Select to not push any submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="181"/> + <source>no</source> + <translation type="unfinished">no</translation> + </message> +</context> +<context> + <name>GitReflogBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="14"/> + <source>Git Reflog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="42"/> + <source>Commit</source> + <translation type="unfinished">Commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="47"/> + <source>Selector</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="52"/> + <source>Name</source> + <translation type="unfinished">Nome</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="57"/> + <source>Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="62"/> + <source>Subject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="72"/> + <source>Press to get the next bunch of log entries</source> + <translation type="unfinished">Premi per predere il prossimo blocco di entry del log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="75"/> + <source>&Next</source> + <translation type="unfinished">Succ&essivo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="82"/> + <source>Enter the limit of entries to fetch</source> + <translation type="unfinished">Inserisci il limite degli elementi da scaricare</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="122"/> + <source>Errors</source> + <translation type="unfinished">Errori</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="128"/> + <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/GitReflogBrowserDialog.ui" line="144"/> + <source>Input</source> + <translation type="unfinished">Input</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="166"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="169"/> + <source>&Send</source> + <translation type="unfinished">&Spedisci</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="172"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="179"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="186"/> + <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/GitReflogBrowserDialog.ui" line="189"/> + <source>&Password Mode</source> + <translation type="unfinished">Modo &Password</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="192"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="59"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="61"/> + <source>Press to refresh the list of commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="200"/> + <source>Process Generation Error</source> + <translation type="unfinished">Errore Generazione Processo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="200"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitRemoteRepositoriesDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="14"/> + <source>Git Remote Repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="17"/> + <source><b>Git Remote Repositories</b> +<p>This dialog shows the available remote repositories.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="30"/> + <source>Remote Repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="46"/> + <source>Name</source> + <translation type="unfinished">Nome</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="51"/> + <source>URL</source> + <translation type="unfinished">URL</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="56"/> + <source>Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="82"/> + <source>Press to add a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="85"/> + <source>&Add</source> + <translation type="unfinished">&Aggiungi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="92"/> + <source>Press to rename the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="95"/> + <source>&Rename</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="102"/> + <source>Press to remove 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"/> + <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"/> + <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>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="217"/> + <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"/> + <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"/> + <source>&Password Mode</source> + <translation type="unfinished">Modo &Password</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="230"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="51"/> + <source>Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="53"/> + <source>Press to refresh the repositories display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="148"/> + <source>Process Generation Error</source> + <translation type="unfinished">Errore Generazione Processo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="148"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitRevisionSelectionDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="14"/> + <source>Git Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Revisione</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="29"/> + <source>Select to specify a revision by a revision expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="32"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="42"/> + <source>Enter a commit id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished">Seleziona per specificare una revisione con un tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="52"/> + <source>Tag:</source> + <translation type="unfinished">Tag:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="68"/> + <source>Enter a tag name</source> + <translation type="unfinished">Inserisci il nome del tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="78"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished">Seleziona per specificare una revisione con un branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="81"/> + <source>Branch:</source> + <translation type="unfinished">Branch:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="97"/> + <source>Enter a branch name</source> + <translation type="unfinished">Inserisci un nome di branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="107"/> + <source>Select to specify a revision by a remote branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="110"/> + <source>Remote Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="126"/> + <source>Enter a remote branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="136"/> + <source>Select HEAD revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="139"/> + <source>HEAD</source> + <translation type="unfinished">HEAD</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="146"/> + <source>No revision selected</source> + <translation type="unfinished">Nessuna revisione selezionata</translation> + </message> +</context> +<context> + <name>GitRevisionsSelectionDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="14"/> + <source>Git Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="23"/> + <source>Revision &1</source> + <translation type="unfinished">Revisione &1</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="137"/> + <source>Select to specify a revision by a revision expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="140"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="150"/> + <source>Enter a commit id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="157"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished">Seleziona per specificare una revisione con un tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="160"/> + <source>Tag:</source> + <translation type="unfinished">Tag:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="170"/> + <source>Enter a tag name</source> + <translation type="unfinished">Inserisci il nome del tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="180"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished">Seleziona per specificare una revisione con un branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="183"/> + <source>Branch:</source> + <translation type="unfinished">Branch:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="193"/> + <source>Enter a branch name</source> + <translation type="unfinished">Inserisci un nome di branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="203"/> + <source>Select HEAD revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="206"/> + <source>HEAD</source> + <translation type="unfinished">HEAD</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="216"/> + <source>Select revision before HEAD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="219"/> + <source>HEAD^</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="226"/> + <source>No revision selected</source> + <translation type="unfinished">Nessuna revisione selezionata</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="131"/> + <source>Revision &2</source> + <translation type="unfinished">Revisione &2</translation> + </message> +</context> +<context> + <name>GitStashBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="14"/> + <source>Git Stash Browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="42"/> + <source>Name</source> + <translation type="unfinished">Nome</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="47"/> + <source>Date</source> + <translation type="unfinished">Data</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="52"/> + <source>Message</source> + <translation type="unfinished">Messaggio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="66"/> + <source>Statistics</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="91"/> + <source>File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="96"/> + <source>Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="101"/> + <source>Lines added</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="106"/> + <source>Lines deleted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="153"/> + <source>Errors</source> + <translation type="unfinished">Errori</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="159"/> + <source><b>Git stash errors</b><p>This shows possible error messages of the git stash command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="175"/> + <source>Input</source> + <translation type="unfinished">Input</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="197"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="200"/> + <source>&Send</source> + <translation type="unfinished">&Spedisci</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="203"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="210"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="217"/> + <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/GitStashBrowserDialog.ui" line="220"/> + <source>&Password Mode</source> + <translation type="unfinished">Modo &Password</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="223"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="65"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="67"/> + <source>Press to refresh the list of stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="82"/> + <source>Show</source> + <translation type="unfinished">Mostra</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="85"/> + <source>Restore && Keep</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="87"/> + <source>Restore && Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="90"/> + <source>Create Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="93"/> + <source>Delete</source> + <translation type="unfinished">Cancella</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="95"/> + <source>Delete All</source> + <translation type="unfinished">Cancella tutto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="182"/> + <source>Process Generation Error</source> + <translation type="unfinished">Errore Generazione Processo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="182"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> + <message numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="369"/> + <source>%n file(s) changed</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="371"/> + <source>%n line(s) inserted</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="373"/> + <source>%n line(s) deleted</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> +</context> +<context> + <name>GitStashDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="14"/> + <source>Git Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="23"/> + <source>Message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="33"/> + <source>Enter a message for the stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="40"/> + <source>Keep changes in staging area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="47"/> + <source>Untracked/Ignored Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="53"/> + <source>Select to not stash untracked or ignored files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="56"/> + <source>Don't stash untracked or ignored files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="66"/> + <source>Select to stash untracked files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="69"/> + <source>Stash untracked files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="76"/> + <source>Select to stash untracked and ignored files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="79"/> + <source>Stash untracked and ignored files</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitStatusDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="395"/> + <source>Git Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="17"/> + <source><b>Git Status</b> +<p>This dialog shows the status of the selected file or project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="26"/> + <source>Select action from menu</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="49"/> + <source>&Filter on Status:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="59"/> + <source>Select the status of entries to be shown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="662"/> + <source>Commit</source> + <translation type="unfinished">Commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="105"/> + <source>Status (Work)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="110"/> + <source>Status (Staging)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="115"/> + <source>Path</source> + <translation type="unfinished">Percorso</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="155"/> + <source>Difference Working to Staging</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="209"/> + <source>Difference Staging to HEAD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="252"/> + <source>Errors</source> + <translation type="unfinished">Errori</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="271"/> + <source>Input</source> + <translation type="unfinished">Input</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="293"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="296"/> + <source>&Send</source> + <translation type="unfinished">&Spedisci</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="299"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="306"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="313"/> + <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/GitStatusDialog.ui" line="316"/> + <source>&Password Mode</source> + <translation type="unfinished">Modo &Password</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="319"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="65"/> + <source>Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="67"/> + <source>Press to refresh the status display</source> + <translation type="unfinished">Premi per aggiornare lo stato</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="105"/> + <source>Stage Selected Lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="109"/> + <source>Revert Selected Lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="113"/> + <source>Stage Hunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="117"/> + <source>Revert Hunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="123"/> + <source>Unstage Selected Lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="127"/> + <source>Unstage Hunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="169"/> + <source>added</source> + <translation type="unfinished">aggiunto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="170"/> + <source>copied</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="171"/> + <source>deleted</source> + <translation type="unfinished">cancellato</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="172"/> + <source>modified</source> + <translation type="unfinished">modificato</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="173"/> + <source>renamed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="175"/> + <source>not tracked</source> + <translation type="unfinished">non tracciato</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="174"/> + <source>unmerged</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="168"/> + <source>unmodified</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="176"/> + <source>ignored</source> + <translation type="unfinished">ignorato</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="197"/> + <source>Commit the selected changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="198"/> + <source>Amend</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="200"/> + <source>Amend the latest commit with the selected changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="202"/> + <source>Select all for commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="204"/> + <source>Unselect all from commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="703"/> + <source>Add</source> + <translation type="unfinished">Aggiungi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="210"/> + <source>Add the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="211"/> + <source>Stage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="213"/> + <source>Stages all changes of the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="215"/> + <source>Unstage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="217"/> + <source>Unstages all changes of the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="839"/> + <source>Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="224"/> + <source>Shows the differences of the selected entry in a separate dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="227"/> + <source>Differences Side-By-Side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="229"/> + <source>Shows the differences of the selected entry side-by-side in a separate dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="786"/> + <source>Revert</source> + <translation type="unfinished">Inverti</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="237"/> + <source>Reverts the changes of the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="242"/> + <source>Forget missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="244"/> + <source>Forgets about the selected missing files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="246"/> + <source>Restore missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="248"/> + <source>Restores the selected missing files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="253"/> + <source>Edit file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="255"/> + <source>Edit the selected conflicting file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="260"/> + <source>Adjust column sizes</source> + <translation type="unfinished">Adatta dimensione colonne</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="262"/> + <source>Adjusts the width of all columns to their contents</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="423"/> + <source>Process Generation Error</source> + <translation type="unfinished">Errore Generazione Processo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="423"/> + <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/GitStatusDialog.py" line="596"/> + <source>all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="662"/> + <source>There are no entries selected to be committed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="703"/> + <source>There are no unversioned entries available/selected.</source> + <translation type="unfinished">Non ci sono elementi non sotto controllo disponibili/selezionati.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="725"/> + <source>Stage</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="725"/> + <source>There are no stageable entries available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="747"/> + <source>Unstage</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="747"/> + <source>There are no unstageable entries available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="769"/> + <source>Forget Missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="810"/> + <source>There are no missing entries available/selected.</source> + <translation type="unfinished">Non ci sono elementi mancati disponibili/selezionati.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="786"/> + <source>There are no uncommitted, unstaged changes available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="810"/> + <source>Restore Missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="839"/> + <source>There are no uncommitted changes available/selected.</source> + <translation type="unfinished">Non ci sono modifiche disponibili/selezionate da committare.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="891"/> + <source>Working Tree to Staging Area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="870"/> + <source>Staging Area to HEAD Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="892"/> + <source>Working Tree to HEAD Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="894"/> + <source>Side-by-Side Difference</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="894"/> + <source>Select the compare method.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1201"/> + <source>Revert selected lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1203"/> + <source>Revert hunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1204"/> + <source>Are you sure you want to revert the selected changes?</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitStatusMonitorThread</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py" line="93"/> + <source>Could not start the Git process.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py" line="133"/> + <source>Git status checked successfully</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmoduleAddDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="14"/> + <source>Add Submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="23"/> + <source>&URL:</source> + <translation type="unfinished">&URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="39"/> + <source>Enter the URL of the repository</source> + <translation type="unfinished">Inserisci l'URL del repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="55"/> + <source>Select the repository URL via a directory selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="62"/> + <source>Press to clear the history of entered repository URLs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="69"/> + <source>Submodule &Directory:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="79"/> + <source>Enter the directory for the submodule (leave empty to use default).</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="89"/> + <source>&Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="99"/> + <source>Enter a branch name</source> + <translation type="unfinished">Inserisci un nome di branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="106"/> + <source>&Logical Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="116"/> + <source>Enter a logical name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="123"/> + <source>Select to enforce the operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="126"/> + <source>&Force Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="92"/> + <source>Select Submodule Repository Directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="118"/> + <source>Select Submodule Directory</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesDeinitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="14"/> + <source>Unregister Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="23"/> + <source>Select to unregister all submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="26"/> + <source>Unregister All Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="33"/> + <source>Selected Submodules:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="40"/> + <source>Select the submodules to be unregistered</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="53"/> + <source>Select to enforce unregistering</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="56"/> + <source>Enforce Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="14"/> + <source>Defined Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="39"/> + <source>Name</source> + <translation type="unfinished">Nome</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="44"/> + <source>Path</source> + <translation type="unfinished">Percorso</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="49"/> + <source>URL</source> + <translation type="unfinished">URL</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="54"/> + <source>Branch</source> + <translation type="unfinished">Branch</translation> + </message> +</context> +<context> + <name>GitSubmodulesStatusDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="14"/> + <source>Submodules Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="33"/> + <source>Submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="38"/> + <source>Status</source> + <translation type="unfinished">Stato</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="43"/> + <source>Commit ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="48"/> + <source>Info</source> + <translation type="unfinished">Info</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="58"/> + <source>Select to show the status for the index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="61"/> + <source>Show Status for Index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="68"/> + <source>Perform a recursive operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="71"/> + <source>Recursive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="99"/> + <source>Errors</source> + <translation type="unfinished">Errori</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="46"/> + <source>up-to-date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="47"/> + <source>not initialized</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="48"/> + <source>different to index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="49"/> + <source>merge conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="55"/> + <source>Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="57"/> + <source>Press to refresh the status display</source> + <translation type="unfinished">Premi per aggiornare lo stato</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="105"/> + <source>The process {0} did not finish within 30 seconds.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="109"/> + <source>The process {0} finished with an error. +Error: {1}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="115"/> + <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/GitSubmodulesStatusDialog.py" line="134"/> + <source>unknown</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesSummaryOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="14"/> + <source>Submodule Summary Options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="23"/> + <source>Selected Submodules:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="30"/> + <source>Select the submodules to show the summary for</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="43"/> + <source>Select to show summary information for the index of the superproject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="46"/> + <source>Show Summary for Superproject Index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="53"/> + <source>Select to show summary information for the index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="56"/> + <source>Show Summary for Index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="63"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="70"/> + <source>Enter a commit ID to show summary information for</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="73"/> + <source>Enter Commit ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="80"/> + <source>Limit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="87"/> + <source>Enter the maximum number of entries to be shown per submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="93"/> + <source>No Limit</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesSyncDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="14"/> + <source>Synchronize Submodule URLs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="23"/> + <source>Selected Submodules:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="30"/> + <source>Select the submodules to be synchronized</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="43"/> + <source>Select to perform a recursive synchronization</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="46"/> + <source>Recursive Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesUpdateOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="14"/> + <source>Submodule Update Options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="23"/> + <source>Update Procedure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="29"/> + <source>Select to perform a 'checkout' procedure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="32"/> + <source>checkout</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="42"/> + <source>Select to perform a 'rebase' procedure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="45"/> + <source>rebase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="52"/> + <source>Select to perform a 'merge' procedure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="55"/> + <source>merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="65"/> + <source>Select to initialize submodules before the update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="68"/> + <source>Initialize before Update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="75"/> + <source>Fetch remote changes before updating</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="78"/> + <source>Synchronize with remote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="88"/> + <source>Select to not fetch the remote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="91"/> + <source>Don't Fetch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="98"/> + <source>Selected Submodules:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="105"/> + <source>Select the submodules to be updated</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="118"/> + <source>Select to enforce the update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="121"/> + <source>Enforce Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitTagBranchListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="14"/> + <source>Git Tag List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="17"/> + <source><b>Git Tag/Branch List</b> +<p>This dialog shows a list of the projects tags or branches.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="33"/> + <source><b>Tag/Branches List</b> +<p>This shows a list of the projects tags or branches.</p></source> + <translation type="unfinished"><b>Tag/Branches List</b> +<p>Mostra una lista dei tag o branch del progetto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="99"/> + <source>Commit</source> + <translation type="unfinished">Commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="99"/> + <source>Name</source> + <translation type="unfinished">Nome</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="69"/> + <source>Errors</source> + <translation type="unfinished">Errori</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="88"/> + <source>Input</source> + <translation type="unfinished">Input</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="110"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="113"/> + <source>&Send</source> + <translation type="unfinished">&Spedisci</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="116"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="123"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="130"/> + <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/GitTagBranchListDialog.ui" line="133"/> + <source>&Password Mode</source> + <translation type="unfinished">Modo &Password</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="136"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="94"/> + <source>Annotation Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="98"/> + <source>Git Branches List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="135"/> + <source>Process Generation Error</source> + <translation type="unfinished">Errore Generazione Processo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="135"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitTagDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="14"/> + <source>Git Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished">Nome:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="36"/> + <source>Enter the name of the tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="39"/> + <source><b>Tag Name</b> +<p>Enter the name of the tag to be created, deleted or verified.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="53"/> + <source>Revision:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="60"/> + <source>Enter a revision to set a tag for</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="67"/> + <source>Tag Action</source> + <translation type="unfinished">Azione Tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="73"/> + <source>Select to create a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="76"/> + <source><b>Create Tag</b> +<p>Select this entry in order to create a tag.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="80"/> + <source>Create Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="90"/> + <source>Select to delete a tag</source> + <translation type="unfinished">Seleziona per cancellare un tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="93"/> + <source><b>Delete Tag</b> +<p>Select this entry in order to delete the selected tag.</p></source> + <translation type="unfinished"><b>Cancella Tag</b> +<p>Seleziona per cancellare il tag selezionato.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="97"/> + <source>Delete Tag</source> + <translation type="unfinished">Cancella Tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="104"/> + <source>Select to verify a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="107"/> + <source><b>Verify Tag</b> +<p>Select this entry in order to verify the selected tag.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="111"/> + <source>Verify Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="121"/> + <source>Tag Type</source> + <translation type="unfinished">Tipo Tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="127"/> + <source>Select to create/delete/verify a global tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="130"/> + <source>Global Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="140"/> + <source>Select to create/delete/verify a signed tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="143"/> + <source>Signed Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="150"/> + <source>Select to create/delete/verify a local tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="153"/> + <source>Local Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="163"/> + <source>Select to enforce the create operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="166"/> + <source>Enforce Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitUserConfigDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="14"/> + <source>Git User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="23"/> + <source>User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="29"/> + <source>First Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="36"/> + <source>Enter the first name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="43"/> + <source>Last Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="50"/> + <source>Enter the last name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="57"/> + <source>Email:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="64"/> + <source>Enter the email address</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GlosbeEngine</name> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/GlosbeEngine.py" line="88"/> @@ -69275,6 +75848,19 @@ </message> </context> <context> + <name>VcsGitPlugin</name> + <message> + <location filename="../Plugins/PluginVcsGit.py" line="60"/> + <source>Version Control - Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/PluginVcsGit.py" line="135"/> + <source>Git</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>VcsMercurialPlugin</name> <message> <location filename="../Plugins/PluginVcsMercurial.py" line="60"/>
--- a/i18n/eric6_pt.ts Sun Dec 10 16:43:11 2017 +0100 +++ b/i18n/eric6_pt.ts Sun Dec 10 17:42:11 2017 +0100 @@ -18023,6 +18023,6581 @@ </message> </context> <context> + <name>Git</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="211"/> + <source>The git process finished with the exit code {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1565"/> + <source>The git process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="218"/> + <source>Could not start the git executable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="246"/> + <source>Create project repository</source> + <translation type="unfinished">Criar repositorio do projeto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="246"/> + <source>The project repository could not be created.</source> + <translation type="unfinished">O repositorio do projeto não se pôde criar.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="274"/> + <source>Creating Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="289"/> + <source>Adding files to Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="300"/> + <source>Initial commit to Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="330"/> + <source>Cloning project from a Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="419"/> + <source>Commit Changes</source> + <translation type="unfinished">Aplicar Alterações</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="419"/> + <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="478"/> + <source>Committing changes to Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="501"/> + <source>Switch</source> + <translation type="unfinished">Mudar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="501"/> + <source><p>Do you really want to switch to <b>{0}</b>?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="532"/> + <source>Synchronizing with the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="579"/> + <source>Adding files/directories to the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="653"/> + <source>Removing files/directories from the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="710"/> + <source>Renaming {0}</source> + <translation type="unfinished">A renomear {0}</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="833"/> + <source>Unstage files/directories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="884"/> + <source>Revert changes</source> + <translation type="unfinished">Desfazer alterações</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="875"/> + <source>Do you really want to revert all changes to these files or directories?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="884"/> + <source>Do you really want to revert all changes of the project?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="890"/> + <source>Reverting changes</source> + <translation type="unfinished">Desfazer alterações</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="942"/> + <source>Merging</source> + <translation type="unfinished">A mesclar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="967"/> + <source>Master branch head</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1200"/> + <source>Git Command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1287"/> + <source><tr><td><b>Commit</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1291"/> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Pais</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1295"/> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Etiquetas</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1299"/> + <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Ramos</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1302"/> + <source><tr><td><b>Author</b></td><td>{0} &lt;{1}&gt;</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1305"/> + <source><tr><td><b>Date</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1308"/> + <source><tr><td><b>Committer</b></td><td>{0} &lt;{1}&gt;</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1311"/> + <source><tr><td><b>Committed Date</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1314"/> + <source><tr><td><b>Subject</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1322"/> + <source><h3>Repository information</h3> +<p><table> +<tr><td><b>Git V.</b></td><td>{0}</td></tr> +<tr></tr> +{1}</table></p> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1390"/> + <source>Create {0} file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1390"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation type="unfinished"><p>O ficheiro <b>{0}</b> já existe. Sobreescrever?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1449"/> + <source>Git Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1434"/> + <source><p>Copying the directory <b>{0}</b> failed.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1449"/> + <source><p>Copying the file <b>{0}</b> failed.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2634"/> + <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/git.py" line="1636"/> + <source>Git Side-by-Side Difference</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1636"/> + <source><p>The file <b>{0}</b> could not be read.</p></source> + <translation type="unfinished"><p>O ficheiro <b>{0}</b> não se pôde ler.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1685"/> + <source>Fetching from a remote Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1723"/> + <source>Pulling from a remote Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1764"/> + <source>Pushing to a remote Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1792"/> + <source>Committing failed merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1819"/> + <source>Aborting uncommitted/failed merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1852"/> + <source>Applying patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1884"/> + <source>Check patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1887"/> + <source>Apply patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1969"/> + <source>Tagging in the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2200"/> + <source>Branching in the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2240"/> + <source>Delete Remote Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2261"/> + <source>Current Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2261"/> + <source><p>The current branch is <b>{0}</b>.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2325"/> + <source>Create Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2290"/> + <source>Git Bundle Files (*.bundle)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2307"/> + <source><p>The Git bundle file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2355"/> + <source>Verify Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2485"/> + <source>Git Bundle Files (*.bundle);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2385"/> + <source>List Bundle Heads</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2485"/> + <source>Apply Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2508"/> + <source>Applying a bundle file (fetch)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2535"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2738"/> + <source>Git Bisect ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2634"/> + <source>Process Generation Error</source> + <translation type="unfinished">Erro na Criação de Processo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2678"/> + <source>Create Bisect Replay File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2644"/> + <source>Git Bisect Replay Files (*.replay)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2661"/> + <source><p>The Git bisect replay file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2678"/> + <source><p>The file <b>{0}</b> could not be written.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2699"/> + <source>Edit Bisect Replay File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2726"/> + <source>Git Bisect Replay Files (*.replay);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2726"/> + <source>Bisect Replay</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2980"/> + <source>Show Remote Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2927"/> + <source>Rename Remote Repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2927"/> + <source>Enter new name for remote repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3004"/> + <source>Show Shortlog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3062"/> + <source>Cherry-pick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3092"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3117"/> + <source>Copy Changesets (Quit)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3143"/> + <source>Copy Changesets (Cancel)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3223"/> + <source>Saving stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3422"/> + <source>Show Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3422"/> + <source>Select a stash (empty for latest stash):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3334"/> + <source>Restore Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3348"/> + <source>Restoring stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3382"/> + <source>Create Branch</source> + <translation type="unfinished">Criar Ramo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3372"/> + <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="3397"/> + <source>Creating branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3431"/> + <source>Delete Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3431"/> + <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="3442"/> + <source>Deleting stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> + <source>Delete All Stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> + <source>Do you really want to delete all stashes?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3470"/> + <source>Deleting all stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3542"/> + <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="3568"/> + <source>Verifying the integrity of the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3593"/> + <source>Performing Repository Housekeeping</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3637"/> + <source><tr><td><b>Statistics</b></td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3638"/> + <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="3642"/> + <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="3646"/> + <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="3650"/> + <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="3654"/> + <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="3658"/> + <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="3662"/> + <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="3666"/> + <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="3672"/> + <source><p><b>No statistics available.</b></p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3738"/> + <source>Creating Archive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3781"/> + <source>Add Submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3840"/> + <source>List Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3840"/> + <source>No submodules defined for the project.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3855"/> + <source>All</source> + <translation type="unfinished">Tudo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <source>Submodule Path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <source>Select a submodule path:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3911"/> + <source>Initialize Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3948"/> + <source>Unregister Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4028"/> + <source>Update Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4062"/> + <source>Synchronize Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4120"/> + <source>Submodules Summary</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitAddRemoteDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="14"/> + <source>Git Add Remote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished">Nome:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="30"/> + <source>Enter the remote name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="37"/> + <source>URL:</source> + <translation type="unfinished">URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="44"/> + <source>Enter the remote URL</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitApplyBundleDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="14"/> + <source>Git Apply Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="23"/> + <source>Bundle Head:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="36"/> + <source>Select a head to apply</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="43"/> + <source>Local Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="56"/> + <source>Enter a local branch</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitArchiveDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="14"/> + <source>Git Archive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Revisão</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="29"/> + <source>Select to specify a revision by a revision expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="32"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="42"/> + <source>Enter a commit id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished">Selecionar para especificar uma revisão por uma etiqueta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="52"/> + <source>Tag:</source> + <translation type="unfinished">Etiqueta:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="68"/> + <source>Enter a tag name</source> + <translation type="unfinished">Introduzir o nome da etiqueta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="78"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished">Selecionar para especificar uma revisão por ramo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="81"/> + <source>Branch:</source> + <translation type="unfinished">Ramo:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="97"/> + <source>Enter a branch name</source> + <translation type="unfinished">Introduzir um nome de ramo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="107"/> + <source>Select HEAD revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="110"/> + <source>HEAD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="125"/> + <source>Format:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="132"/> + <source>Select the archive format</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="139"/> + <source>File Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="146"/> + <source>Enter the name of the archive file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="153"/> + <source>Select the archive file via a file selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="160"/> + <source>Prefix:</source> + <translation type="unfinished">Prefixo:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="167"/> + <source>Enter a prefix to be prepended to each file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.py" line="88"/> + <source>Select Archive File</source> + <translation type="unfinished">Selecionar Ficheiro Arquivo</translation> + </message> +</context> +<context> + <name>GitBisectLogBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="14"/> + <source>Git Bisect Log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="42"/> + <source>Commit</source> + <translation type="unfinished">Cometido</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="47"/> + <source>Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="52"/> + <source>Subject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="66"/> + <source>Errors</source> + <translation type="unfinished">Erros</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="72"/> + <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/GitBisectLogBrowserDialog.ui" line="88"/> + <source>Input</source> + <translation type="unfinished">Entrada</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="110"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="113"/> + <source>&Send</source> + <translation type="unfinished">&Enviar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="116"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="123"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="130"/> + <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/GitBisectLogBrowserDialog.ui" line="133"/> + <source>&Password Mode</source> + <translation type="unfinished">Modo &Senha</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="136"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="57"/> + <source>&Refresh</source> + <translation type="unfinished">Atualiza&r</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="59"/> + <source>Press to refresh the list of commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="175"/> + <source>Process Generation Error</source> + <translation type="unfinished">Erro na Criação de Processo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="175"/> + <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> +</context> +<context> + <name>GitBisectStartDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="14"/> + <source>Git Bisect Start</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="23"/> + <source>Bad Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="30"/> + <source>Enter a bad commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="37"/> + <source>Good Commits:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="44"/> + <source>Enter a list of good commits separated by space</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="51"/> + <source>Select to not checkout the working tree</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="54"/> + <source>Don't checkout working tree</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBlameDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="14"/> + <source>Git Blame</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="45"/> + <source>Commit</source> + <translation type="unfinished">Cometido</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="50"/> + <source>Author</source> + <translation type="unfinished">Autor</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="55"/> + <source>Date</source> + <translation type="unfinished">Data</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="60"/> + <source>Time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="65"/> + <source>Line</source> + <translation type="unfinished">Linha</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="79"/> + <source>Errors</source> + <translation type="unfinished">Erros</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="98"/> + <source>Input</source> + <translation type="unfinished">Entrada</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="120"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="123"/> + <source>&Send</source> + <translation type="unfinished">&Enviar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="126"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="133"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="140"/> + <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/GitBlameDialog.ui" line="143"/> + <source>&Password Mode</source> + <translation type="unfinished">Modo &Senha</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="146"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="119"/> + <source>Process Generation Error</source> + <translation type="unfinished">Erro na Criação de Processo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="119"/> + <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> +</context> +<context> + <name>GitBranchDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="14"/> + <source>Git Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="23"/> + <source>Branch Action</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="29"/> + <source>Select to create a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="32"/> + <source><b>Create Branch</b> +<p>Select this entry in order to create a branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="36"/> + <source>Create</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="46"/> + <source>Select to rename a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="49"/> + <source><b>Rename</b> +<p>Select this entry in order to rename the selected branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="53"/> + <source>Rename</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="60"/> + <source>Select to delete a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="63"/> + <source><b>Delete Branch</b> +<p>Select this entry in order to delete the selected branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="67"/> + <source>Delete</source> + <translation type="unfinished">Apagar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="74"/> + <source>Select to create a new branch and switch to it</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="77"/> + <source><b>Create &amp; Switch</b>\n<p>Select this entry in order to create a new branch and switch the working tree to it.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="80"/> + <source>Create && Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="87"/> + <source>Select to create a tracking branch and switch to it</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="90"/> + <source><b>Create Tracking Branch &amp; Switch</b>\n<p>Select this entry in order to create a new branch tracking a remote repository branch. The working tree is switched to it.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="93"/> + <source>Create Tracking Branch && Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="100"/> + <source>Select to associate a remote branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="209"/> + <source>Set Tracking Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="110"/> + <source>Select to de-associate a remote branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="113"/> + <source>Unset Tracking Branch Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="125"/> + <source>Name:</source> + <translation type="unfinished">Nome:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="138"/> + <source>Enter the name of the branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="141"/> + <source><b>Branch Name</b> +<p>Enter the name of the branch to be created, deleted or moved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="157"/> + <source>Create Branch</source> + <translation type="unfinished">Criar Ramo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="163"/> + <source>Revision:</source> + <translation type="unfinished">Revisão:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="170"/> + <source>Enter a revision at which to start the branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="183"/> + <source>Rename Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="189"/> + <source>New Name:</source> + <translation type="unfinished">Nome Novo:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="196"/> + <source>Enter a new name for the selected branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="215"/> + <source>Remote Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="228"/> + <source>Select the remote branch to associate</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="238"/> + <source>Select to enforce the create operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="241"/> + <source>Enforce Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBranchPushDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="14"/> + <source>Git Push Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="23"/> + <source>Branch Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="36"/> + <source>Select the branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="43"/> + <source>Remote Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="56"/> + <source>Select the remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.py" line="36"/> + <source><all branches></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBundleDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="14"/> + <source>Git Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Revisão</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="29"/> + <source>Select to specify a revision or revision range</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="32"/> + <source>Revisions:</source> + <translation type="unfinished">Revisões:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="42"/> + <source>Enter revisions or revision range expressions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished">Selecionar para especificar uma revisão por uma etiqueta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="52"/> + <source>Tag:</source> + <translation type="unfinished">Etiqueta:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="62"/> + <source>Enter a tag name</source> + <translation type="unfinished">Introduzir o nome da etiqueta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="72"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished">Selecionar para especificar uma revisão por ramo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="75"/> + <source>Branch:</source> + <translation type="unfinished">Ramo:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="85"/> + <source>Enter a branch name</source> + <translation type="unfinished">Introduzir um nome de ramo</translation> + </message> +</context> +<context> + <name>GitCherryPickDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="14"/> + <source>Git Cherry-pick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="23"/> + <source>Commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="29"/> + <source>Enter commits by id, branch or tag one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="45"/> + <source>Select to append cherry-pick info to the commit message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="48"/> + <source>Append Cherry-pick &Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="58"/> + <source>Select to add a 'Signed-off-by' line to the commit message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="61"/> + <source>Append '&Signed-off-by' line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="68"/> + <source>Select to not commit the cherry-pick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="71"/> + <source>Don't &commit</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitCommandDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="14"/> + <source>Git Command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="23"/> + <source>Git Command:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="36"/> + <source>Enter the Git command to be executed with all necessary parameters</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="39"/> + <source><b>Git Command</b> +<p>Enter the Git command to be executed including all necessary +parameters. If a parameter of the commandline includes a space you have to +surround this parameter by single or double quotes. Do not include the name +of the Git client executable (i.e. git).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="65"/> + <source>Project Directory:</source> + <translation type="unfinished">Diretorio do Projeto:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="78"/> + <source>This shows the root directory of the current project.</source> + <translation type="unfinished">Mostra o diretorio raiz do projeto atual.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="81"/> + <source>project directory</source> + <translation type="unfinished">diretorio do projeto</translation> + </message> +</context> +<context> + <name>GitCommitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="14"/> + <source>Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="20"/> + <source>Commit Message</source> + <translation type="unfinished">Mensagem de Cometido</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="26"/> + <source>Enter the log message.</source> + <translation type="unfinished">Introduzir a mensagem de Registo.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="29"/> + <source><b>Log Message</b> +<p>Enter the log message for the commit action.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="43"/> + <source>Recent commit messages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="50"/> + <source>Select a recent commit message to use</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="60"/> + <source>Select to commit only staged changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="63"/> + <source>Commit staged changes only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="70"/> + <source>Select to amend the last commit (leave message empty to keep it)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="73"/> + <source>Amend the last commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="80"/> + <source>Select to reset the author information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="83"/> + <source>Reset Author Info</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitCopyDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="14"/> + <source>Git Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="25"/> + <source>Source:</source> + <translation type="unfinished">Origem:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="32"/> + <source>Shows the name of the source</source> + <translation type="unfinished">Mostra o nome da origem</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="35"/> + <source><b>Source name</b> +<p>This field shows the name of the source.</p></source> + <translation type="unfinished"><b>Nome origem</b> +<p>Este campo mostra o nome da origem.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="46"/> + <source>Enter the target name</source> + <translation type="unfinished">Introduzir o nome do alvo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="49"/> + <source><b>Target name</b> +<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> + <translation type="unfinished"><b>Nome de Destino</b> +<p>Introduzir o novo nome neste campo. O destino deve ser o novo nome ou uma rota absoluta.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="57"/> + <source>Target:</source> + <translation type="unfinished">Destino:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="64"/> + <source>Press to open a selection dialog</source> + <translation type="unfinished">Pressionar para abrir um dialogo de seleção</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="67"/> + <source><b>Target directory</b> +<p>Select the target name for the operation via a selection dialog.</p></source> + <translation type="unfinished"><b>Directorio Destino</b> +<p>Selecionar o nome de destino para a operação através de uma caixa de diálogo de seleção.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="77"/> + <source>Select to force the operation</source> + <translation type="unfinished">Selecionar para forçar a operação</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="80"/> + <source>Enforce operation</source> + <translation type="unfinished">Forçar operação</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.py" line="51"/> + <source>Git Move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.py" line="89"/> + <source>Select target</source> + <translation type="unfinished">Selecionar destino</translation> + </message> +</context> +<context> + <name>GitDescribeDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="14"/> + <source>Git Tag List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="42"/> + <source>Commit</source> + <translation type="unfinished">Cometido</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="47"/> + <source>Tag Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="61"/> + <source>Errors</source> + <translation type="unfinished">Erros</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="80"/> + <source>Input</source> + <translation type="unfinished">Entrada</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="102"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="105"/> + <source>&Send</source> + <translation type="unfinished">&Enviar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="108"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="115"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="122"/> + <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/GitDescribeDialog.ui" line="125"/> + <source>&Password Mode</source> + <translation type="unfinished">Modo &Senha</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="128"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py" line="117"/> + <source>Process Generation Error</source> + <translation type="unfinished">Erro na Criação de Processo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py" line="117"/> + <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> +</context> +<context> + <name>GitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="14"/> + <source>Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="29"/> + <source>Output</source> + <translation type="unfinished">Saída</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="57"/> + <source>Errors</source> + <translation type="unfinished">Erros</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="76"/> + <source>Input</source> + <translation type="unfinished">Entrada</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="98"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="101"/> + <source>&Send</source> + <translation type="unfinished">&Enviar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="104"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="111"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="118"/> + <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/GitDialog.ui" line="121"/> + <source>&Password Mode</source> + <translation type="unfinished">Modo &Senha</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="124"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="88"/> + <source>Additional Output</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="104"/> + <source>Process canceled.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="116"/> + <source>Process finished successfully.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="118"/> + <source>Process crashed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="120"/> + <source>Proces finished with exit code {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/> + <source>Process Generation Error</source> + <translation type="unfinished">Erro na Criação de Processo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/> + <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> +</context> +<context> + <name>GitDiffDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="14"/> + <source>Git Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="26"/> + <source>Difference</source> + <translation type="unfinished">Diferença</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="39"/> + <source><b>Git Diff</b><p>This shows the output of the git diff command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="56"/> + <source><b>Git Diff</b><p>This shows the output of the git diff command (stage to repo) if the dialog was asked to show separate diffs.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="85"/> + <source>Errors</source> + <translation type="unfinished">Erros</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="48"/> + <source>Refresh</source> + <translation type="unfinished">Atualizar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="50"/> + <source>Press to refresh the display</source> + <translation type="unfinished">Pressionar para atualizar o ecrã</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="96"/> + <source>Working Tree to Staging Area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="97"/> + <source>Staging Area to HEAD Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="98"/> + <source>Working Tree to HEAD Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="99"/> + <source>Working to Staging (top) and Staging to HEAD (bottom)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="101"/> + <source>Stash Contents</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="102"/> + <source>Stash Contents of {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="171"/> + <source>Difference ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="179"/> + <source>Process Generation Error</source> + <translation type="unfinished">Erro na Criação de Processo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="179"/> + <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/GitDiffDialog.py" line="206"/> + <source>There is no difference.</source> + <translation type="unfinished">Não há diferenças.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="227"/> + <source><Start></source> + <translation type="unfinished"><Inicio></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="228"/> + <source><End></source> + <translation type="unfinished"><Fim></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="356"/> + <source>Save Diff</source> + <translation type="unfinished">Gravar Diff</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="322"/> + <source>Patch Files (*.diff)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="339"/> + <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="356"/> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation type="unfinished"><p>O ficheiro remendo <b>{0}</b> não se pôde gravar.<br />Motivo: {1}</p></translation> + </message> +</context> +<context> + <name>GitFetchDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="14"/> + <source>Git Fetch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="23"/> + <source>Remote Repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="30"/> + <source>Select the remote repository to fetch from</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="46"/> + <source>Remote Branches:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="56"/> + <source>Press to update the list of remote branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="59"/> + <source>Update</source> + <translation type="unfinished">Atualizar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="81"/> + <source>Select the remote branches to be fetched</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="94"/> + <source>Local Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="101"/> + <source>Select the local branch to fetch into</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="111"/> + <source>Select to remove non-existing tracking references </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="114"/> + <source>Prune obsolete tracking references</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="121"/> + <source>Select to fetch tags as well</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="124"/> + <source>Include tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.py" line="36"/> + <source><All></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.py" line="37"/> + <source><Custom></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitListDialog.ui" line="14"/> + <source>Git Select</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitListDialog.ui" line="23"/> + <source>Select from the list:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitLogBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="14"/> + <source>Git Log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="22"/> + <source>Select action from menu</source> + <translation type="unfinished">Selecionar ação do menu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="45"/> + <source>Select the mode (find or filter)</source> + <translation type="unfinished">Selecionar o modo (encontrar ou filtro)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="65"/> + <source>From:</source> + <translation type="unfinished">Desde:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="72"/> + <source>Enter the start date</source> + <translation type="unfinished">Introduzir data de inicio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="82"/> + <source>To:</source> + <translation type="unfinished">Para:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="89"/> + <source>Enter the end date</source> + <translation type="unfinished">Introduzir data final</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="112"/> + <source>Select the field to filter on</source> + <translation type="unfinished">Selecionar o campo a filtrar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="119"/> + <source>Enter the regular expression to filter on or search for</source> + <translation type="unfinished">Introduzir a expressão regular a procurar ou para filtrar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="126"/> + <source>Press to find the previous occurrence</source> + <translation type="unfinished">Pressionar para encontrar a ocurrência anterior</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="133"/> + <source>Press to find the next occurrence</source> + <translation type="unfinished">Pressionar para encontrar a ocurrência seguinte</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="174"/> + <source>Graph</source> + <translation type="unfinished">Gráfico</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="101"/> + <source>Commit ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="102"/> + <source>Author</source> + <translation type="unfinished">Autor</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="189"/> + <source>Date</source> + <translation type="unfinished">Data</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="103"/> + <source>Committer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="199"/> + <source>Commit Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="104"/> + <source>Subject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="209"/> + <source>Branches</source> + <translation type="unfinished">Ramos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="214"/> + <source>Tags</source> + <translation type="unfinished">Etiquetas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="224"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="234"/> + <source>Press to move down in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="257"/> + <source>Press to get the next bunch of log entries</source> + <translation type="unfinished">Pressionar para obter a próxima cambada de entradas no registo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="260"/> + <source>&Next</source> + <translation type="unfinished">Segui&nte</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="267"/> + <source>Enter the limit of entries to fetch</source> + <translation type="unfinished">Introduzir o limite de entradas a recuperar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="286"/> + <source>Select to stop listing log messages at a copy or move</source> + <translation type="unfinished">Selecionar para parar de listar mensagens de registo ao copiar ou mover</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="289"/> + <source>Stop on Copy/Move</source> + <translation type="unfinished">Parar em Copiar/Mover</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="378"/> + <source>Action</source> + <translation type="unfinished">Ação</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="383"/> + <source>Path</source> + <translation type="unfinished">Rota</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="388"/> + <source>Additions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="393"/> + <source>Deletions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="398"/> + <source>Copy from</source> + <translation type="unfinished">Copiar de</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2119"/> + <source>Differences</source> + <translation type="unfinished">Diferenças</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="445"/> + <source><a href="save:me">Save</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="491"/> + <source>Errors</source> + <translation type="unfinished">Erros</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="497"/> + <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/GitLogBrowserDialog.ui" line="513"/> + <source>Input</source> + <translation type="unfinished">Entrada</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="535"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="538"/> + <source>&Send</source> + <translation type="unfinished">&Enviar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="541"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="548"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="555"/> + <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/GitLogBrowserDialog.ui" line="558"/> + <source>&Password Mode</source> + <translation type="unfinished">Modo &Senha</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="561"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="88"/> + <source>&Refresh</source> + <translation type="unfinished">Atualiza&r</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="90"/> + <source>Press to refresh the list of commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="98"/> + <source>Find</source> + <translation type="unfinished">Encontrar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="99"/> + <source>Filter</source> + <translation type="unfinished">Filtro</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="105"/> + <source>File</source> + <translation type="unfinished">Ficheiro</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="122"/> + <source><table><tr><td><b>Commit ID</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2} &lt;{3}&gt;</td></tr><tr><td><b>Commit Date</b></td><td>{4}</td></tr><tr><td><b>Committer</b></td><td>{5} &lt;{6}&gt;</td></tr>{7}<tr><td><b>Subject</b></td><td>{8}</td></tr>{9}</table></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="134"/> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Pais</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="137"/> + <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="140"/> + <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Ramos</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="143"/> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Etiquetas</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="146"/> + <source><tr><td><b>Message</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="198"/> + <source>Added</source> + <translation type="unfinished">Adicionado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="199"/> + <source>Deleted</source> + <translation type="unfinished">Apagado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="200"/> + <source>Modified</source> + <translation type="unfinished">Alterado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="201"/> + <source>Copied</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="202"/> + <source>Renamed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="203"/> + <source>Type changed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="204"/> + <source>Unmerged</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="205"/> + <source>Unknown</source> + <translation type="unfinished">Desconhecido</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="241"/> + <source>Show Commit ID Column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="243"/> + <source>Press to show the commit ID column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="251"/> + <source>Show Author Columns</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="253"/> + <source>Press to show the author columns</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="261"/> + <source>Show Committer Columns</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="263"/> + <source>Press to show the committer columns</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="271"/> + <source>Show Branches Column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="273"/> + <source>Press to show the branches column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="281"/> + <source>Show Tags Column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="283"/> + <source>Press to show the Tags column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="313"/> + <source>Copy Commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="315"/> + <source>Cherry-pick the selected commits to the current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="320"/> + <source>Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="322"/> + <source>Tag the selected commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1812"/> + <source>Branch</source> + <translation type="unfinished">Ramo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="326"/> + <source>Create a new branch at the selected commit.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="328"/> + <source>Branch && Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="330"/> + <source>Create a new branch at the selected commit and switch the work tree to it.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1864"/> + <source>Switch</source> + <translation type="unfinished">Mudar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="336"/> + <source>Switch the working directory to the selected commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1890"/> + <source>Show Short Log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="342"/> + <source>Show a dialog with a log output for release notes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="345"/> + <source>Describe</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="347"/> + <source>Show the most recent tag reachable from a commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="648"/> + <source>The git process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="651"/> + <source>Could not start the git executable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="654"/> + <source>Git Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="769"/> + <source>{0} ({1}%)</source> + <comment>action, confidence</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="835"/> + <source>Process Generation Error</source> + <translation type="unfinished">Erro na Criação de Processo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="835"/> + <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/GitLogBrowserDialog.py" line="1275"/> + <source>Side-by-Side Diff to Parent {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1287"/> + <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1725"/> + <source>Copy Changesets</source> + <translation type="unfinished">Copiar Conjuntos de Alterações</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1864"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1890"/> + <source>Select a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/> + <source>Select a default branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/> + <source>Branch & Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2073"/> + <source>Find Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2073"/> + <source>'{0}' was not found.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2133"/> + <source>Differences to Parent {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2148"/> + <source>Diff to Parent {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2174"/> + <source>There is no difference.</source> + <translation type="unfinished">Não há diferenças.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2337"/> + <source>Save Diff</source> + <translation type="unfinished">Gravar Diff</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2303"/> + <source>Patch Files (*.diff)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2320"/> + <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2337"/> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation type="unfinished"><p>O ficheiro remendo <b>{0}</b> não se pôde gravar.<br />Motivo: {1}</p></translation> + </message> +</context> +<context> + <name>GitMergeDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="14"/> + <source>Git Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Revisão</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="29"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="32"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="42"/> + <source>Enter a commit id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished">Selecionar para especificar uma revisão por uma etiqueta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="52"/> + <source>Tag:</source> + <translation type="unfinished">Etiqueta:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="62"/> + <source>Enter a tag name</source> + <translation type="unfinished">Introduzir o nome da etiqueta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="72"/> + <source>Select to specify a revision by a local branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="75"/> + <source>Local Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="85"/> + <source>Enter a local branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="95"/> + <source>Select to specify a revision by a remote branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="98"/> + <source>Remote Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="108"/> + <source>Enter a remote branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="118"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished">Selecionar para não especificar uma revisão específica</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="121"/> + <source>No commit selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="134"/> + <source>Select to commit the merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="137"/> + <source>Commit Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="146"/> + <source>Commit Message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="153"/> + <source>Enter a message for the merge commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="163"/> + <source>Select to append the log summaries of merged commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="166"/> + <source>Add Log Message Summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="176"/> + <source>Select to show diff statistics at the end of the merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="179"/> + <source>Show diff statistics</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitNewProjectOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="14"/> + <source>New Project from Repository</source> + <translation type="unfinished">Projeto novo desde Repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="17"/> + <source><b>New Project from Repository Dialog</b> +<p>Enter the various repository infos into the entry fields. These values are used, when the new project is retrieved from the repository.</p> +<p>For remote repositories the URL must contain the hostname.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="28"/> + <source>&URL:</source> + <translation type="unfinished">&URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="44"/> + <source>Enter the URL of the repository</source> + <translation type="unfinished">Introduzir URL do repositório</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="60"/> + <source>Select the repository url via a directory selection dialog</source> + <translation type="unfinished">Selecionar url do repositorio através de uma caixa de diálogo de seleção de diretorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="67"/> + <source>Press to clear the history of entered repository URLs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="74"/> + <source>Project &Directory:</source> + <translation type="unfinished">&Diretório do Projeto:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="84"/> + <source>Enter the directory of the new project.</source> + <translation type="unfinished">Introduzir o diretório do novo projeto.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="87"/> + <source><b>Project Directory</b> +<p>Enter the directory of the new project. It will be retrieved from +the repository and be placed in this directory.</p></source> + <translation type="unfinished"><b>Directório do Projeto</b> +<p>Introduza o diretório do novo projeto. Será + obtido do repositório e posto neste diretório.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py" line="87"/> + <source>Select Repository-Directory</source> + <translation type="unfinished">Selecionar o Diretorio do Repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py" line="102"/> + <source>Select Project Directory</source> + <translation type="unfinished">Selecionar o Diretório do Projeto</translation> + </message> +</context> +<context> + <name>GitOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="14"/> + <source>Initial Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="17"/> + <source><b>Initial Commit Dialog</b> +<p>Enter the message for the initial commit.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="29"/> + <source>Commit &Message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="39"/> + <source>Enter the log message for the new project.</source> + <translation type="unfinished">Introduzir a mensagem de registo para o novo projeto.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="42"/> + <source><b>Log Message</b> +<p>Enter the log message to be used for the new project.</p></source> + <translation type="unfinished"><b>Mensagem de Registo</b> +<p>Introduzir a mensagem de registo a usar para o novo projeto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="46"/> + <source>new project started</source> + <translation type="unfinished">projeto novo iniciado</translation> + </message> +</context> +<context> + <name>GitPage</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="14"/> + <source>Select to perform an expensive copy detection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="20"/> + <source><b>Configure Git Interface</b></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="40"/> + <source>Log</source> + <translation type="unfinished">Registo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="46"/> + <source>No. of log messages shown:</source> + <translation type="unfinished">Nº de mensagens de registo mostradas:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="53"/> + <source>Enter the number of log messages to be shown</source> + <translation type="unfinished">Introduzir o número de mensagens de registo a mostrar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="82"/> + <source>No. of subject characters shown in list:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="89"/> + <source>Enter the number of characters of the commit subject to be shown in the list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="95"/> + <source>All</source> + <translation type="unfinished">Tudo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="105"/> + <source>Select to perform expensive copy detection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="108"/> + <source>Find copies harder</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="118"/> + <source>Commit</source> + <translation type="unfinished">Cometido</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="124"/> + <source>No. of commit messages to remember:</source> + <translation type="unfinished">Nº de mensagens de cometido a recordar:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="131"/> + <source>Enter the number of commit messages to remember</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="160"/> + <source>Commit ID length:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="167"/> + <source>Enter the number of character to show for the commit ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="199"/> + <source>Cleanup</source> + <translation type="unfinished">Limpar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="205"/> + <source>Pattern:</source> + <translation type="unfinished">Padrão:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="212"/> + <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> + <translation type="unfinished">Introduzir o padrão de nomes de ficheiro a usar para limpar (entradas separadas por um espaço)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="222"/> + <source>Repository Optimization</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="228"/> + <source>Select this to use the '--aggressive' option for garbage collection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="231"/> + <source>Perform aggressive repository optimization</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="241"/> + <source>Edit the Git configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="244"/> + <source>Edit configuration file</source> + <translation type="unfinished">Editar ficheiro de configuração</translation> + </message> +</context> +<context> + <name>GitPatchFilesDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py" line="83"/> + <source>Patch Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="37"/> + <source>Press to add patch files to the list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="44"/> + <source>Press to delete the selected patch files from the list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="58"/> + <source>Press to move the selected file up</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="65"/> + <source>Press to move the selected file down</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="91"/> + <source>Strip Count:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="98"/> + <source>Enter number of leading directories to strip off (default 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="129"/> + <source>Select, if the patch has inaccurate end-of-file markers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="132"/> + <source>Patch has inaccurate end-of-file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="139"/> + <source>Select, if the line counts of the patch header may be wrong</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="142"/> + <source>Don't trust line counts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py" line="83"/> + <source>Patch Files (*.diff *.patch);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitPatchStatisticsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="14"/> + <source>Patch Statistics</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="23"/> + <source>Insertions and Deletions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="52"/> + <source># Insertions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="57"/> + <source># Deletions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="62"/> + <source>File</source> + <translation type="unfinished">Ficheiro</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="70"/> + <source>Summary Information:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="122"/> + <source>Process Generation Error</source> + <translation type="unfinished">Erro na Criação de Processo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="122"/> + <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> +</context> +<context> + <name>GitProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="488"/> + <source>Version Control</source> + <translation type="unfinished">Control de Versão</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="499"/> + <source>Commit changes to repository...</source> + <translation type="unfinished">Cometer alterações no repositório...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="505"/> + <source>Add/Stage to repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="508"/> + <source>Unstage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="514"/> + <source>Remove from repository (and disk)</source> + <translation type="unfinished">Retirar do repositorio (e disco)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="588"/> + <source>Remove from repository only</source> + <translation type="unfinished">Retirar apenas do repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="430"/> + <source>Copy</source> + <translation type="unfinished">Copiar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="432"/> + <source>Move</source> + <translation type="unfinished">Mover</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="435"/> + <source>Show log browser</source> + <translation type="unfinished">Mostrar navegador de registos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="520"/> + <source>Show status</source> + <translation type="unfinished">Mostrar estado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="525"/> + <source>Show differences</source> + <translation type="unfinished">Mostrar diferenças</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="229"/> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="529"/> + <source>Show differences (extended)</source> + <translation type="unfinished">Mostrar diferenças (extendido)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="238"/> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished">Selecionar para mostrar as diferenças lado-a-lado (extendido)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="244"/> + <source>Show annotated file</source> + <translation type="unfinished">Mostrar ficheiro anotado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="535"/> + <source>Revert changes</source> + <translation type="unfinished">Desfazer alterações</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="542"/> + <source>Select all local file entries</source> + <translation type="unfinished">Selecionar todas as entradas de ficheiros locais</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="544"/> + <source>Select all versioned file entries</source> + <translation type="unfinished">Selecionar todas as entradas de ficheiros versionados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="546"/> + <source>Select all local directory entries</source> + <translation type="unfinished">Selecionar todas as entradas de diretorios locais</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="548"/> + <source>Select all versioned directory entries</source> + <translation type="unfinished">Selecionar todas as entradas de diretorios versionados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="551"/> + <source>Configure...</source> + <translation type="unfinished">Configurar...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="588"/> + <source>Do you really want to remove these files from the repository?</source> + <translation type="unfinished">Tem a certeza de que quer retirar estes ficheiros do repositorio?</translation> + </message> +</context> +<context> + <name>GitProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="73"/> + <source>New from repository</source> + <translation type="unfinished">Novo desde repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="73"/> + <source>&New from repository...</source> + <translation type="unfinished">&Novo desde repositorio...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="78"/> + <source>Create (clone) a new project from a Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="81"/> + <source><b>New from repository</b><p>This creates (clones) a new local project from a Git repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="89"/> + <source>Fetch changes</source> + <translation type="unfinished">Trazer alterações</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="94"/> + <source>Fetch changes from a remote repository</source> + <translation type="unfinished">Trazer alterações de um repositório remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="97"/> + <source><b>Fetch changes</b><p>This fetches changes from a remote repository into the local repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="105"/> + <source>Pull changes</source> + <translation type="unfinished">Puxar alterações</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="110"/> + <source>Pull changes from a remote repository and update the work area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="113"/> + <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository and updates the work area.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="121"/> + <source>Commit changes to repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="121"/> + <source>Commit changes to repository...</source> + <translation type="unfinished">Cometer alterações no repositório...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="126"/> + <source>Commit changes of the local project to the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="129"/> + <source><b>Commit changes to repository</b><p>This commits changes of the local project to the Git repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="137"/> + <source>Push changes</source> + <translation type="unfinished">Empurrar alterações</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="142"/> + <source>Push changes to a remote repository</source> + <translation type="unfinished">Empurra alterações ao repositorio remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="145"/> + <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> + <translation type="unfinished"><b>Empurrar alterações</b><p>Empurra as alterações do repositorio local a um repositorio remoto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="153"/> + <source>Export from repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="153"/> + <source>&Export from repository...</source> + <translation type="unfinished">&Exportar do repositório...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="158"/> + <source>Export a project from the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="161"/> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation type="unfinished"><b>Exportar do repositorio</b><p>Exporta um projeto do repositorio.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="168"/> + <source>Show log browser</source> + <translation type="unfinished">Mostrar navegador de registos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="173"/> + <source>Show a dialog to browse the log of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="176"/> + <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="185"/> + <source>Show reflog browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="190"/> + <source>Show a dialog to browse the reflog of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="193"/> + <source><b>Show reflog browser</b><p>This shows a dialog to browse the reflog of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="202"/> + <source>Show differences</source> + <translation type="unfinished">Mostrar diferenças</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="202"/> + <source>Show &differences...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="207"/> + <source>Show the differences of the local project to the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="210"/> + <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="218"/> + <source>Show differences (extended)</source> + <translation type="unfinished">Mostrar diferenças (extendido)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="218"/> + <source>Show differences (extended) ...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="223"/> + <source>Show the difference of revisions of the project to the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="226"/> + <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="234"/> + <source>Show status</source> + <translation type="unfinished">Mostrar estado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="234"/> + <source>Show &status...</source> + <translation type="unfinished">Mostrar e&stado...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="239"/> + <source>Show the status of the local project</source> + <translation type="unfinished">Mostrar estado do projeto local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="242"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="249"/> + <source>Switch</source> + <translation type="unfinished">Mudar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="249"/> + <source>S&witch...</source> + <translation type="unfinished">M&udar...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="254"/> + <source>Switch the working directory to another revision</source> + <translation type="unfinished">Mudar o diretorio de trabalho a outra revisão</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="257"/> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation type="unfinished"><b>Mudar</b><p>Muda o diretorio de trabalho a outra revisão.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="265"/> + <source>Tag in repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="265"/> + <source>&Tag in repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="270"/> + <source>Perform tag operations for the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="273"/> + <source><b>Tag in repository</b><p>This performs selectable tag operations for the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="281"/> + <source>List tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="281"/> + <source>&List tags...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="285"/> + <source>List tags of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="288"/> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="295"/> + <source>Show most recent tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="299"/> + <source>Show the most recent tag reachable from the work tree</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="302"/> + <source><b>Show most recent tag</b><p>This shows the most recent tag reachable from the work tree.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="310"/> + <source>List branches</source> + <translation type="unfinished">Listar ramos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="310"/> + <source>&List branches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="314"/> + <source>List branches of the project</source> + <translation type="unfinished">Listar os ramos do projeto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="317"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation type="unfinished"><b>Listar ramos</b><p>Lista os ramos do projeto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="324"/> + <source>List merged branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="324"/> + <source>List &merged branches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="328"/> + <source>List merged branches of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="331"/> + <source><b>List merged branches</b><p>This lists the merged branches of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="339"/> + <source>List non-merged branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="339"/> + <source>List &non-merged branches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="343"/> + <source>List non-merged branches of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="346"/> + <source><b>List non-merged branches</b><p>This lists the non-merged branches of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="354"/> + <source>Branch in repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="354"/> + <source>&Branch in repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="359"/> + <source>Perform branch operations for the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="362"/> + <source><b>Branch in repository</b><p>This performs selectable branch operations for the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="370"/> + <source>Delete Remote Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="370"/> + <source>&Delete Remote Branch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="374"/> + <source>Delete a branch from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="377"/> + <source><b>Delete Remote Branch</b><p>This deletes a branch from a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="384"/> + <source>Show current branch</source> + <translation type="unfinished">Mostrar ramo atual</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="388"/> + <source>Show the current branch of the project</source> + <translation type="unfinished">Mostrar o ramo atual do projeto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="391"/> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation type="unfinished"><b>Mostrar ramo atual</b><p>Mostra o ramo atual do projeto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="398"/> + <source>Revert changes</source> + <translation type="unfinished">Desfazer alterações</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="398"/> + <source>Re&vert changes</source> + <translation type="unfinished">&Desfazer alterações</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="403"/> + <source>Revert all changes made to the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="406"/> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="413"/> + <source>Unstage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="413"/> + <source>&Unstage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="418"/> + <source>Unstage all changes made to the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="421"/> + <source><b>Unstage changes</b><p>This unstages all changes made to the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="428"/> + <source>Merge</source> + <translation type="unfinished">Mesclar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="428"/> + <source>Mer&ge changes...</source> + <translation type="unfinished">&Mesclar alterações...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="433"/> + <source>Merge changes into the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="436"/> + <source><b>Merge</b><p>This merges changes into the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="443"/> + <source>Cancel uncommitted/failed merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="447"/> + <source>Cancel an uncommitted or failed merge and lose all changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="450"/> + <source><b>Cancel uncommitted/failed merge</b><p>This cancels an uncommitted or failed merge causing all changes to be lost.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="458"/> + <source>Commit failed merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="462"/> + <source>Commit a failed merge after conflicts have been resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="465"/> + <source><b>Commit failed merge</b><p>This commits a failed merge after conflicts have been resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="473"/> + <source>Cleanup</source> + <translation type="unfinished">Limpar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="473"/> + <source>Cleanu&p</source> + <translation type="unfinished">Lim&par</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="477"/> + <source>Cleanup the local project</source> + <translation type="unfinished">Limpar o projeto local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="480"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation type="unfinished"><b>Limpar</b><p>Realiza uma limpeza ao projeto local.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="487"/> + <source>Execute command</source> + <translation type="unfinished">Executar comando</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="487"/> + <source>E&xecute command...</source> + <translation type="unfinished">E&xecutar comando...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="491"/> + <source>Execute an arbitrary Git command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="494"/> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Git command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="502"/> + <source>Configure</source> + <translation type="unfinished">Configurar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="502"/> + <source>Configure...</source> + <translation type="unfinished">Configurar...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="506"/> + <source>Show the configuration dialog with the Git page selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="509"/> + <source><b>Configure</b><p>Show the configuration dialog with the Git page selected.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="517"/> + <source>Show Remotes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="517"/> + <source>Show Remotes...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="521"/> + <source>Show the available remote repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="539"/> + <source><b>Show Remotes</b><p>This shows the remote repositories available for pulling, fetching and pushing.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1765"/> + <source>Show Remote Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="532"/> + <source>Show Remote Info...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="536"/> + <source>Show information about a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1161"/> + <source>Add</source> + <translation type="unfinished">Adicionar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="547"/> + <source>Add...</source> + <translation type="unfinished">Adicionar...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="551"/> + <source>Add a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="554"/> + <source><b>Add</b><p>This adds a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1785"/> + <source>Remove</source> + <translation type="unfinished">Retirar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="561"/> + <source>Remove...</source> + <translation type="unfinished">Retirar...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="565"/> + <source>Remove a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="568"/> + <source><b>Remove</b><p>This removes a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1799"/> + <source>Prune</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="575"/> + <source>Prune...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="579"/> + <source>Prune stale remote-tracking branches of a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="582"/> + <source><b>Prune</b><p>This prunes stale remote-tracking branches of a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <source>Rename</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="590"/> + <source>Rename...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="594"/> + <source>Rename a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="597"/> + <source><b>Rename</b><p>This renames a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1833"/> + <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> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="649"/> + <source>Cancel 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> + <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> + <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> + <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> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> + <source>Show stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> + <source>Show stash...</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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="702"/> + <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"/> + <source>Restore && Keep</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="714"/> + <source>Restore a stash but keep it</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="717"/> + <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"/> + <source>Restore && Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="728"/> + <source>Restore a stash and delete it</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="731"/> + <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"/> + <source>Create Branch</source> + <translation type="unfinished">Criar Ramo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="742"/> + <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"/> + <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"/> + <source>Delete</source> + <translation type="unfinished">Apagar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="757"/> + <source>Delete a stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="760"/> + <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"/> + <source>Delete All</source> + <translation type="unfinished">Apagar Tudo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="771"/> + <source>Delete all stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="774"/> + <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"/> + <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"/> + <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"/> + <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"/> + <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"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="799"/> + <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> + <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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="844"/> + <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="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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="862"/> + <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"/> + <source>Repository Statistics</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <source>Repository Statistics...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="873"/> + <source>Show some statistics of the local repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="876"/> + <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"/> + <source>Create Archive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="887"/> + <source>Create an archive from the local repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="890"/> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> + <source>List bundle heads...</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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="934"/> + <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"/> + <source>Apply Bundle (fetch)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <source>Apply Bundle (fetch)...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="945"/> + <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"/> + <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"/> + <source>Apply Bundle (pull)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="955"/> + <source>Apply Bundle (pull)...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="959"/> + <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"/> + <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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1003"/> + <source>Mark a selectable revision as good</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> + <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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1017"/> + <source>Mark a selectable revision as bad</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1020"/> + <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"/> + <source>Skip</source> + <translation type="unfinished">Saltar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <source>Skip...</source> + <translation type="unfinished">Saltar...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1031"/> + <source>Skip a selectable revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1034"/> + <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"/> + <source>Reset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <source>Reset...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1045"/> + <source>Reset the bisect session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1048"/> + <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"/> + <source>Show bisect log browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1060"/> + <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"/> + <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"/> + <source>Create replay file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1076"/> + <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"/> + <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"/> + <source>Edit replay file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1092"/> + <source>Edit a bisect replay file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1095"/> + <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"/> + <source>Replay session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1107"/> + <source>Replay a bisect session from file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1110"/> + <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"/> + <source>Check patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1121"/> + <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"/> + <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"/> + <source>Apply patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1136"/> + <source>Apply a list of patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1139"/> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1180"/> + <source>List the submodule of the current project</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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1195"/> + <source>Initialize the submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1198"/> + <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> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1244"/> + <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"/> + <source>Fetch and Update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1257"/> + <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>Synchronize URLs of submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1293"/> + <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"/> + <source>Show Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1306"/> + <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"/> + <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"/> + <source>Show Summary</source> + <translation type="unfinished">Mostrar Sumário</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1322"/> + <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"/> + <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"/> + <source>Administration</source> + <translation type="unfinished">Administração</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1360"/> + <source>Bundle Management</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="2237"/> + <source>Bisect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1397"/> + <source>Tags</source> + <translation type="unfinished">Etiquetas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1405"/> + <source>Branches</source> + <translation type="unfinished">Ramos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1418"/> + <source>Manage Changes</source> + <translation type="unfinished">Gerir Alterações</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1426"/> + <source>Remote Repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1436"/> + <source>Cherry-pick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1444"/> + <source>Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1459"/> + <source>Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1541"/> + <source>Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1646"/> + <source>Branch</source> + <translation type="unfinished">Ramo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <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"/> + <source>Pull</source> + <translation type="unfinished">Puxar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1715"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1734"/> + <source>Unstage Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <source>Select a remote repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1853"/> + <source>Copy Commits (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1872"/> + <source>Copy Commits (Quit)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1892"/> + <source>Copy Commits (Cancel)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1911"/> + <source>Save Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1961"/> + <source>Restore Stash</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitPullDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="14"/> + <source>Git Pull</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="23"/> + <source>Remote Repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="30"/> + <source>Select the remote repository to pull from</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="46"/> + <source>Remote Branches:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="56"/> + <source>Press to update the list of remote branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="59"/> + <source>Update</source> + <translation type="unfinished">Atualizar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="81"/> + <source>Select the remote branches to be pulled</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="94"/> + <source>Select to remove non-existing tracking references </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="97"/> + <source>Prune obsolete tracking references</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.py" line="36"/> + <source><All></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.py" line="37"/> + <source><Custom></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitPushDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="14"/> + <source>Git Push</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="25"/> + <source>Remote Repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="32"/> + <source>Select the remote repository to push to</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="48"/> + <source>Branches to be pushed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="70"/> + <source>Push?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="75"/> + <source>Local</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="80"/> + <source>Remote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="85"/> + <source>Force?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="93"/> + <source>Press to select all branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="96"/> + <source>Select All</source> + <translation type="unfinished">Selecionar Tudo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="106"/> + <source><b>WARNING: The "Force" option can result in dangling branches in the remote repository.</b></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="119"/> + <source>Select to push tags as well</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="122"/> + <source>Include tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="129"/> + <source>Select this to associate a remote tracking branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="132"/> + <source>Set tracking information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="139"/> + <source>Push Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="145"/> + <source>Select to push submodules automatically</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="148"/> + <source>on-demand</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="158"/> + <source>Select to check, if submodules were pushed already</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="161"/> + <source>check</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="168"/> + <source>Select to push submodules only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="171"/> + <source>only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="178"/> + <source>Select to not push any submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="181"/> + <source>no</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitReflogBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="14"/> + <source>Git Reflog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="42"/> + <source>Commit</source> + <translation type="unfinished">Cometido</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="47"/> + <source>Selector</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="52"/> + <source>Name</source> + <translation type="unfinished">Nome</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="57"/> + <source>Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="62"/> + <source>Subject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="72"/> + <source>Press to get the next bunch of log entries</source> + <translation type="unfinished">Pressionar para obter a próxima cambada de entradas no registo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="75"/> + <source>&Next</source> + <translation type="unfinished">Segui&nte</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="82"/> + <source>Enter the limit of entries to fetch</source> + <translation type="unfinished">Introduzir o limite de entradas a recuperar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="122"/> + <source>Errors</source> + <translation type="unfinished">Erros</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="128"/> + <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/GitReflogBrowserDialog.ui" line="144"/> + <source>Input</source> + <translation type="unfinished">Entrada</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="166"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="169"/> + <source>&Send</source> + <translation type="unfinished">&Enviar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="172"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="179"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="186"/> + <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/GitReflogBrowserDialog.ui" line="189"/> + <source>&Password Mode</source> + <translation type="unfinished">Modo &Senha</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="192"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="59"/> + <source>&Refresh</source> + <translation type="unfinished">Atualiza&r</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="61"/> + <source>Press to refresh the list of commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="200"/> + <source>Process Generation Error</source> + <translation type="unfinished">Erro na Criação de Processo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="200"/> + <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> +</context> +<context> + <name>GitRemoteRepositoriesDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="14"/> + <source>Git Remote Repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="17"/> + <source><b>Git Remote Repositories</b> +<p>This dialog shows the available remote repositories.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="30"/> + <source>Remote Repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="46"/> + <source>Name</source> + <translation type="unfinished">Nome</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="51"/> + <source>URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="56"/> + <source>Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="82"/> + <source>Press to add a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="85"/> + <source>&Add</source> + <translation type="unfinished">&Adicionar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="92"/> + <source>Press to rename the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="95"/> + <source>&Rename</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="102"/> + <source>Press to remove 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"/> + <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"/> + <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>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="217"/> + <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"/> + <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"/> + <source>&Password Mode</source> + <translation type="unfinished">Modo &Senha</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="230"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="51"/> + <source>Refresh</source> + <translation type="unfinished">Atualizar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="53"/> + <source>Press to refresh the repositories display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="148"/> + <source>Process Generation Error</source> + <translation type="unfinished">Erro na Criação de Processo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="148"/> + <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> +</context> +<context> + <name>GitRevisionSelectionDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="14"/> + <source>Git Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Revisão</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="29"/> + <source>Select to specify a revision by a revision expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="32"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="42"/> + <source>Enter a commit id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished">Selecionar para especificar uma revisão por uma etiqueta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="52"/> + <source>Tag:</source> + <translation type="unfinished">Etiqueta:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="68"/> + <source>Enter a tag name</source> + <translation type="unfinished">Introduzir o nome da etiqueta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="78"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished">Selecionar para especificar uma revisão por ramo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="81"/> + <source>Branch:</source> + <translation type="unfinished">Ramo:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="97"/> + <source>Enter a branch name</source> + <translation type="unfinished">Introduzir um nome de ramo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="107"/> + <source>Select to specify a revision by a remote branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="110"/> + <source>Remote Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="126"/> + <source>Enter a remote branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="136"/> + <source>Select HEAD revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="139"/> + <source>HEAD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="146"/> + <source>No revision selected</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitRevisionsSelectionDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="14"/> + <source>Git Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="23"/> + <source>Revision &1</source> + <translation type="unfinished">Revisão &1</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="137"/> + <source>Select to specify a revision by a revision expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="140"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="150"/> + <source>Enter a commit id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="157"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished">Selecionar para especificar uma revisão por uma etiqueta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="160"/> + <source>Tag:</source> + <translation type="unfinished">Etiqueta:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="170"/> + <source>Enter a tag name</source> + <translation type="unfinished">Introduzir o nome da etiqueta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="180"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished">Selecionar para especificar uma revisão por ramo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="183"/> + <source>Branch:</source> + <translation type="unfinished">Ramo:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="193"/> + <source>Enter a branch name</source> + <translation type="unfinished">Introduzir um nome de ramo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="203"/> + <source>Select HEAD revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="206"/> + <source>HEAD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="216"/> + <source>Select revision before HEAD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="219"/> + <source>HEAD^</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="226"/> + <source>No revision selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="131"/> + <source>Revision &2</source> + <translation type="unfinished">Revisão &2</translation> + </message> +</context> +<context> + <name>GitStashBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="14"/> + <source>Git Stash Browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="42"/> + <source>Name</source> + <translation type="unfinished">Nome</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="47"/> + <source>Date</source> + <translation type="unfinished">Data</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="52"/> + <source>Message</source> + <translation type="unfinished">Mensagem</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="66"/> + <source>Statistics</source> + <translation type="unfinished">Estatísticas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="91"/> + <source>File</source> + <translation type="unfinished">Ficheiro</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="96"/> + <source>Changes</source> + <translation type="unfinished">Alterações</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="101"/> + <source>Lines added</source> + <translation type="unfinished">Linhas adicionadas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="106"/> + <source>Lines deleted</source> + <translation type="unfinished">Linhas apagadas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="153"/> + <source>Errors</source> + <translation type="unfinished">Erros</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="159"/> + <source><b>Git stash errors</b><p>This shows possible error messages of the git stash command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="175"/> + <source>Input</source> + <translation type="unfinished">Entrada</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="197"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="200"/> + <source>&Send</source> + <translation type="unfinished">&Enviar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="203"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="210"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="217"/> + <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/GitStashBrowserDialog.ui" line="220"/> + <source>&Password Mode</source> + <translation type="unfinished">Modo &Senha</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="223"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="65"/> + <source>&Refresh</source> + <translation type="unfinished">Atualiza&r</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="67"/> + <source>Press to refresh the list of stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="82"/> + <source>Show</source> + <translation type="unfinished">Mostrar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="85"/> + <source>Restore && Keep</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="87"/> + <source>Restore && Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="90"/> + <source>Create Branch</source> + <translation type="unfinished">Criar Ramo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="93"/> + <source>Delete</source> + <translation type="unfinished">Apagar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="95"/> + <source>Delete All</source> + <translation type="unfinished">Apagar Tudo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="182"/> + <source>Process Generation Error</source> + <translation type="unfinished">Erro na Criação de Processo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="182"/> + <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 numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="369"/> + <source>%n file(s) changed</source> + <translation type="unfinished"> + <numerusform>um ficheiro alterado</numerusform> + <numerusform>%n ficheiros alterados</numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="371"/> + <source>%n line(s) inserted</source> + <translation type="unfinished"> + <numerusform>uma linha inserida</numerusform> + <numerusform>%n linhas inseridas</numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="373"/> + <source>%n line(s) deleted</source> + <translation type="unfinished"> + <numerusform>uma linha apagada</numerusform> + <numerusform>%n linhas apagadas</numerusform> + </translation> + </message> +</context> +<context> + <name>GitStashDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="14"/> + <source>Git Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="23"/> + <source>Message:</source> + <translation type="unfinished">Mensagem:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="33"/> + <source>Enter a message for the stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="40"/> + <source>Keep changes in staging area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="47"/> + <source>Untracked/Ignored Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="53"/> + <source>Select to not stash untracked or ignored files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="56"/> + <source>Don't stash untracked or ignored files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="66"/> + <source>Select to stash untracked files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="69"/> + <source>Stash untracked files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="76"/> + <source>Select to stash untracked and ignored files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="79"/> + <source>Stash untracked and ignored files</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitStatusDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="395"/> + <source>Git Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="17"/> + <source><b>Git Status</b> +<p>This dialog shows the status of the selected file or project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="26"/> + <source>Select action from menu</source> + <translation type="unfinished">Selecionar ação do menu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="49"/> + <source>&Filter on Status:</source> + <translation type="unfinished">&Filtrar Estado:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="59"/> + <source>Select the status of entries to be shown</source> + <translation type="unfinished">Selecionar estado das entradas a mostrar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="662"/> + <source>Commit</source> + <translation type="unfinished">Cometido</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="105"/> + <source>Status (Work)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="110"/> + <source>Status (Staging)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="115"/> + <source>Path</source> + <translation type="unfinished">Rota</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="155"/> + <source>Difference Working to Staging</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="209"/> + <source>Difference Staging to HEAD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="252"/> + <source>Errors</source> + <translation type="unfinished">Erros</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="271"/> + <source>Input</source> + <translation type="unfinished">Entrada</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="293"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="296"/> + <source>&Send</source> + <translation type="unfinished">&Enviar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="299"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="306"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="313"/> + <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/GitStatusDialog.ui" line="316"/> + <source>&Password Mode</source> + <translation type="unfinished">Modo &Senha</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="319"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="65"/> + <source>Refresh</source> + <translation type="unfinished">Atualizar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="67"/> + <source>Press to refresh the status display</source> + <translation type="unfinished">Pressionar para atualizar o visor de estado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="105"/> + <source>Stage Selected Lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="109"/> + <source>Revert Selected Lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="113"/> + <source>Stage Hunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="117"/> + <source>Revert Hunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="123"/> + <source>Unstage Selected Lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="127"/> + <source>Unstage Hunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="169"/> + <source>added</source> + <translation type="unfinished">adicionado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="170"/> + <source>copied</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="171"/> + <source>deleted</source> + <translation type="unfinished">apagado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="172"/> + <source>modified</source> + <translation type="unfinished">alterado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="173"/> + <source>renamed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="175"/> + <source>not tracked</source> + <translation type="unfinished">sem rastrear</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="174"/> + <source>unmerged</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="168"/> + <source>unmodified</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="176"/> + <source>ignored</source> + <translation type="unfinished">ignorado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="197"/> + <source>Commit the selected changes</source> + <translation type="unfinished">Cometer as alterações selecionadas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="198"/> + <source>Amend</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="200"/> + <source>Amend the latest commit with the selected changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="202"/> + <source>Select all for commit</source> + <translation type="unfinished">Selecionar tudo para cometer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="204"/> + <source>Unselect all from commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="703"/> + <source>Add</source> + <translation type="unfinished">Adicionar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="210"/> + <source>Add the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="211"/> + <source>Stage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="213"/> + <source>Stages all changes of the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="215"/> + <source>Unstage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="217"/> + <source>Unstages all changes of the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="839"/> + <source>Differences</source> + <translation type="unfinished">Diferenças</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="224"/> + <source>Shows the differences of the selected entry in a separate dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="227"/> + <source>Differences Side-By-Side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="229"/> + <source>Shows the differences of the selected entry side-by-side in a separate dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="786"/> + <source>Revert</source> + <translation type="unfinished">Anular</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="237"/> + <source>Reverts the changes of the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="242"/> + <source>Forget missing</source> + <translation type="unfinished">Esquecer desaparecidos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="244"/> + <source>Forgets about the selected missing files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="246"/> + <source>Restore missing</source> + <translation type="unfinished">Restaurar desaparecidos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="248"/> + <source>Restores the selected missing files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="253"/> + <source>Edit file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="255"/> + <source>Edit the selected conflicting file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="260"/> + <source>Adjust column sizes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="262"/> + <source>Adjusts the width of all columns to their contents</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="423"/> + <source>Process Generation Error</source> + <translation type="unfinished">Erro na Criação de Processo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="423"/> + <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/GitStatusDialog.py" line="596"/> + <source>all</source> + <translation type="unfinished">tudo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="662"/> + <source>There are no entries selected to be committed.</source> + <translation type="unfinished">Não há entradas selecionadas a cometer.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="703"/> + <source>There are no unversioned entries available/selected.</source> + <translation type="unfinished">Não existem entradas sem versão disponíveis/selecionadas.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="725"/> + <source>Stage</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="725"/> + <source>There are no stageable entries available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="747"/> + <source>Unstage</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="747"/> + <source>There are no unstageable entries available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="769"/> + <source>Forget Missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="810"/> + <source>There are no missing entries available/selected.</source> + <translation type="unfinished">Não existem entradas desaparecidas disponíveis/selcionadas.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="786"/> + <source>There are no uncommitted, unstaged changes available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="810"/> + <source>Restore Missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="839"/> + <source>There are no uncommitted changes available/selected.</source> + <translation type="unfinished">Não há aterações por cometer disponíveis/selecionadas.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="891"/> + <source>Working Tree to Staging Area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="870"/> + <source>Staging Area to HEAD Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="892"/> + <source>Working Tree to HEAD Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="894"/> + <source>Side-by-Side Difference</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="894"/> + <source>Select the compare method.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1201"/> + <source>Revert selected lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1203"/> + <source>Revert hunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1204"/> + <source>Are you sure you want to revert the selected changes?</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitStatusMonitorThread</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py" line="93"/> + <source>Could not start the Git process.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py" line="133"/> + <source>Git status checked successfully</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmoduleAddDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="14"/> + <source>Add Submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="23"/> + <source>&URL:</source> + <translation type="unfinished">&URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="39"/> + <source>Enter the URL of the repository</source> + <translation type="unfinished">Introduzir URL do repositório</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="55"/> + <source>Select the repository URL via a directory selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="62"/> + <source>Press to clear the history of entered repository URLs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="69"/> + <source>Submodule &Directory:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="79"/> + <source>Enter the directory for the submodule (leave empty to use default).</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="89"/> + <source>&Branch:</source> + <translation type="unfinished">&Ramo:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="99"/> + <source>Enter a branch name</source> + <translation type="unfinished">Introduzir um nome de ramo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="106"/> + <source>&Logical Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="116"/> + <source>Enter a logical name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="123"/> + <source>Select to enforce the operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="126"/> + <source>&Force Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="92"/> + <source>Select Submodule Repository Directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="118"/> + <source>Select Submodule Directory</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesDeinitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="14"/> + <source>Unregister Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="23"/> + <source>Select to unregister all submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="26"/> + <source>Unregister All Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="33"/> + <source>Selected Submodules:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="40"/> + <source>Select the submodules to be unregistered</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="53"/> + <source>Select to enforce unregistering</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="56"/> + <source>Enforce Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="14"/> + <source>Defined Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="39"/> + <source>Name</source> + <translation type="unfinished">Nome</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="44"/> + <source>Path</source> + <translation type="unfinished">Rota</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="49"/> + <source>URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="54"/> + <source>Branch</source> + <translation type="unfinished">Ramo</translation> + </message> +</context> +<context> + <name>GitSubmodulesStatusDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="14"/> + <source>Submodules Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="33"/> + <source>Submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="38"/> + <source>Status</source> + <translation type="unfinished">Estado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="43"/> + <source>Commit ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="48"/> + <source>Info</source> + <translation type="unfinished">Informação</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="58"/> + <source>Select to show the status for the index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="61"/> + <source>Show Status for Index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="68"/> + <source>Perform a recursive operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="71"/> + <source>Recursive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="99"/> + <source>Errors</source> + <translation type="unfinished">Erros</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="46"/> + <source>up-to-date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="47"/> + <source>not initialized</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="48"/> + <source>different to index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="49"/> + <source>merge conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="55"/> + <source>Refresh</source> + <translation type="unfinished">Atualizar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="57"/> + <source>Press to refresh the status display</source> + <translation type="unfinished">Pressionar para atualizar o visor de estado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="105"/> + <source>The process {0} did not finish within 30 seconds.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="109"/> + <source>The process {0} finished with an error. +Error: {1}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="115"/> + <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/GitSubmodulesStatusDialog.py" line="134"/> + <source>unknown</source> + <translation type="unfinished">desconhecido</translation> + </message> +</context> +<context> + <name>GitSubmodulesSummaryOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="14"/> + <source>Submodule Summary Options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="23"/> + <source>Selected Submodules:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="30"/> + <source>Select the submodules to show the summary for</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="43"/> + <source>Select to show summary information for the index of the superproject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="46"/> + <source>Show Summary for Superproject Index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="53"/> + <source>Select to show summary information for the index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="56"/> + <source>Show Summary for Index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="63"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="70"/> + <source>Enter a commit ID to show summary information for</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="73"/> + <source>Enter Commit ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="80"/> + <source>Limit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="87"/> + <source>Enter the maximum number of entries to be shown per submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="93"/> + <source>No Limit</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesSyncDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="14"/> + <source>Synchronize Submodule URLs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="23"/> + <source>Selected Submodules:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="30"/> + <source>Select the submodules to be synchronized</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="43"/> + <source>Select to perform a recursive synchronization</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="46"/> + <source>Recursive Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesUpdateOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="14"/> + <source>Submodule Update Options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="23"/> + <source>Update Procedure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="29"/> + <source>Select to perform a 'checkout' procedure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="32"/> + <source>checkout</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="42"/> + <source>Select to perform a 'rebase' procedure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="45"/> + <source>rebase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="52"/> + <source>Select to perform a 'merge' procedure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="55"/> + <source>merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="65"/> + <source>Select to initialize submodules before the update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="68"/> + <source>Initialize before Update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="75"/> + <source>Fetch remote changes before updating</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="78"/> + <source>Synchronize with remote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="88"/> + <source>Select to not fetch the remote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="91"/> + <source>Don't Fetch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="98"/> + <source>Selected Submodules:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="105"/> + <source>Select the submodules to be updated</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="118"/> + <source>Select to enforce the update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="121"/> + <source>Enforce Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitTagBranchListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="14"/> + <source>Git Tag List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="17"/> + <source><b>Git Tag/Branch List</b> +<p>This dialog shows a list of the projects tags or branches.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="33"/> + <source><b>Tag/Branches List</b> +<p>This shows a list of the projects tags or branches.</p></source> + <translation type="unfinished"><b>Lista de Etiqueta/Ramos</b> +<p>Mostra uma lista das etiquetas ou ramos do projeto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="99"/> + <source>Commit</source> + <translation type="unfinished">Cometido</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="99"/> + <source>Name</source> + <translation type="unfinished">Nome</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="69"/> + <source>Errors</source> + <translation type="unfinished">Erros</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="88"/> + <source>Input</source> + <translation type="unfinished">Entrada</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="110"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="113"/> + <source>&Send</source> + <translation type="unfinished">&Enviar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="116"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="123"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="130"/> + <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/GitTagBranchListDialog.ui" line="133"/> + <source>&Password Mode</source> + <translation type="unfinished">Modo &Senha</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="136"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="94"/> + <source>Annotation Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="98"/> + <source>Git Branches List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="135"/> + <source>Process Generation Error</source> + <translation type="unfinished">Erro na Criação de Processo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="135"/> + <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> +</context> +<context> + <name>GitTagDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="14"/> + <source>Git Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished">Nome:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="36"/> + <source>Enter the name of the tag</source> + <translation type="unfinished">Introduzir o nome da etiqueta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="39"/> + <source><b>Tag Name</b> +<p>Enter the name of the tag to be created, deleted or verified.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="53"/> + <source>Revision:</source> + <translation type="unfinished">Revisão:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="60"/> + <source>Enter a revision to set a tag for</source> + <translation type="unfinished">Introduzir uma revisão para aplicar a etiqueta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="67"/> + <source>Tag Action</source> + <translation type="unfinished">Ação de Etiqueta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="73"/> + <source>Select to create a tag</source> + <translation type="unfinished">Selecionar para criar uma etiqueta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="76"/> + <source><b>Create Tag</b> +<p>Select this entry in order to create a tag.</p></source> + <translation type="unfinished"><b>Criar Etiqueta</b> +<p>Selecione esta entrada para criar uma etiqueta.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="80"/> + <source>Create Tag</source> + <translation type="unfinished">Criar Etiqueta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="90"/> + <source>Select to delete a tag</source> + <translation type="unfinished">Selecionar para apagar uma etiqueta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="93"/> + <source><b>Delete Tag</b> +<p>Select this entry in order to delete the selected tag.</p></source> + <translation type="unfinished"><b>Apagar Etiqueta</b> +<p>Selecione esta entrada para apagar a etiqueta selecionada.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="97"/> + <source>Delete Tag</source> + <translation type="unfinished">Apagar Etiqueta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="104"/> + <source>Select to verify a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="107"/> + <source><b>Verify Tag</b> +<p>Select this entry in order to verify the selected tag.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="111"/> + <source>Verify Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="121"/> + <source>Tag Type</source> + <translation type="unfinished">Tipo de Etiqueta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="127"/> + <source>Select to create/delete/verify a global tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="130"/> + <source>Global Tag</source> + <translation type="unfinished">Etiqueta Global</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="140"/> + <source>Select to create/delete/verify a signed tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="143"/> + <source>Signed Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="150"/> + <source>Select to create/delete/verify a local tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="153"/> + <source>Local Tag</source> + <translation type="unfinished">Etiqueta Local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="163"/> + <source>Select to enforce the create operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="166"/> + <source>Enforce Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitUserConfigDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="14"/> + <source>Git User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="23"/> + <source>User Data</source> + <translation type="unfinished">Dados de Usuário</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="29"/> + <source>First Name:</source> + <translation type="unfinished">Nome:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="36"/> + <source>Enter the first name</source> + <translation type="unfinished">Introduzir o nome</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="43"/> + <source>Last Name:</source> + <translation type="unfinished">Apelido:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="50"/> + <source>Enter the last name</source> + <translation type="unfinished">Introduzir o apelido</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="57"/> + <source>Email:</source> + <translation type="unfinished">Correio eletrónico:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="64"/> + <source>Enter the email address</source> + <translation type="unfinished">Introduzir a direção do correio eletrónico</translation> + </message> +</context> +<context> <name>GlosbeEngine</name> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/GlosbeEngine.py" line="88"/> @@ -70924,6 +77499,19 @@ </message> </context> <context> + <name>VcsGitPlugin</name> + <message> + <location filename="../Plugins/PluginVcsGit.py" line="60"/> + <source>Version Control - Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/PluginVcsGit.py" line="135"/> + <source>Git</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>VcsMercurialPlugin</name> <message> <location filename="../Plugins/PluginVcsMercurial.py" line="60"/>
--- a/i18n/eric6_ru.ts Sun Dec 10 16:43:11 2017 +0100 +++ b/i18n/eric6_ru.ts Sun Dec 10 17:42:11 2017 +0100 @@ -17396,6 +17396,6604 @@ </message> </context> <context> + <name>Git</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="211"/> + <source>The git process finished with the exit code {0}</source> + <translation>Процесс Git завершился с кодом выхода {0}</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1565"/> + <source>The git process did not finish within 30s.</source> + <translation>Процесс Git не завершился в течении 30 сек.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="218"/> + <source>Could not start the git executable.</source> + <translation>Невозможно запустить Git.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="246"/> + <source>Create project repository</source> + <translation>Создать репозиторий проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="246"/> + <source>The project repository could not be created.</source> + <translation>Невозможно создать репозиторий проекта.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="274"/> + <source>Creating Git repository</source> + <translation>Создание Git репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="289"/> + <source>Adding files to Git repository</source> + <translation>Добавление файлов в репозиторий Git проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="300"/> + <source>Initial commit to Git repository</source> + <translation>Первичная фиксация в Git репозиторий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="330"/> + <source>Cloning project from a Git repository</source> + <translation>Клонирование проекта из Git репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="419"/> + <source>Commit Changes</source> + <translation>Фиксация изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="419"/> + <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> + <translation>Фиксация влияет на файлы с несохраненными изменениями. Продолжать ли фиксацию?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="478"/> + <source>Committing changes to Git repository</source> + <translation>Фиксация изменений в Git репозитории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="532"/> + <source>Synchronizing with the Git repository</source> + <translation>Синхронизация с Git репозиторием</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="579"/> + <source>Adding files/directories to the Git repository</source> + <translation>Добавление файлов/директорий в Git репозиторий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="653"/> + <source>Removing files/directories from the Git repository</source> + <translation>Удаление файлов/директорий из Git репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="710"/> + <source>Renaming {0}</source> + <translation>Переименование {0}</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="833"/> + <source>Unstage files/directories</source> + <translation>Отменить индексирование файлов/директорий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="884"/> + <source>Revert changes</source> + <translation>Отменить изменения</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="875"/> + <source>Do you really want to revert all changes to these files or directories?</source> + <translation>Вы действительно хотите отменить все изменения в этих файлах и директориях?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="884"/> + <source>Do you really want to revert all changes of the project?</source> + <translation>Вы действительно хотите отменить все изменения в проекте?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="890"/> + <source>Reverting changes</source> + <translation>Отмена изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="942"/> + <source>Merging</source> + <translation>Слияние</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="967"/> + <source>Master branch head</source> + <translation>Вершина ветви Master</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1200"/> + <source>Git Command</source> + <translation>Команда git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1287"/> + <source><tr><td><b>Commit</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Коммит</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1291"/> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Предки</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1295"/> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Теги</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1299"/> + <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Ветви</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1302"/> + <source><tr><td><b>Author</b></td><td>{0} &lt;{1}&gt;</td></tr></source> + <translation><tr><td><b>Автор</b></td><td>{0} &lt;{1}&gt;</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1305"/> + <source><tr><td><b>Date</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Дата</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1308"/> + <source><tr><td><b>Committer</b></td><td>{0} &lt;{1}&gt;</td></tr></source> + <translation><tr><td><b>Коммиттер</b></td><td>{0} &lt;{1}&gt;</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1311"/> + <source><tr><td><b>Committed Date</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Дата подачи</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1314"/> + <source><tr><td><b>Subject</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Сообщение</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1322"/> + <source><h3>Repository information</h3> +<p><table> +<tr><td><b>Git V.</b></td><td>{0}</td></tr> +<tr></tr> +{1}</table></p> +</source> + <translation><h3>Информация о репозитории</h3> +<p><table> +<tr><td><b>Git V.</b></td><td>{0}</td></tr> +<tr></tr> +{1}</table></p> +</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1390"/> + <source>Create {0} file</source> + <translation>Создать {0} файл</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1390"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation><p>Файл <b>{0}</b> уже существует. Переписать его?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1449"/> + <source>Git Copy</source> + <translation>Git: Копирование</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1434"/> + <source><p>Copying the directory <b>{0}</b> failed.</p><p>Reason: {1}</p></source> + <translation><p>Сбой копирования директории <b>{0}</b>.</p><p>Причина: {1}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1449"/> + <source><p>Copying the file <b>{0}</b> failed.</p><p>Reason: {1}</p></source> + <translation><p>Ошибка копирования файла <b>{0}</b>.</p><p>Причина: {1}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2634"/> + <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/git.py" line="1636"/> + <source>Git Side-by-Side Difference</source> + <translation>Git: Построчный просмотр различий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1636"/> + <source><p>The file <b>{0}</b> could not be read.</p></source> + <translation><p>Невозможно прочитать файл: <b>{0}</b></p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1685"/> + <source>Fetching from a remote Git repository</source> + <translation>Получение изменений из удаленного Git репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1723"/> + <source>Pulling from a remote Git repository</source> + <translation>Загрузка изменений из удаленного Git репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1764"/> + <source>Pushing to a remote Git repository</source> + <translation>Передача изменений в удаленный Git репозиторий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1792"/> + <source>Committing failed merge</source> + <translation>Фиксация неудачного слияния</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1819"/> + <source>Aborting uncommitted/failed merge</source> + <translation>Отмена незафиксированного/неудачного слияния</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1969"/> + <source>Tagging in the Git repository</source> + <translation>Работа с тегами в Git репозитории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2200"/> + <source>Branching in the Git repository</source> + <translation>Работа с ветвями в Git репозитории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2240"/> + <source>Delete Remote Branch</source> + <translation>Удалить удаленную ветвь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2261"/> + <source>Current Branch</source> + <translation>Текущая ветвь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2261"/> + <source><p>The current branch is <b>{0}</b>.</p></source> + <translation><p>Текущая ветвь <b>{0}</b>.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2325"/> + <source>Create Bundle</source> + <translation>Создать пакет</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2290"/> + <source>Git Bundle Files (*.bundle)</source> + <translation>Файлы Git пакетов (*.bundle)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2307"/> + <source><p>The Git bundle file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation><p>Файл Git пакета<b>{0}</b> уже существует. Перезаписать?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2355"/> + <source>Verify Bundle</source> + <translation>Проверить пакет</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2485"/> + <source>Git Bundle Files (*.bundle);;All Files (*)</source> + <translation>Файлы Git пакетов (*.bundle);;Все файлы (*)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2385"/> + <source>List Bundle Heads</source> + <translation>Список ветвей в пакете</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2485"/> + <source>Apply Bundle</source> + <translation>Применить пакет</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2508"/> + <source>Applying a bundle file (fetch)</source> + <translation>Применение пакета (fetch)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2535"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation>Недействительная подкоманда ({0}) для Bisect.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2738"/> + <source>Git Bisect ({0})</source> + <translation>Git Bisect ({0})</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2634"/> + <source>Process Generation Error</source> + <translation>Ошибка при запуске процесса</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2678"/> + <source>Create Bisect Replay File</source> + <translation>Создать файл повтора Bisect</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2644"/> + <source>Git Bisect Replay Files (*.replay)</source> + <translation>Файлы повтора Bisect (*.replay)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2661"/> + <source><p>The Git bisect replay file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation><p>Файл повтора Bisect<b>{0}</b> уже существует. Перезаписать?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2678"/> + <source><p>The file <b>{0}</b> could not be written.</p><p>Reason: {1}</p></source> + <translation><p>Невозможно записать файл <b>{0}</b></p><p>Причина: {1}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2699"/> + <source>Edit Bisect Replay File</source> + <translation>Редактировать файл повтора Bisect</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2726"/> + <source>Git Bisect Replay Files (*.replay);;All Files (*)</source> + <translation>Файлы повтора Bisect(*.replay);;Все файлы (*)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2726"/> + <source>Bisect Replay</source> + <translation>Повтор Bisect</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2980"/> + <source>Show Remote Info</source> + <translation>Показать инфо об удаленном источнике</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2927"/> + <source>Rename Remote Repository</source> + <translation>Переименовать удаленный репозиторий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2927"/> + <source>Enter new name for remote repository:</source> + <translation>Введите новое имя для удаленного репозитория:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3004"/> + <source>Show Shortlog</source> + <translation>Отображение журнала изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3062"/> + <source>Cherry-pick</source> + <translation>Выборка</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3092"/> + <source>Copy Changesets (Continue)</source> + <translation>Копировать набор изменений (продолжение)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3117"/> + <source>Copy Changesets (Quit)</source> + <translation>Копировать изменения (завершение)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3143"/> + <source>Copy Changesets (Cancel)</source> + <translation>Копировать изменения (отмена)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3223"/> + <source>Saving stash</source> + <translation>Сохранение в стеке незавершенных изменений ("заначка")</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3422"/> + <source>Show Stash</source> + <translation>Показать "заначку"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3422"/> + <source>Select a stash (empty for latest stash):</source> + <translation>Выберите "заначку" (оставьте пустым чтобы использовать последнюю):</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3334"/> + <source>Restore Stash</source> + <translation>Восстановить из "заначки"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3348"/> + <source>Restoring stash</source> + <translation>Восстановление из стека незавершенных изменений ("заначки")</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3382"/> + <source>Create Branch</source> + <translation>Создать ветвь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3372"/> + <source>Enter a branch name to restore a stash to:</source> + <translation>Введите имя ветви для восстановления из "заначки":</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3397"/> + <source>Creating branch</source> + <translation>Создание ветви</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3431"/> + <source>Delete Stash</source> + <translation>Удалить "заначку"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3431"/> + <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="3442"/> + <source>Deleting stash</source> + <translation>Удаление "заначки"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> + <source>Delete All Stashes</source> + <translation>Удалить все "заначки"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> + <source>Do you really want to delete all stashes?</source> + <translation>Вы действительно хотите удалить все "заначки"?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3470"/> + <source>Deleting all stashes</source> + <translation>Удаление всех "заначек"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3542"/> + <source>Showing the combined configuration settings</source> + <translation>Отображение обобщенных параметров конфигурации</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3568"/> + <source>Verifying the integrity of the Git repository</source> + <translation>Проверка целостности Git репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3593"/> + <source>Performing Repository Housekeeping</source> + <translation>Проведение уборки репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3637"/> + <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="3638"/> + <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="3642"/> + <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="3646"/> + <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="3650"/> + <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="3654"/> + <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="3658"/> + <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="3662"/> + <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="3666"/> + <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="3672"/> + <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="3738"/> + <source>Creating Archive</source> + <translation>Создание архива</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="501"/> + <source>Switch</source> + <translation>Переключиться</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="501"/> + <source><p>Do you really want to switch to <b>{0}</b>?</p></source> + <translation><p>Вы действительно хотите переключиться на <b>{0}</b>?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1852"/> + <source>Applying patch</source> + <translation>Применение патча</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1884"/> + <source>Check patch files</source> + <translation>Проверить файлы патчей</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1887"/> + <source>Apply patch files</source> + <translation>Применить патч файлы</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3781"/> + <source>Add Submodule</source> + <translation>Добавить подмодуль</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3840"/> + <source>List Submodules</source> + <translation>Список подмодулей</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3840"/> + <source>No submodules defined for the project.</source> + <translation>Подмодули для проекта не определены.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3855"/> + <source>All</source> + <translation>Все</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <source>Submodule Path</source> + <translation>Путь подмодуля</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <source>Select a submodule path:</source> + <translation>Выберите путь к подмодулю:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3911"/> + <source>Initialize Submodules</source> + <translation>Инициализация подмодулей</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3948"/> + <source>Unregister Submodules</source> + <translation>Отменить регистрацию подмодулей</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4028"/> + <source>Update Submodules</source> + <translation>Обновить подмодули</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4062"/> + <source>Synchronize Submodules</source> + <translation>Синхронизировать подмодули</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4120"/> + <source>Submodules Summary</source> + <translation>Сводка о подмодулях</translation> + </message> +</context> +<context> + <name>GitAddRemoteDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="14"/> + <source>Git Add Remote</source> + <translation>Git: Добавить удаленный репозиторий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="23"/> + <source>Name:</source> + <translation>Имя:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="30"/> + <source>Enter the remote name</source> + <translation>Введите имя удаленного репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="37"/> + <source>URL:</source> + <translation>URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="44"/> + <source>Enter the remote URL</source> + <translation>Введите URL удаленного репозитория</translation> + </message> +</context> +<context> + <name>GitApplyBundleDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="14"/> + <source>Git Apply Data</source> + <translation>Git: Применить данные</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="23"/> + <source>Bundle Head:</source> + <translation>Ветвь пакета:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="36"/> + <source>Select a head to apply</source> + <translation>Выберите ветвь для применения</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="43"/> + <source>Local Branch:</source> + <translation>Локальная ветвь:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="56"/> + <source>Enter a local branch</source> + <translation>Введите имя локальной ветви</translation> + </message> +</context> +<context> + <name>GitArchiveDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="14"/> + <source>Git Archive</source> + <translation>Git: Архив</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="23"/> + <source>Revision</source> + <translation>Ревизия</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="29"/> + <source>Select to specify a revision by a revision expression</source> + <translation>Разрешить задание ревизии с помощью выражения</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="32"/> + <source>Commit:</source> + <translation>Коммит:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="42"/> + <source>Enter a commit id</source> + <translation>Введите идентификатор коммита</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation>Разрешить задание ревизии с помощью тега</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="52"/> + <source>Tag:</source> + <translation>Тег:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="68"/> + <source>Enter a tag name</source> + <translation>Введите имя тега</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="78"/> + <source>Select to specify a revision by a branch</source> + <translation>Разрешить задание ревизии с помощью ветви</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="81"/> + <source>Branch:</source> + <translation>Ветвь:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="97"/> + <source>Enter a branch name</source> + <translation>Введите имя ветви</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="107"/> + <source>Select HEAD revision</source> + <translation>Выбрать HEAD ревизию</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="110"/> + <source>HEAD</source> + <translation>HEAD</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="125"/> + <source>Format:</source> + <translation>Формат:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="132"/> + <source>Select the archive format</source> + <translation>Выберите формат архива</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="139"/> + <source>File Name:</source> + <translation>Имя файла:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="146"/> + <source>Enter the name of the archive file</source> + <translation>Введите имя для файла архива</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="153"/> + <source>Select the archive file via a file selection dialog</source> + <translation>Выбрать файл архива посредством диалога выбора файла</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="160"/> + <source>Prefix:</source> + <translation>Префикс:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="167"/> + <source>Enter a prefix to be prepended to each file</source> + <translation>Введите префикс для добавления к каждому файлу</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.py" line="88"/> + <source>Select Archive File</source> + <translation>Выберите файл архива</translation> + </message> +</context> +<context> + <name>GitBisectLogBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="14"/> + <source>Git Bisect Log</source> + <translation>Git: Журнал двоичного поиска</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="42"/> + <source>Commit</source> + <translation>Коммит</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="47"/> + <source>Operation</source> + <translation>Операция</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="52"/> + <source>Subject</source> + <translation>Сообщение</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="66"/> + <source>Errors</source> + <translation>Ошибки</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="72"/> + <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/GitBisectLogBrowserDialog.ui" line="88"/> + <source>Input</source> + <translation>Ввод</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="110"/> + <source>Press to send the input to the git process</source> + <translation>Отправить введеную строку на вход git процесса</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="113"/> + <source>&Send</source> + <translation>&Отправить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="116"/> + <source>Alt+S</source> + <translation>Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="123"/> + <source>Enter data to be sent to the git process</source> + <translation>Введите данные для отправки git процессу</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="130"/> + <source>Select to switch the input field to password mode</source> + <translation>Задать режим ввода пароля для поля ввода пароля</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="133"/> + <source>&Password Mode</source> + <translation>&Парольный режим</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="136"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="57"/> + <source>&Refresh</source> + <translation>&Освежить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="59"/> + <source>Press to refresh the list of commits</source> + <translation>Освежить список коммитов</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="175"/> + <source>Process Generation Error</source> + <translation>Ошибка при запуске процесса</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="175"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation> + </message> +</context> +<context> + <name>GitBisectStartDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="14"/> + <source>Git Bisect Start</source> + <translation>Git: Старт двоичного поиска</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="23"/> + <source>Bad Commit:</source> + <translation>Плохой коммит:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="30"/> + <source>Enter a bad commit</source> + <translation>Введите плохой коммит</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="37"/> + <source>Good Commits:</source> + <translation>Хороший коммит:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="44"/> + <source>Enter a list of good commits separated by space</source> + <translation>Введите через пробел список хороших коммитов</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="51"/> + <source>Select to not checkout the working tree</source> + <translation>Разрешить не переключать рабочее дерево проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="54"/> + <source>Don't checkout working tree</source> + <translation>Не переключать рабочее дерево проекта</translation> + </message> +</context> +<context> + <name>GitBlameDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="14"/> + <source>Git Blame</source> + <translation>Git: Blame (инфо об авторе)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="45"/> + <source>Commit</source> + <translation>Фиксация</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="50"/> + <source>Author</source> + <translation>Автор</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="55"/> + <source>Date</source> + <translation>Дата</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="60"/> + <source>Time</source> + <translation>Время</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="65"/> + <source>Line</source> + <translation>Строка</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="79"/> + <source>Errors</source> + <translation>Ошибки</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="98"/> + <source>Input</source> + <translation>Ввод</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="120"/> + <source>Press to send the input to the git process</source> + <translation>Отправить введеную строку на вход git процесса</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="123"/> + <source>&Send</source> + <translation>&Отправить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="126"/> + <source>Alt+S</source> + <translation>Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="133"/> + <source>Enter data to be sent to the git process</source> + <translation>Введите данные для отправки git процессу</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="140"/> + <source>Select to switch the input field to password mode</source> + <translation>Задать режим ввода пароля для поля ввода пароля</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="143"/> + <source>&Password Mode</source> + <translation>&Парольный режим</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="146"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="119"/> + <source>Process Generation Error</source> + <translation>Ошибка при запуске процесса</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="119"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation> + </message> +</context> +<context> + <name>GitBranchDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="14"/> + <source>Git Branch</source> + <translation>Git: Ветви</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="23"/> + <source>Branch Action</source> + <translation>Операции с ветвями</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="29"/> + <source>Select to create a branch</source> + <translation>Разрешить создание ветви</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="32"/> + <source><b>Create Branch</b> +<p>Select this entry in order to create a branch.</p></source> + <translation><b>Создать ветвь</b> +<p>Выберите этот пункт для создания ветви.</b></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="36"/> + <source>Create</source> + <translation>Создать</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="46"/> + <source>Select to rename a branch</source> + <translation>Разрешить переименование ветви</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="49"/> + <source><b>Rename</b> +<p>Select this entry in order to rename the selected branch.</p></source> + <translation><b>Переименовать</b> +<p>Выберите этот пункт для переименования выбранной ветви.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="53"/> + <source>Rename</source> + <translation>Переименовать</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="60"/> + <source>Select to delete a branch</source> + <translation>Разрешить удаление ветви</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="63"/> + <source><b>Delete Branch</b> +<p>Select this entry in order to delete the selected branch.</p></source> + <translation><b>Удалить ветвь</b> +<p>Выберите этот пункт для удаления выбранной ветви.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="67"/> + <source>Delete</source> + <translation>Удалить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="74"/> + <source>Select to create a new branch and switch to it</source> + <translation>Разрешить создание новой ветви и переключение на нее</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="77"/> + <source><b>Create &amp; Switch</b>\n<p>Select this entry in order to create a new branch and switch the working tree to it.</p></source> + <translation><b>Создать &amp; Переключиться</b>\n<p>Создание новой ветви и переключение на нее рабочего дерева проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="80"/> + <source>Create && Switch</source> + <translation>Создать && Переключиться</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="87"/> + <source>Select to create a tracking branch and switch to it</source> + <translation>Разрешить создание отслеживаемой ветви и переключение на нее</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="90"/> + <source><b>Create Tracking Branch &amp; Switch</b>\n<p>Select this entry in order to create a new branch tracking a remote repository branch. The working tree is switched to it.</p></source> + <translation><b>Создать отслеживаемую ветвь &amp; Переключиться</b>\n<p>Создание новой отслеживаемой ветви удаленного репозитория и переключение на нее рабочего дерева проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="93"/> + <source>Create Tracking Branch && Switch</source> + <translation>Создать отслеживаемую ветвь && Переключиться</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="125"/> + <source>Name:</source> + <translation>Имя:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="138"/> + <source>Enter the name of the branch</source> + <translation>Введите имя ветви</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="141"/> + <source><b>Branch Name</b> +<p>Enter the name of the branch to be created, deleted or moved.</p></source> + <translation><b>Имя ветви</b> +<p>Введите имя ветви для создания, удаления или переименования.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="157"/> + <source>Create Branch</source> + <translation>Создать ветвь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="163"/> + <source>Revision:</source> + <translation>Ревизия:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="170"/> + <source>Enter a revision at which to start the branch</source> + <translation>Задайте ревизию от которой должна начаться ветвь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="183"/> + <source>Rename Branch</source> + <translation>Переименовать ветвь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="189"/> + <source>New Name:</source> + <translation>Новое имя:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="196"/> + <source>Enter a new name for the selected branch</source> + <translation>Введите новое имя для выбранной ветви</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="238"/> + <source>Select to enforce the create operation</source> + <translation>Разрешить принудительное выполнение операции создания</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="241"/> + <source>Enforce Operation</source> + <translation>Выполнять принудительно</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="100"/> + <source>Select to associate a remote branch</source> + <translation>Разрешить привязывать удаленную ветвь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="209"/> + <source>Set Tracking Branch</source> + <translation>Задать отслеживание ветви</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="110"/> + <source>Select to de-associate a remote branch</source> + <translation>Разрешить отвязывать удаленные ветви</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="113"/> + <source>Unset Tracking Branch Information</source> + <translation>Отказаться от отслеживания ветви</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="215"/> + <source>Remote Branch:</source> + <translation>Удаленная ветвь:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="228"/> + <source>Select the remote branch to associate</source> + <translation>Выберите удаленную ветвь для привязывания</translation> + </message> +</context> +<context> + <name>GitBranchPushDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="14"/> + <source>Git Push Branch</source> + <translation>Git: Передать ветвь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="23"/> + <source>Branch Name:</source> + <translation>Имя ветви:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="36"/> + <source>Select the branch</source> + <translation>Выберите ветвь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="43"/> + <source>Remote Name:</source> + <translation>Удаленное имя:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="56"/> + <source>Select the remote repository</source> + <translation>Выберите удаленный репозиторий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.py" line="36"/> + <source><all branches></source> + <translation><все ветви></translation> + </message> +</context> +<context> + <name>GitBundleDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="14"/> + <source>Git Bundle</source> + <translation>Git: Пакеты</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="23"/> + <source>Revision</source> + <translation>Ревизия</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="29"/> + <source>Select to specify a revision or revision range</source> + <translation>Разрешить задание ревизии или диапазона ревизий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="32"/> + <source>Revisions:</source> + <translation>Ревизии:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="42"/> + <source>Enter revisions or revision range expressions</source> + <translation>Введите одиночную ревизию или диапазон ревизий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation>Разрешить задание ревизии с помощью тега</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="52"/> + <source>Tag:</source> + <translation>Тег:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="62"/> + <source>Enter a tag name</source> + <translation>Введите имя тега</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="72"/> + <source>Select to specify a revision by a branch</source> + <translation>Разрешить задание ревизии с помощью ветви</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="75"/> + <source>Branch:</source> + <translation>Ветвь:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="85"/> + <source>Enter a branch name</source> + <translation>Введите имя ветви</translation> + </message> +</context> +<context> + <name>GitCherryPickDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="14"/> + <source>Git Cherry-pick</source> + <translation>Git: Выборка</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="23"/> + <source>Commits</source> + <translation>Коммиты</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="29"/> + <source>Enter commits by id, branch or tag one per line</source> + <translation>Задайте коммиты с помощью идентификатора, ветви или тега, по одному в строке</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="45"/> + <source>Select to append cherry-pick info to the commit message</source> + <translation>Разрешить добавление инфо о выборке в сообщение фиксации</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="48"/> + <source>Append Cherry-pick &Info</source> + <translation>Добавлять &инфо о выборке</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="58"/> + <source>Select to add a 'Signed-off-by' line to the commit message</source> + <translation>Разрешить добавление строки 'Signed-off-by' в сообщение фиксации</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="61"/> + <source>Append '&Signed-off-by' line</source> + <translation>Добавлять строку '&Signed-off-by'</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="68"/> + <source>Select to not commit the cherry-pick</source> + <translation>Рарешить не фиксировать выборку</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="71"/> + <source>Don't &commit</source> + <translation>Не &фиксировать</translation> + </message> +</context> +<context> + <name>GitCommandDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="14"/> + <source>Git Command</source> + <translation>Git: Командная строка</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="23"/> + <source>Git Command:</source> + <translation>Команда Git:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="36"/> + <source>Enter the Git command to be executed with all necessary parameters</source> + <translation>Введите команду Git со всеми необходимыми для выполнения параметрами</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="39"/> + <source><b>Git Command</b> +<p>Enter the Git command to be executed including all necessary +parameters. If a parameter of the commandline includes a space you have to +surround this parameter by single or double quotes. Do not include the name +of the Git client executable (i.e. git).</p></source> + <translation><b>Команда git</b> +<p>Для выполнения введите команду Git со всеми необходимыми параметрами. +Параметры, содержащие пробел, должны быть заключены в одиночные или двойные кавычки. +Команда не должна содержать имя выполняемого файла Git(т.е. git).</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="65"/> + <source>Project Directory:</source> + <translation>Директория проекта:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="78"/> + <source>This shows the root directory of the current project.</source> + <translation>Корневая директория текущего проекта.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="81"/> + <source>project directory</source> + <translation>директория проекта</translation> + </message> +</context> +<context> + <name>GitCommitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="14"/> + <source>Git</source> + <translation>Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="20"/> + <source>Commit Message</source> + <translation>Сообщение фиксации</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="26"/> + <source>Enter the log message.</source> + <translation>Введите сообщение для журнала.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="29"/> + <source><b>Log Message</b> +<p>Enter the log message for the commit action.</p></source> + <translation><b>Сообщение для журнала</b> +<p>Введите сообщение журнала для выполняемой фиксации</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="43"/> + <source>Recent commit messages</source> + <translation>Недавние сообщения фиксации</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="50"/> + <source>Select a recent commit message to use</source> + <translation>Выберите недавнее сообщение фиксации</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="70"/> + <source>Select to amend the last commit (leave message empty to keep it)</source> + <translation>Разрешить правку последнего коммита (пустое поле, если его не нужно менять)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="73"/> + <source>Amend the last commit</source> + <translation>Править (amend) последний коммит</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="80"/> + <source>Select to reset the author information</source> + <translation>Разрешить обновление информации об авторе</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="83"/> + <source>Reset Author Info</source> + <translation>Обновлять информацию об авторе</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="60"/> + <source>Select to commit only staged changes</source> + <translation>Разрешить фиксировать только индексированные изменения</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="63"/> + <source>Commit staged changes only</source> + <translation>Фиксировать только индексированные изменения</translation> + </message> +</context> +<context> + <name>GitCopyDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="14"/> + <source>Git Copy</source> + <translation>Git: Копирование</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="25"/> + <source>Source:</source> + <translation>Источник:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="32"/> + <source>Shows the name of the source</source> + <translation>Отображение имени источника</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="35"/> + <source><b>Source name</b> +<p>This field shows the name of the source.</p></source> + <translation><b>Имя источника</b> +<p>В этом поле отображается имя источника.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="46"/> + <source>Enter the target name</source> + <translation>Введите имя приемника</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="49"/> + <source><b>Target name</b> +<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> + <translation><b>Имя приемника</b> +<p>Введите новое имя в это поле. Имя приемника должно быть новым или абсолютныи путем.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="57"/> + <source>Target:</source> + <translation>Назначение:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="64"/> + <source>Press to open a selection dialog</source> + <translation>Открыть диалог выбора</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="67"/> + <source><b>Target directory</b> +<p>Select the target name for the operation via a selection dialog.</p></source> + <translation><b>Директория назначения</b> +<p>Выберите имя директории назначения посредством диалога выбора.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="77"/> + <source>Select to force the operation</source> + <translation>Разрешить принудительное выполнение</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="80"/> + <source>Enforce operation</source> + <translation>Выполнять принудительно</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.py" line="51"/> + <source>Git Move</source> + <translation>Git: Переименовать</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.py" line="89"/> + <source>Select target</source> + <translation>Выберите приемник</translation> + </message> +</context> +<context> + <name>GitDescribeDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="14"/> + <source>Git Tag List</source> + <translation>Git: Список тегов</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="42"/> + <source>Commit</source> + <translation>Коммит</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="47"/> + <source>Tag Info</source> + <translation>Инфо тега</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="61"/> + <source>Errors</source> + <translation>Ошибки</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="80"/> + <source>Input</source> + <translation>Ввод</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="102"/> + <source>Press to send the input to the git process</source> + <translation>Отправить введеную строку на вход git процесса</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="105"/> + <source>&Send</source> + <translation>&Отправить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="108"/> + <source>Alt+S</source> + <translation>Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="115"/> + <source>Enter data to be sent to the git process</source> + <translation>Введите данные для отправки git процессу</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="122"/> + <source>Select to switch the input field to password mode</source> + <translation>Задать режим ввода пароля для поля ввода пароля</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="125"/> + <source>&Password Mode</source> + <translation>&Парольный режим</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="128"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py" line="117"/> + <source>Process Generation Error</source> + <translation>Ошибка при запуске процесса</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py" line="117"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation> + </message> +</context> +<context> + <name>GitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="14"/> + <source>Git</source> + <translation>Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="29"/> + <source>Output</source> + <translation>Вывод</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="57"/> + <source>Errors</source> + <translation>Ошибки</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="76"/> + <source>Input</source> + <translation>Ввод</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="98"/> + <source>Press to send the input to the git process</source> + <translation>Отправить введеную строку на вход git процесса</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="101"/> + <source>&Send</source> + <translation>&Отправить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="104"/> + <source>Alt+S</source> + <translation>Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="111"/> + <source>Enter data to be sent to the git process</source> + <translation>Введите данные для отправки git процессу</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="118"/> + <source>Select to switch the input field to password mode</source> + <translation>Задать режим ввода пароля для поля ввода пароля</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="121"/> + <source>&Password Mode</source> + <translation>&Парольный режим</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="124"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="104"/> + <source>Process canceled.</source> + <translation>Процесс прерван.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="116"/> + <source>Process finished successfully.</source> + <translation>Процесс успешно завершен.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="118"/> + <source>Process crashed.</source> + <translation>Процесс завершился по ошибке.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="120"/> + <source>Proces finished with exit code {0}</source> + <translation>Процесс завершился с кодом выхода {0}</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/> + <source>Process Generation Error</source> + <translation>Ошибка при запуске процесса</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/> + <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/GitDialog.py" line="88"/> + <source>Additional Output</source> + <translation>Дополнительный вывод</translation> + </message> +</context> +<context> + <name>GitDiffDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="14"/> + <source>Git Diff</source> + <translation>Git: Различия</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="26"/> + <source>Difference</source> + <translation>Различие</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="39"/> + <source><b>Git Diff</b><p>This shows the output of the git diff command.</p></source> + <translation><b>Git Diff</b><p>Отображение вывода команды 'git diff'.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="85"/> + <source>Errors</source> + <translation>Ошибки</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="179"/> + <source>Process Generation Error</source> + <translation>Ошибка при запуске процесса</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="179"/> + <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/GitDiffDialog.py" line="206"/> + <source>There is no difference.</source> + <translation>Различий нет.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="227"/> + <source><Start></source> + <translation><Начало></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="228"/> + <source><End></source> + <translation><Конец></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="356"/> + <source>Save Diff</source> + <translation>Сохранить различия</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="322"/> + <source>Patch Files (*.diff)</source> + <translation>Файлы патчей (*.diff)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="339"/> + <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation><p>Патч файл <b>{0}</b> уже существует. Переписать?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="356"/> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation><p>Невозможно сохранить патч файл <b>{0}</b>:<br>Причина: {1}.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="56"/> + <source><b>Git Diff</b><p>This shows the output of the git diff command (stage to repo) if the dialog was asked to show separate diffs.</p></source> + <translation><b>Git Diff</b><p>Отображение вывода команды "git diff" (область индекса и репозиторий), если был запрос показать в диалоговом окне отдельные различия.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="48"/> + <source>Refresh</source> + <translation>Освежить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="50"/> + <source>Press to refresh the display</source> + <translation>Освежить экран</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="96"/> + <source>Working Tree to Staging Area</source> + <translation>Рабочее дерево проекта относительно области индексирования</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="97"/> + <source>Staging Area to HEAD Commit</source> + <translation>Область индексирования относительно HEAD коммита</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="98"/> + <source>Working Tree to HEAD Commit</source> + <translation>Рабочее дерево проекта относительно HEAD коммита</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="99"/> + <source>Working to Staging (top) and Staging to HEAD (bottom)</source> + <translation>Рабочее дерево проекта относительно области индексирования (вверху) и область индексирования относительно HEAD коммита (внизу)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="101"/> + <source>Stash Contents</source> + <translation>Содержание "заначки"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="102"/> + <source>Stash Contents of {0}</source> + <translation>Содержание "заначки" {0}</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="171"/> + <source>Difference ({0})</source> + <translation>Различия: ({0})</translation> + </message> +</context> +<context> + <name>GitFetchDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="14"/> + <source>Git Fetch</source> + <translation>Git: Получить (fetch)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="23"/> + <source>Remote Repository:</source> + <translation>Удаленный репозиторий:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="30"/> + <source>Select the remote repository to fetch from</source> + <translation>Выберите удаленный репозиторий для получения (fetch) изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="46"/> + <source>Remote Branches:</source> + <translation>Удаленные ветви:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="56"/> + <source>Press to update the list of remote branches</source> + <translation>Обновить список удаленных (remote) ветвей</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="59"/> + <source>Update</source> + <translation>Обновить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="81"/> + <source>Select the remote branches to be fetched</source> + <translation>Выберите удаленные ветви для получения из них изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="94"/> + <source>Local Branch:</source> + <translation>Локальная ветвь:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="101"/> + <source>Select the local branch to fetch into</source> + <translation>Выберите локальную ветвь для получения для нее изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="111"/> + <source>Select to remove non-existing tracking references </source> + <translation>Разрешить удаление несуществующих отслеживаемых ссылок</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="114"/> + <source>Prune obsolete tracking references</source> + <translation>Отсекать (prune) устаревшие отслеживаемые ссылки</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="121"/> + <source>Select to fetch tags as well</source> + <translation>Разрешить так же получать теги</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="124"/> + <source>Include tags</source> + <translation>Включая теги</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.py" line="36"/> + <source><All></source> + <translation><Все></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.py" line="37"/> + <source><Custom></source> + <translation><Пользовательские></translation> + </message> +</context> +<context> + <name>GitListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitListDialog.ui" line="14"/> + <source>Git Select</source> + <translation>Git: Выбор</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitListDialog.ui" line="23"/> + <source>Select from the list:</source> + <translation>Выберите из списка:</translation> + </message> +</context> +<context> + <name>GitLogBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="14"/> + <source>Git Log</source> + <translation>Git: Журнал истории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="491"/> + <source>Errors</source> + <translation>Ошибки</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="497"/> + <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/GitLogBrowserDialog.ui" line="513"/> + <source>Input</source> + <translation>Ввод</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="535"/> + <source>Press to send the input to the git process</source> + <translation>Отправить введеную строку на вход git процесса</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="538"/> + <source>&Send</source> + <translation>&Отправить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="541"/> + <source>Alt+S</source> + <translation>Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="548"/> + <source>Enter data to be sent to the git process</source> + <translation>Введите данные для отправки git процессу</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="555"/> + <source>Select to switch the input field to password mode</source> + <translation>Задать режим ввода пароля для поля ввода пароля</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="558"/> + <source>&Password Mode</source> + <translation>&Парольный режим</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="561"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="65"/> + <source>From:</source> + <translation>От:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="72"/> + <source>Enter the start date</source> + <translation>Задайте начальную дату</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="82"/> + <source>To:</source> + <translation>До:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="89"/> + <source>Enter the end date</source> + <translation>Задайте конечную дату</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="112"/> + <source>Select the field to filter on</source> + <translation>Задайте поле с фильтром</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="102"/> + <source>Author</source> + <translation>Автор</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="103"/> + <source>Committer</source> + <translation>Коммиттер</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1812"/> + <source>Branch</source> + <translation>Ветвь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="104"/> + <source>Subject</source> + <translation>Сообщение</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="174"/> + <source>Graph</source> + <translation>Граф</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="189"/> + <source>Date</source> + <translation>Дата</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="199"/> + <source>Commit Date</source> + <translation>Дата подачи</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="214"/> + <source>Tags</source> + <translation>Теги</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="378"/> + <source>Action</source> + <translation>Действие</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="383"/> + <source>Path</source> + <translation>Путь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="398"/> + <source>Copy from</source> + <translation>Копия из</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="257"/> + <source>Press to get the next bunch of log entries</source> + <translation>Получить следующую порцию записей журнала</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="260"/> + <source>&Next</source> + <translation>&Далее</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="267"/> + <source>Enter the limit of entries to fetch</source> + <translation>Задайте количество извлекаемых записей</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="286"/> + <source>Select to stop listing log messages at a copy or move</source> + <translation>Разрешить приостановку пролистывания сообщений журнала при копировании или перемещении</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="289"/> + <source>Stop on Copy/Move</source> + <translation>Стоп при копировании/перемещении</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="22"/> + <source>Select action from menu</source> + <translation>Выберите действие из меню</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="88"/> + <source>&Refresh</source> + <translation>&Освежить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="90"/> + <source>Press to refresh the list of commits</source> + <translation>Освежить список коммитов</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="198"/> + <source>Added</source> + <translation>Добавлен</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="199"/> + <source>Deleted</source> + <translation>Удален</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="200"/> + <source>Modified</source> + <translation>Модифицирован</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="201"/> + <source>Copied</source> + <translation>Скопирован</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="202"/> + <source>Renamed</source> + <translation>Переименован</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="203"/> + <source>Type changed</source> + <translation>Изменен тип</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="204"/> + <source>Unmerged</source> + <translation>Не слито</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="205"/> + <source>Unknown</source> + <translation>Неизвестно</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="251"/> + <source>Show Author Columns</source> + <translation>Показать колонки автора</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="253"/> + <source>Press to show the author columns</source> + <translation>Показать колонки автора</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="261"/> + <source>Show Committer Columns</source> + <translation>Показать колонки коммиттера</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="263"/> + <source>Press to show the committer columns</source> + <translation>Показать колонки коммиттера</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="313"/> + <source>Copy Commits</source> + <translation>Копировать коммиты</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="315"/> + <source>Cherry-pick the selected commits to the current branch</source> + <translation>Скопировать выборку коммитов в текущую ветвь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="320"/> + <source>Tag</source> + <translation>Тег</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="322"/> + <source>Tag the selected commit</source> + <translation>Тег выбранного коммита</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="326"/> + <source>Create a new branch at the selected commit.</source> + <translation>Ветвь на выбранном коммите.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="328"/> + <source>Branch && Switch</source> + <translation>Создать ветвь && Переключиться</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="330"/> + <source>Create a new branch at the selected commit and switch the work tree to it.</source> + <translation>Создать новую ветвь на выбранном коммите и переключиться на нее.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1864"/> + <source>Switch</source> + <translation>Переключиться</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="336"/> + <source>Switch the working directory to the selected commit</source> + <translation>Переключить рабочую директорию на выбранный коммит</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1890"/> + <source>Show Short Log</source> + <translation>Показать краткую сводку</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="342"/> + <source>Show a dialog with a log output for release notes</source> + <translation>Показать краткую сводку примечаний для релиза</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="345"/> + <source>Describe</source> + <translation>Генерация номера релиза</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="347"/> + <source>Show the most recent tag reachable from a commit</source> + <translation>Показать имя ближайшего тега, дополненное данными из коммита</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="648"/> + <source>The git process did not finish within 30s.</source> + <translation>Процесс Git не завершился в течении 30 сек.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="651"/> + <source>Could not start the git executable.</source> + <translation>Невозможно запустить Git.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="654"/> + <source>Git Error</source> + <translation>Ошибка Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="769"/> + <source>{0} ({1}%)</source> + <comment>action, confidence</comment> + <translation>{0} ({1}%)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="835"/> + <source>Process Generation Error</source> + <translation>Ошибка при запуске процесса</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="835"/> + <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/GitLogBrowserDialog.py" line="1725"/> + <source>Copy Changesets</source> + <translation>Копировать набор изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1864"/> + <source>The project should be reread. Do this now?</source> + <translation>Проект должен быть перепрочитан. Сделать это сейчас?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="209"/> + <source>Branches</source> + <translation>Ветви</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1890"/> + <source>Select a branch</source> + <translation>Выберите ветвь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/> + <source>Select a default branch</source> + <translation>Выберите ветвь по умолчанию</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/> + <source>Branch & Switch</source> + <translation>Создать ветвь && Переключиться на нее</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="45"/> + <source>Select the mode (find or filter)</source> + <translation>Выбор режима (поиск или фильтрация)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="126"/> + <source>Press to find the previous occurrence</source> + <translation>Перейти к предыдущему вхождению</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="133"/> + <source>Press to find the next occurrence</source> + <translation>Перейти к следующему вхождению</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="101"/> + <source>Commit ID</source> + <translation>ID коммита</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="98"/> + <source>Find</source> + <translation>Найти</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="99"/> + <source>Filter</source> + <translation>Фильтр</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="140"/> + <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Ветви</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="143"/> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Теги</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2073"/> + <source>'{0}' was not found.</source> + <translation>'{0}' не найдено.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2073"/> + <source>Find Commit</source> + <translation>Поиск коммита</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="119"/> + <source>Enter the regular expression to filter on or search for</source> + <translation>Введите регулярное выражение для фильтра или поиска</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="105"/> + <source>File</source> + <translation>Файл</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="224"/> + <source>Press to move up in the log list</source> + <translation>Перейти выше в списке сообщений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="234"/> + <source>Press to move down in the log list</source> + <translation>Перейти ниже в списке сообщений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="388"/> + <source>Additions</source> + <translation>Добавлений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="393"/> + <source>Deletions</source> + <translation>Удалений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2119"/> + <source>Differences</source> + <translation>Различия</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="445"/> + <source><a href="save:me">Save</a></source> + <translation><a href="save:me">Сохранить</a></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="122"/> + <source><table><tr><td><b>Commit ID</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2} &lt;{3}&gt;</td></tr><tr><td><b>Commit Date</b></td><td>{4}</td></tr><tr><td><b>Committer</b></td><td>{5} &lt;{6}&gt;</td></tr>{7}<tr><td><b>Subject</b></td><td>{8}</td></tr>{9}</table></source> + <translation><table><tr><td><b>ID коммита</b></td><td>{0}</td></tr><tr><td><b>Дата</b></td><td>{1}</td></tr><tr><td><b>Автор</b></td><td>{2} &lt;{3}&gt;</td></tr><tr><td><b>Дата подачи</b></td><td>{4}</td></tr><tr><td><b>Коммитер</b></td><td>{5} &lt;{6}&gt;</td></tr>{7}<tr><td><b>Сообщение</b></td><td>{8}</td></tr>{9}</table></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="134"/> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Предки</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="137"/> + <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Потомки</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="146"/> + <source><tr><td><b>Message</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Сообщения</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1275"/> + <source>Side-by-Side Diff to Parent {0}</source> + <translation>Построчные различия с предком {0}</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1287"/> + <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> + <translation><a href="sbsdiff:{0}_{1}">Построчное сравнение</a></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2133"/> + <source>Differences to Parent {0}</source> + <translation>Различия с предком {0}</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2148"/> + <source>Diff to Parent {0}</source> + <translation>Различия с предком {0}</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2174"/> + <source>There is no difference.</source> + <translation>Различий нет.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2337"/> + <source>Save Diff</source> + <translation>Сохранить различия</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2303"/> + <source>Patch Files (*.diff)</source> + <translation>Файлы изменений (*.diff)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2320"/> + <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation><p>Файл изменений <b>{0}</b> уже существует. Переписать?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2337"/> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation><p>Невозможно сохранить файл изменений<b>{0}</b>:<br>Причина: {1}.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="241"/> + <source>Show Commit ID Column</source> + <translation>Показать колонку ID коммита</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="243"/> + <source>Press to show the commit ID column</source> + <translation>Показать колонку ID коммита</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="271"/> + <source>Show Branches Column</source> + <translation>Показать колонку ветвей</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="273"/> + <source>Press to show the branches column</source> + <translation>Показать колонку ветвей</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="281"/> + <source>Show Tags Column</source> + <translation>Показать колонку тегов</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="283"/> + <source>Press to show the Tags column</source> + <translation>Показать колонку тегов</translation> + </message> +</context> +<context> + <name>GitMergeDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="14"/> + <source>Git Merge</source> + <translation>Git: Слияние</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="23"/> + <source>Revision</source> + <translation>Ревизия</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="29"/> + <source>Select to specify a revision by changeset id</source> + <translation>Разрешить задание ревизии идентификатором набора изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="32"/> + <source>Commit:</source> + <translation>Коммит:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="42"/> + <source>Enter a commit id</source> + <translation>Введите идентификатор коммита</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation>Разрешить задание ревизии с помощью тега</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="52"/> + <source>Tag:</source> + <translation>Тег:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="62"/> + <source>Enter a tag name</source> + <translation>Введите имя тега</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="118"/> + <source>Select to not specify a specific revision</source> + <translation>Разрешить не задавать конкретную ревизию</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="121"/> + <source>No commit selected</source> + <translation>Коммит не выбран</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="134"/> + <source>Select to commit the merge</source> + <translation>Разрешить фиксацию слияния</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="137"/> + <source>Commit Merge</source> + <translation>Фиксировать слияние</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="146"/> + <source>Commit Message:</source> + <translation>Сообщение фиксации:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="153"/> + <source>Enter a message for the merge commit</source> + <translation>Введите сообщение для фиксации слияния</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="163"/> + <source>Select to append the log summaries of merged commits</source> + <translation>Разрешить добавление в журнал краткое описание слитых коммитов</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="166"/> + <source>Add Log Message Summary</source> + <translation>Добавлять краткое описание</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="176"/> + <source>Select to show diff statistics at the end of the merge</source> + <translation>Разрешить по окончании слияния показ статистики (diff --stat)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="179"/> + <source>Show diff statistics</source> + <translation>Показывать diff-статистику</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="72"/> + <source>Select to specify a revision by a local branch</source> + <translation>Разрешить задание ревизии с помощью локальной ветви</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="75"/> + <source>Local Branch:</source> + <translation>Локальная ветвь:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="85"/> + <source>Enter a local branch name</source> + <translation>Введите имя локальной ветви</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="95"/> + <source>Select to specify a revision by a remote branch</source> + <translation>Разрешить задание ревизии с помощью удаленной ветви</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="98"/> + <source>Remote Branch:</source> + <translation>Удаленная ветвь:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="108"/> + <source>Enter a remote branch name</source> + <translation>Введите имя удаленной ветви</translation> + </message> +</context> +<context> + <name>GitNewProjectOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="14"/> + <source>New Project from Repository</source> + <translation>Новый проект из репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="17"/> + <source><b>New Project from Repository Dialog</b> +<p>Enter the various repository infos into the entry fields. These values are used, when the new project is retrieved from the repository.</p> +<p>For remote repositories the URL must contain the hostname.</p></source> + <translation><b>Диалог "Новый проект из репозитория"</b> +<p>Введите в поля ввода различную информацию о репозитории. Эта информация будет использована при создании нового проекта из репозитория.</p> +<p>Для удаленных репозиториев URL должен содержать имя сервера.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="28"/> + <source>&URL:</source> + <translation>&URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="60"/> + <source>Select the repository url via a directory selection dialog</source> + <translation>Выберите url репозитория посредством диалога выбора директории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="74"/> + <source>Project &Directory:</source> + <translation>&Директория проекта:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="84"/> + <source>Enter the directory of the new project.</source> + <translation>Задайте директорию нового проекта.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="87"/> + <source><b>Project Directory</b> +<p>Enter the directory of the new project. It will be retrieved from +the repository and be placed in this directory.</p></source> + <translation><b>Директория проекта</b> +<p>Задайте директорию для нового проекта. Он будет извлечен из репозитория и помещен в эту директорию.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py" line="87"/> + <source>Select Repository-Directory</source> + <translation>Выберите директорию репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py" line="102"/> + <source>Select Project Directory</source> + <translation>Выберите директорию проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="44"/> + <source>Enter the URL of the repository</source> + <translation>Введите URL репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="67"/> + <source>Press to clear the history of entered repository URLs</source> + <translation>Очистить историю URLов, заданных для репозиториев</translation> + </message> +</context> +<context> + <name>GitOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="29"/> + <source>Commit &Message:</source> + <translation>&Описание коммита:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="39"/> + <source>Enter the log message for the new project.</source> + <translation>Введите сообщение для нового проекта в журнал.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="42"/> + <source><b>Log Message</b> +<p>Enter the log message to be used for the new project.</p></source> + <translation><b>Сообщение в журнал</b> +<p>Введите сообщение в журнал для нового проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="46"/> + <source>new project started</source> + <translation>начат новый проект</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="14"/> + <source>Initial Commit</source> + <translation>Первичная фиксация</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="17"/> + <source><b>Initial Commit Dialog</b> +<p>Enter the message for the initial commit.</p></source> + <translation><b>Диалог первичной фиксации</b> +<p>Введите сообщение для первичной фиксации.</p></translation> + </message> +</context> +<context> + <name>GitPage</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="20"/> + <source><b>Configure Git Interface</b></source> + <translation><b>Настройки интерфейса Git</b></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="40"/> + <source>Log</source> + <translation>Журнал истории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="46"/> + <source>No. of log messages shown:</source> + <translation>Количество отображаемых сообщений:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="53"/> + <source>Enter the number of log messages to be shown</source> + <translation>Задайте количество отображаемых сообщений журнала</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="118"/> + <source>Commit</source> + <translation>Коммит</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="124"/> + <source>No. of commit messages to remember:</source> + <translation>Количество сохраняемых сообщений коммитов:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="131"/> + <source>Enter the number of commit messages to remember</source> + <translation>Задайте количество сохраняемых сообщений коммитов</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="199"/> + <source>Cleanup</source> + <translation>Очистка</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="205"/> + <source>Pattern:</source> + <translation>Шаблон:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="212"/> + <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> + <translation>Введите шаблоны имен файлов, которые будут использованы для очистки (разделенные пробелом)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="222"/> + <source>Repository Optimization</source> + <translation>Оптимизация репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="228"/> + <source>Select this to use the '--aggressive' option for garbage collection</source> + <translation>Разрешить при сборке мусора использовать параметр '--aggressive'</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="231"/> + <source>Perform aggressive repository optimization</source> + <translation>Проводить агрессивную оптимизацию</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="241"/> + <source>Edit the Git configuration file</source> + <translation>Редактирование файла конфигурации Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="244"/> + <source>Edit configuration file</source> + <translation>Редактирование файла конфигурации</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="160"/> + <source>Commit ID length:</source> + <translation>Длина ID коммита:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="167"/> + <source>Enter the number of character to show for the commit ID</source> + <translation>Задайте количество символов, отображаемых для ID коммита</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="82"/> + <source>No. of subject characters shown in list:</source> + <translation>Количество отображаемых символов сообщений, показываемых в списке:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="89"/> + <source>Enter the number of characters of the commit subject to be shown in the list</source> + <translation>Задайте количество отображаемых символов сообщения фиксации, показываемых в списке</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="14"/> + <source>Select to perform an expensive copy detection</source> + <translation>Разрешить 'дорогостоящее' обнаружение копий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="95"/> + <source>All</source> + <translation>Все</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="108"/> + <source>Find copies harder</source> + <translation>Сложный поиск копий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="105"/> + <source>Select to perform expensive copy detection</source> + <translation>Разрешить 'дорогостоящее' обнаружение копий</translation> + </message> +</context> +<context> + <name>GitPatchFilesDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py" line="83"/> + <source>Patch Files</source> + <translation>Patch-файлы (файлы исправлений)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="37"/> + <source>Press to add patch files to the list</source> + <translation>Добавить патч файлы в список</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="44"/> + <source>Press to delete the selected patch files from the list</source> + <translation>Удалить выбранные патч файлы из списка</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="58"/> + <source>Press to move the selected file up</source> + <translation>Переместить выбранный файл вверх</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="65"/> + <source>Press to move the selected file down</source> + <translation>Переместить выбранный файл вниз</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="91"/> + <source>Strip Count:</source> + <translation>Счетчик удалений:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="98"/> + <source>Enter number of leading directories to strip off (default 1)</source> + <translation>Число лидирующих директорий для удаления (по умолчанию 1)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="129"/> + <source>Select, if the patch has inaccurate end-of-file markers</source> + <translation>Выбрать, если патч содержит неточные маркеры конца файла</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="132"/> + <source>Patch has inaccurate end-of-file</source> + <translation>Неточные маркеры конца файла</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="139"/> + <source>Select, if the line counts of the patch header may be wrong</source> + <translation>Выбрать, если неверно подсчитано количество строк заголовка патча</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="142"/> + <source>Don't trust line counts</source> + <translation>Не доверять счетчикам строк</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py" line="83"/> + <source>Patch Files (*.diff *.patch);;All Files (*)</source> + <translation>Файлы патчей (*.diff *.patch);Все файлы (*)</translation> + </message> +</context> +<context> + <name>GitPatchStatisticsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="14"/> + <source>Patch Statistics</source> + <translation>Статистика патчей (исправлений)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="23"/> + <source>Insertions and Deletions:</source> + <translation>Вставки и удаления:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="52"/> + <source># Insertions</source> + <translation># Вставок</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="57"/> + <source># Deletions</source> + <translation># Удалений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="62"/> + <source>File</source> + <translation>Файл</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="70"/> + <source>Summary Information:</source> + <translation>Сводная информация:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="122"/> + <source>Process Generation Error</source> + <translation>Ошибка при запуске процесса</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="122"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation> + </message> +</context> +<context> + <name>GitProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="488"/> + <source>Version Control</source> + <translation>Контроль версий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="499"/> + <source>Commit changes to repository...</source> + <translation>Фиксация изменений в репозитории...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="505"/> + <source>Add/Stage to repository</source> + <translation>Добавить/Индексировать в репозиторий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="508"/> + <source>Unstage changes</source> + <translation>Отменить индексирование изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="514"/> + <source>Remove from repository (and disk)</source> + <translation>Удаление из репозитория (и с диска)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="588"/> + <source>Remove from repository only</source> + <translation>Удалить только из репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="430"/> + <source>Copy</source> + <translation>Копировать</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="432"/> + <source>Move</source> + <translation>Переместить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="435"/> + <source>Show log browser</source> + <translation>Показать браузер журнала</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="520"/> + <source>Show status</source> + <translation>Показать статус</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="525"/> + <source>Show differences</source> + <translation>Показать различия</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="229"/> + <source>Show differences side-by-side</source> + <translation>Показать различия построчно</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="529"/> + <source>Show differences (extended)</source> + <translation>Показать различия (подробно)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="238"/> + <source>Show differences side-by-side (extended)</source> + <translation>Показать различия построчно (подробно)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="244"/> + <source>Show annotated file</source> + <translation>Показать аннотированный файл</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="535"/> + <source>Revert changes</source> + <translation>Отменить изменения</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="542"/> + <source>Select all local file entries</source> + <translation>Выделить все локальные файлы</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="544"/> + <source>Select all versioned file entries</source> + <translation>Выделить все версированные записи файла</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="546"/> + <source>Select all local directory entries</source> + <translation>Выделить все локальные записи директории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="548"/> + <source>Select all versioned directory entries</source> + <translation>Выделить все версированные записи директории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="551"/> + <source>Configure...</source> + <translation>Настроить...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="588"/> + <source>Do you really want to remove these files from the repository?</source> + <translation>Вы действительно хотите удалить эти файлы из репозитория?</translation> + </message> +</context> +<context> + <name>GitProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="73"/> + <source>New from repository</source> + <translation>Новый из репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="73"/> + <source>&New from repository...</source> + <translation>&Новый из репозитория...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="78"/> + <source>Create (clone) a new project from a Git repository</source> + <translation>Клонирование проекта из Git репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="81"/> + <source><b>New from repository</b><p>This creates (clones) a new local project from a Git repository.</p></source> + <translation><b>Новый из репозитория</b><p>Клонирование нового локального проекта из Git репозитория</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="89"/> + <source>Fetch changes</source> + <translation>Получить изменения (fetch)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="94"/> + <source>Fetch changes from a remote repository</source> + <translation>Извлечение изменений из удаленного репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="97"/> + <source><b>Fetch changes</b><p>This fetches changes from a remote repository into the local repository.</p></source> + <translation><b>Получить изменения</b><p>Извлечение изменений из удаленного репозитория в локальный.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="105"/> + <source>Pull changes</source> + <translation>Загрузить изменения (pull)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="110"/> + <source>Pull changes from a remote repository and update the work area</source> + <translation>Загрузка изменений из удаленного репозитория и обновление рабочей директории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="113"/> + <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository and updates the work area.</p></source> + <translation><b>Загрузить изменения</b><p>Затянуть изменения из удаленного репозитория и обновить рабочую область.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="137"/> + <source>Push changes</source> + <translation>Протолкнуть изменения (push)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="142"/> + <source>Push changes to a remote repository</source> + <translation>Протолкнуть (передать) изменения в удаленный репозиторий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="145"/> + <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> + <translation><b>Протолкнуть изменения</b><p>Передача изменений из локального проекта в удаленный репозиторий.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="153"/> + <source>Export from repository</source> + <translation>Экспорт из репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="153"/> + <source>&Export from repository...</source> + <translation>&Экспорт из репозитория...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="158"/> + <source>Export a project from the repository</source> + <translation>Экспортировать проект из репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="161"/> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation><b>Экспорт из репозитория</b><p>Экспорт проекта из репозитория.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="168"/> + <source>Show log browser</source> + <translation>Показать журнал истории (log)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="173"/> + <source>Show a dialog to browse the log of the local project</source> + <translation>Отображение диалога просмотра журнала локального проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="176"/> + <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation><b>Показать браузер журнала</b><p>Отображение диалога просмотра журнала локального проекта. Изначально показывается ограниченное количество записей. Следующие записи могут быть получены дополнительно.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="185"/> + <source>Show reflog browser</source> + <translation>Показать журнал ссылок</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="190"/> + <source>Show a dialog to browse the reflog of the local project</source> + <translation>Отображение диалога для просмотра журнала ссылок локального проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="193"/> + <source><b>Show reflog browser</b><p>This shows a dialog to browse the reflog of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation><b>Показать журнал ссылок</b><p>Отображение диалога для просмотра журнала ссылок локального проекта. Изначально показывается ограниченное количество записей. Дальнейшие записи могут быть получены позже.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="202"/> + <source>Show differences</source> + <translation>Показать различия</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="202"/> + <source>Show &differences...</source> + <translation>Показать &различия...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="207"/> + <source>Show the differences of the local project to the repository</source> + <translation>Показать изменения локального проекта относительно репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="210"/> + <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> + <translation><b>Показать различия</b><p>Отображение различий локального проекта относительно репозитория.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="218"/> + <source>Show differences (extended)</source> + <translation>Показать различия (подробно)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="218"/> + <source>Show differences (extended) ...</source> + <translation>Показать различия (подробно) ...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="223"/> + <source>Show the difference of revisions of the project to the repository</source> + <translation>Показать различие ревизий проекта в репозитории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="226"/> + <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> + <translation><b>Показать различия (подробно)</b><p>Отображение различий выделеных ревизий проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="234"/> + <source>Show status</source> + <translation>Показать статус</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="234"/> + <source>Show &status...</source> + <translation>Показать &статус...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="239"/> + <source>Show the status of the local project</source> + <translation>Отображение статуса локального проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="242"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation><b>Показать статус</b><p>Отображение статуса локального проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="249"/> + <source>Switch</source> + <translation>Переключиться</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="249"/> + <source>S&witch...</source> + <translation>Пе&реключиться (switch)...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="254"/> + <source>Switch the working directory to another revision</source> + <translation>Переключить рабочую директорию на другую ревизию</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="257"/> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation><b>Переключить</b><p>Переключение рабочей директории на другую ревизию.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="265"/> + <source>Tag in repository</source> + <translation>Теги в репозитории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="265"/> + <source>&Tag in repository...</source> + <translation>&Теги в репозитории...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="270"/> + <source>Perform tag operations for the local project</source> + <translation>Выполнить операции с тегами для локального проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="273"/> + <source><b>Tag in repository</b><p>This performs selectable tag operations for the local project.</p></source> + <translation><b>Теги в репозитории</b><p>Выполнить операции с тегами для локального проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="281"/> + <source>List tags</source> + <translation>Список тегов</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="281"/> + <source>&List tags...</source> + <translation>&Список тегов...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="285"/> + <source>List tags of the project</source> + <translation>Список тегов проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="288"/> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation><b>Список тегов</b><p>Отображение списка тегов проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="295"/> + <source>Show most recent tag</source> + <translation>Ближайший тег</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="299"/> + <source>Show the most recent tag reachable from the work tree</source> + <translation>Показать имя ближайшего тега, достижимое из рабочего дерева проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="302"/> + <source><b>Show most recent tag</b><p>This shows the most recent tag reachable from the work tree.</p></source> + <translation><b>Показать самый последний тег</b><p>Показать самый последний тег, ближайший к текущему состоянию рабочей директории.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="310"/> + <source>List branches</source> + <translation>Список ветвей</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="310"/> + <source>&List branches...</source> + <translation>&Список ветвей...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="314"/> + <source>List branches of the project</source> + <translation>Список ветвей текущего проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="317"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Список ветвей</b><p>Отображение спискп ветвей текущего проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="324"/> + <source>List merged branches</source> + <translation>Список слитых ветвей</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="324"/> + <source>List &merged branches...</source> + <translation>Список &слитых ветвей...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="328"/> + <source>List merged branches of the project</source> + <translation>Список слитых ветвей текущего проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="331"/> + <source><b>List merged branches</b><p>This lists the merged branches of the project.</p></source> + <translation><b>Список слитых ветвей</b><p>Отображение списка слитых ветвей текущего проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="339"/> + <source>List non-merged branches</source> + <translation>Список неслитых ветвей</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="339"/> + <source>List &non-merged branches...</source> + <translation>Список &неслитых ветвей...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="343"/> + <source>List non-merged branches of the project</source> + <translation>Список неслитых ветвей текущего проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="346"/> + <source><b>List non-merged branches</b><p>This lists the non-merged branches of the project.</p></source> + <translation><b>Список не слитых ветвей</b><p>Отображение списка не слитых ветвей текущего проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="354"/> + <source>Branch in repository</source> + <translation>Ветви в репозитории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="354"/> + <source>&Branch in repository...</source> + <translation>В&етви в репозитории...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="359"/> + <source>Perform branch operations for the local project</source> + <translation>Выполнить операции с ветвями для локального проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="362"/> + <source><b>Branch in repository</b><p>This performs selectable branch operations for the local project.</p></source> + <translation><b>Ветвь в репозитории</b><p>Выполнить операции с ветвями для локального проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="370"/> + <source>Delete Remote Branch</source> + <translation>Удалить удаленную ветвь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="370"/> + <source>&Delete Remote Branch...</source> + <translation>&Удалить удаленную ветвь...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="374"/> + <source>Delete a branch from a remote repository</source> + <translation>Удалить ветвь в удаленном репозитории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="377"/> + <source><b>Delete Remote Branch</b><p>This deletes a branch from a remote repository.</p></source> + <translation><b>Удалить удаленную ветвь</b><p>Удалить ветвь в удаленном репозитории.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="384"/> + <source>Show current branch</source> + <translation>Показать текущую ветвь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="388"/> + <source>Show the current branch of the project</source> + <translation>Отображение текущей ветви проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="391"/> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation><b>Показать текущую ветвь</b><p>Отображение текущей ветви проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="398"/> + <source>Revert changes</source> + <translation>Отменить изменения</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="398"/> + <source>Re&vert changes</source> + <translation>От&менить изменения</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="403"/> + <source>Revert all changes made to the local project</source> + <translation>Отменить все изменения, сделанные в локальном проекте</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="406"/> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> + <translation><b>Отменить изменения</b><p>Отмена всех изменений, сделанных в локальном проекте.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="413"/> + <source>Unstage changes</source> + <translation>Отменить индексирование изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="413"/> + <source>&Unstage changes</source> + <translation>&Отменить индексирование изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="418"/> + <source>Unstage all changes made to the local project</source> + <translation>Отменить индексирование всех изменений, сделанных в локальном проекте</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="421"/> + <source><b>Unstage changes</b><p>This unstages all changes made to the local project.</p></source> + <translation><b>Отменить индексирование изменений</b><p>Отмена индексирования всех изменений, сделанных в локальномо проекте.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="428"/> + <source>Merge</source> + <translation>Слить (merge)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="428"/> + <source>Mer&ge changes...</source> + <translation>С&лить изменения (merge)...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="433"/> + <source>Merge changes into the local project</source> + <translation>Слить изменения в локальном проекте</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="436"/> + <source><b>Merge</b><p>This merges changes into the local project.</p></source> + <translation><b>Слить</b><p>Слить изменения в локальном проекте.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="443"/> + <source>Cancel uncommitted/failed merge</source> + <translation>Отменить незафиксированное/неудачное слияние</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="447"/> + <source>Cancel an uncommitted or failed merge and lose all changes</source> + <translation>Отменить незафиксированное или неудачное слияние с потерей всех изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="450"/> + <source><b>Cancel uncommitted/failed merge</b><p>This cancels an uncommitted or failed merge causing all changes to be lost.</p></source> + <translation><b>Отменить незафиксированное или неудачное слияние</b><p>Отмена незафиксированного или неудачного слияния с потерей всех изменений.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="458"/> + <source>Commit failed merge</source> + <translation>Фиксация неудачного слияния</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="462"/> + <source>Commit a failed merge after conflicts have been resolved</source> + <translation>Фиксация неудачного слияния после разрешения конфликтов</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="465"/> + <source><b>Commit failed merge</b><p>This commits a failed merge after conflicts have been resolved.</p></source> + <translation><b>Фиксация неудачного слияния</b><p>Фиксация изменений неудачного слияния после разрешения конфликтов.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="473"/> + <source>Cleanup</source> + <translation>Очистка</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="473"/> + <source>Cleanu&p</source> + <translation>О&чистка (cleanup)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="477"/> + <source>Cleanup the local project</source> + <translation>Очистить локальный проект</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="480"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Очистка</b><p>Очистить локальный проект.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="487"/> + <source>Execute command</source> + <translation>Выполнить команду</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="487"/> + <source>E&xecute command...</source> + <translation>В&ыполнить команду...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="491"/> + <source>Execute an arbitrary Git command</source> + <translation>Выполнить произвольную команду Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="494"/> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Git command.</p></source> + <translation><b>Выполнить команду Git</b><p>Выполнить произвольную команду Git.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="502"/> + <source>Configure</source> + <translation>Настроить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="502"/> + <source>Configure...</source> + <translation>Настроить...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="506"/> + <source>Show the configuration dialog with the Git page selected</source> + <translation>Отображение страницы настроек Git в диалоге настроек</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="509"/> + <source><b>Configure</b><p>Show the configuration dialog with the Git page selected.</p></source> + <translation><b>Настроить</b><p>Отображение страницы настройки Git в диалоге настроек.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="517"/> + <source>Show Remotes</source> + <translation>Показать удаленные репозитории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="517"/> + <source>Show Remotes...</source> + <translation>Показать удаленные репозитории...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="521"/> + <source>Show the available remote repositories</source> + <translation>Показать доступные удаленные репозитории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="539"/> + <source><b>Show Remotes</b><p>This shows the remote repositories available for pulling, fetching and pushing.</p></source> + <translation><b>Показать удаленные репозитории</b><p>Показ удаленных репозиториев, доступных для загрузки, извлечения и передачи.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1765"/> + <source>Show Remote Info</source> + <translation>Показать инфо об удаленном репозитории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="532"/> + <source>Show Remote Info...</source> + <translation>Показать инфо об удаленном репозитории...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="536"/> + <source>Show information about a remote repository</source> + <translation>Показать информацию об удаленном репозитории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1161"/> + <source>Add</source> + <translation>Добавить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="547"/> + <source>Add...</source> + <translation>Добавить...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="551"/> + <source>Add a remote repository</source> + <translation>Добавить удаленный репозиторий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="554"/> + <source><b>Add</b><p>This adds a remote repository.</p></source> + <translation><b>Добавить</b><p>Добавление удаленного репозитория.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1785"/> + <source>Remove</source> + <translation>Удалить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="561"/> + <source>Remove...</source> + <translation>Удалить...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="565"/> + <source>Remove a remote repository</source> + <translation>Удалить удаленный репозиторий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="568"/> + <source><b>Remove</b><p>This removes a remote repository.</p></source> + <translation><b>Удалить</b><p>Удалить удаленный репозиторий.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1799"/> + <source>Prune</source> + <translation>Отсечь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="575"/> + <source>Prune...</source> + <translation>Отсечь...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="579"/> + <source>Prune stale remote-tracking branches of a remote repository</source> + <translation>Отсечь устаревшие отслеживаемые ветви удаленных репозиториев</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="582"/> + <source><b>Prune</b><p>This prunes stale remote-tracking branches of a remote repository.</p></source> + <translation><b>Отсечь</b><p>Отсечка устаревших отслеживаемых ветвей удаленных репозиториев.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <source>Rename</source> + <translation>Переименовать</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="590"/> + <source>Rename...</source> + <translation>Переименовать...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="594"/> + <source>Rename a remote repository</source> + <translation>Переименовать удаленный репозиторий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="597"/> + <source><b>Rename</b><p>This renames a remote repository.</p></source> + <translation><b>Переименовать</b><p>Переименование удаленного репозитория.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1833"/> + <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> + </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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="649"/> + <source>Cancel 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> + </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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="669"/> + <source>Stash all current changes of the project</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> + </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> + </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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> + <source>Show stash</source> + <translation>Показать "заначку"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> + <source>Show stash...</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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="702"/> + <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"/> + <source>Restore && Keep</source> + <translation>Восстановить && Сохранить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="714"/> + <source>Restore a stash but keep it</source> + <translation>Восстановить изменения из стека, но не удалять его</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="717"/> + <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"/> + <source>Restore && Delete</source> + <translation>Восстановить && Удалить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="728"/> + <source>Restore a stash and delete it</source> + <translation>Восстановить изменения из стека незавершенных изменений и удалить его</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="731"/> + <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"/> + <source>Create Branch</source> + <translation>Создать ветвь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="742"/> + <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"/> + <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"/> + <source>Delete</source> + <translation>Удалить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="757"/> + <source>Delete a stash</source> + <translation>Удалить стек незавершенных изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="760"/> + <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"/> + <source>Delete All</source> + <translation>Удалить все</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="771"/> + <source>Delete all stashes</source> + <translation>Удалить все стеки незавершенных изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="774"/> + <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"/> + <source>Edit user configuration</source> + <translation>Правка конфигурации пользователя</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <source>Edit user configuration...</source> + <translation>Правка конфигурации пользователя...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="785"/> + <source>Show an editor to edit the user configuration file</source> + <translation>Отображение редактора для правки конфигурации пользователя</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="788"/> + <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"/> + <source>Edit repository configuration</source> + <translation>Правка конфигурации репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <source>Edit repository configuration...</source> + <translation>Правка конфигурации репозитория...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="799"/> + <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> + </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> + </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> + </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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="862"/> + <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"/> + <source>Repository Statistics</source> + <translation>Статистика репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <source>Repository Statistics...</source> + <translation>Статистика репозитория...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="873"/> + <source>Show some statistics of the local repository</source> + <translation>Показ некоторых статистических данных локального репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="876"/> + <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"/> + <source>Create Archive</source> + <translation>Создать архив</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="887"/> + <source>Create an archive from the local repository</source> + <translation>Создать архив из локального репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="890"/> + <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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> + <source>List bundle heads...</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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="934"/> + <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"/> + <source>Apply Bundle (fetch)</source> + <translation>Применить пакет (fetch)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <source>Apply Bundle (fetch)...</source> + <translation>Применить пакет (fetch)...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="945"/> + <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"/> + <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"/> + <source>Apply Bundle (pull)</source> + <translation>Применить пакет (pull)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="955"/> + <source>Apply Bundle (pull)...</source> + <translation>Применить пакет (pull)...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="959"/> + <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"/> + <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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1003"/> + <source>Mark a selectable revision as good</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> + </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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1017"/> + <source>Mark a selectable revision as bad</source> + <translation>Пометить выбранный коммит как "плохой"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1020"/> + <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"/> + <source>Skip</source> + <translation>Пропустить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <source>Skip...</source> + <translation>Пропустить...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1031"/> + <source>Skip a selectable revision</source> + <translation>Пропустить выбранную ревизию</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1034"/> + <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"/> + <source>Reset</source> + <translation>Рестарт</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <source>Reset...</source> + <translation>Рестарт...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1045"/> + <source>Reset the bisect session</source> + <translation>Рестарт сессии двоичного поиска</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1048"/> + <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"/> + <source>Show bisect log browser</source> + <translation>Показать журнал двоичного поиска</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1060"/> + <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"/> + <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"/> + <source>Create replay file</source> + <translation>Создать файл повтора</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1076"/> + <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"/> + <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"/> + <source>Edit replay file</source> + <translation>Редактировать файл повтора</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1092"/> + <source>Edit a bisect replay file</source> + <translation>Редактировать файл повтора двоичного поиска</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1095"/> + <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"/> + <source>Replay session</source> + <translation>Повтор сессии</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1107"/> + <source>Replay a bisect session from file</source> + <translation>Повтор сессии двоичного поиска из файла</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1110"/> + <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"/> + <source>Administration</source> + <translation>Администрирование</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1360"/> + <source>Bundle Management</source> + <translation>Управление пакетами</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1690"/> + <source>Pull</source> + <translation>Загрузить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2237"/> + <source>Bisect</source> + <translation>Двоичный поиск (bisect)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1397"/> + <source>Tags</source> + <translation>Теги (tags)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1405"/> + <source>Branches</source> + <translation>Ветви (branches)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1418"/> + <source>Manage Changes</source> + <translation>Управление изменениями</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1426"/> + <source>Remote Repositories</source> + <translation>Удаленные репозитории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1436"/> + <source>Cherry-pick</source> + <translation>Выборка (cherry-pick)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1444"/> + <source>Stash</source> + <translation>Скрыть (stash)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1646"/> + <source>Branch</source> + <translation>Ветвь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <source>The project should be reread. Do this now?</source> + <translation>Проект должен быть перепрочитан. Сделать это сейчас?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1715"/> + <source>Revert Changes</source> + <translation>Отменить изменения</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1734"/> + <source>Unstage Changes</source> + <translation>Отменить индексирование изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <source>Select a remote repository:</source> + <translation>Выберите удаленный репозиторий:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1853"/> + <source>Copy Commits (Continue)</source> + <translation>Копировать коммиты (продолжить)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1872"/> + <source>Copy Commits (Quit)</source> + <translation>Копировать коммиты (закончить)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1892"/> + <source>Copy Commits (Cancel)</source> + <translation>Копировать коммиты (прервать)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1911"/> + <source>Save Stash</source> + <translation>Сохранить "заначку"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1961"/> + <source>Restore Stash</source> + <translation>Восстановить из "заначки"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="121"/> + <source>Commit changes to repository</source> + <translation>Фиксация изменений в репозитории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="121"/> + <source>Commit changes to repository...</source> + <translation>Фиксация изменений в репозитории...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="126"/> + <source>Commit changes of the local project to the Git repository</source> + <translation>Фиксация изменений локального проекта в Git репозитории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="129"/> + <source><b>Commit changes to repository</b><p>This commits changes of the local project to the Git repository.</p></source> + <translation><b>Фиксация изменений в репозитории</b><p>Фиксация изменений локального проекта в Git репозитории.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1541"/> + <source>Git</source> + <translation>Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1117"/> + <source>Check patch files</source> + <translation>Проверить файлы изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1121"/> + <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"/> + <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"/> + <source>Apply patch files</source> + <translation>Применить файлы изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1136"/> + <source>Apply a list of patch files</source> + <translation>Применить файлы изменений из списка</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1139"/> + <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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1180"/> + <source>List the submodule of the current project</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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1195"/> + <source>Initialize the submodules of the current project</source> + <translation>Инициализировать подмодули текущего проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1198"/> + <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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1241"/> + <source>Initialize and update submodules of the current project</source> + <translation>Инициализировать и обновить подмодули текущего проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1244"/> + <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"/> + <source>Fetch and Update</source> + <translation>Получить и обновить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1257"/> + <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>Synchronize URLs of submodules of the current project</source> + <translation>Синхронизация URL-адресов подмодулей текущего проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1293"/> + <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"/> + <source>Show Status</source> + <translation>Показать статус</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1306"/> + <source>Show the status of submodules of the current project</source> + <translation>Отображение статуса подмодулей текущего проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1309"/> + <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"/> + <source>Show Summary</source> + <translation>Показать сводку</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1322"/> + <source>Show summary information for submodules of the current project</source> + <translation>Отображение краткой сводки о подмодулях текущего проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1325"/> + <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"/> + <source>Submodules</source> + <translation>Подмодули</translation> + </message> +</context> +<context> + <name>GitPullDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="14"/> + <source>Git Pull</source> + <translation>Git: Загрузить (Pull)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="23"/> + <source>Remote Repository:</source> + <translation>Удаленный репозиторий:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="30"/> + <source>Select the remote repository to pull from</source> + <translation>Выберите удаленный репозиторий для загрузки (pull) из него изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="46"/> + <source>Remote Branches:</source> + <translation>Удаленные ветви:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="56"/> + <source>Press to update the list of remote branches</source> + <translation>Обновить список удаленных (remote) ветвей</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="59"/> + <source>Update</source> + <translation>Обновить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="81"/> + <source>Select the remote branches to be pulled</source> + <translation>Выберите удаленные ветви для загрузки (pull) из них изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="94"/> + <source>Select to remove non-existing tracking references </source> + <translation>Разрешить удаление несуществующих отслеживаемых ссылок</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="97"/> + <source>Prune obsolete tracking references</source> + <translation>Отсекать устаревшие отслеживаемые ссылки</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.py" line="36"/> + <source><All></source> + <translation><Все></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.py" line="37"/> + <source><Custom></source> + <translation><Пользовательские></translation> + </message> +</context> +<context> + <name>GitPushDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="14"/> + <source>Git Push</source> + <translation>Git: Передать (Push)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="25"/> + <source>Remote Repository:</source> + <translation>Удаленный репозиторий:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="32"/> + <source>Select the remote repository to push to</source> + <translation>Выберите удаленный репозиторий для передачи (push) изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="48"/> + <source>Branches to be pushed</source> + <translation>Ветви для передачи</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="70"/> + <source>Push?</source> + <translation>Передать?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="75"/> + <source>Local</source> + <translation>Локальная</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="80"/> + <source>Remote</source> + <translation>Удаленная</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="85"/> + <source>Force?</source> + <translation>Принудительно?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="93"/> + <source>Press to select all branches</source> + <translation>Выбрать все ветви</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="96"/> + <source>Select All</source> + <translation>Выбрать все</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="106"/> + <source><b>WARNING: The "Force" option can result in dangling branches in the remote repository.</b></source> + <translation><b>ВНИМАНИЕ: Опция "Force" ("Принудительно") может привести к зависанию ветвей в удаленном репозитории.</b></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="119"/> + <source>Select to push tags as well</source> + <translation>Разрешить так же передавать теги</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="122"/> + <source>Include tags</source> + <translation>Включая теги</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="129"/> + <source>Select this to associate a remote tracking branch</source> + <translation>Выбрать для привязывания отслеживаемой удаленной ветви</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="132"/> + <source>Set tracking information</source> + <translation>Устанавливать отслеживаемую информацию</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="139"/> + <source>Push Submodules</source> + <translation>Передача (push) подмодулей</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="145"/> + <source>Select to push submodules automatically</source> + <translation>Разрешить передачу (push) подмодулей автоматически</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="148"/> + <source>on-demand</source> + <translation>по требованию</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="161"/> + <source>check</source> + <translation>проверять</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="168"/> + <source>Select to push submodules only</source> + <translation>Разрешить передачу (push) только подмодулей</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="171"/> + <source>only</source> + <translation>только</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="178"/> + <source>Select to not push any submodule</source> + <translation>Разрешить не передавать (push) ни какие подмодуль</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="181"/> + <source>no</source> + <translation>нет</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="158"/> + <source>Select to check, if submodules were pushed already</source> + <translation>Разрешить проверку если подмодули уже были переданы</translation> + </message> +</context> +<context> + <name>GitReflogBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="14"/> + <source>Git Reflog</source> + <translation>Git: Журнал ссылок указателей HEAD и веток</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="42"/> + <source>Commit</source> + <translation>Коммит</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="47"/> + <source>Selector</source> + <translation>Указатель</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="52"/> + <source>Name</source> + <translation>Имя</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="57"/> + <source>Operation</source> + <translation>Операция</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="62"/> + <source>Subject</source> + <translation>Сообщение</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="72"/> + <source>Press to get the next bunch of log entries</source> + <translation>Получить следующую порцию записей журнала</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="75"/> + <source>&Next</source> + <translation>&Далее</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="82"/> + <source>Enter the limit of entries to fetch</source> + <translation>Задайте количество извлекаемых записей </translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="122"/> + <source>Errors</source> + <translation>Ошибки</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="128"/> + <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/GitReflogBrowserDialog.ui" line="144"/> + <source>Input</source> + <translation>Ввод</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="166"/> + <source>Press to send the input to the git process</source> + <translation>Отправить введеную строку на вход git процесса</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="169"/> + <source>&Send</source> + <translation>&Отправить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="172"/> + <source>Alt+S</source> + <translation>Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="179"/> + <source>Enter data to be sent to the git process</source> + <translation>Введите данные для отправки git процессу</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="186"/> + <source>Select to switch the input field to password mode</source> + <translation>Задать режим ввода пароля для поля ввода пароля</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="189"/> + <source>&Password Mode</source> + <translation>&Парольный режим</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="192"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="59"/> + <source>&Refresh</source> + <translation>&Освежить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="61"/> + <source>Press to refresh the list of commits</source> + <translation>Освежить список коммитов</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="200"/> + <source>Process Generation Error</source> + <translation>Ошибка при запуске процесса</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="200"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation> + </message> +</context> +<context> + <name>GitRemoteRepositoriesDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="14"/> + <source>Git Remote Repositories</source> + <translation>Git: Удаленные репозитории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="17"/> + <source><b>Git Remote Repositories</b> +<p>This dialog shows the available remote repositories.</p></source> + <translation><b>Удаленные репозитории Git</b><p>Отображает в диалоговом окне доступные удаленные репозитории.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="30"/> + <source>Remote Repositories</source> + <translation>Удаленные репозитории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="46"/> + <source>Name</source> + <translation>Имя</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="51"/> + <source>URL</source> + <translation>URL</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="56"/> + <source>Operation</source> + <translation>Операция</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="82"/> + <source>Press to add a remote repository</source> + <translation>Добавить удаленный репозиторий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="85"/> + <source>&Add</source> + <translation>&Добавить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="92"/> + <source>Press to rename the selected repository</source> + <translation>Переименовать выбранный репозиторий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="95"/> + <source>&Rename</source> + <translation>&Переименовать</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="102"/> + <source>Press to remove 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"/> + <source>Press to show information about the selected repository</source> + <translation>Информация о выбранном репозитории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="132"/> + <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>Alt+S</source> + <translation>Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="217"/> + <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"/> + <source>Select to switch the input field to password mode</source> + <translation>Задать режим ввода пароля для поля ввода пароля</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="227"/> + <source>&Password Mode</source> + <translation>&Парольный режим</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="230"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="51"/> + <source>Refresh</source> + <translation>Освежить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="53"/> + <source>Press to refresh the repositories display</source> + <translation>Освежить отображение репозиториев</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="148"/> + <source>Process Generation Error</source> + <translation>Ошибка при запуске процесса</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="148"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation> + </message> +</context> +<context> + <name>GitRevisionSelectionDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="14"/> + <source>Git Revision</source> + <translation>Git: Ревизии</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="23"/> + <source>Revision</source> + <translation>Ревизия</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="29"/> + <source>Select to specify a revision by a revision expression</source> + <translation>Разрешить задание ревизим с помощью обозначения ревизии</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="32"/> + <source>Commit:</source> + <translation>Коммит:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="42"/> + <source>Enter a commit id</source> + <translation>Введите идентификатор коммита</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation>Разрешить задание ревизии с помощью тега</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="52"/> + <source>Tag:</source> + <translation>Тег:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="68"/> + <source>Enter a tag name</source> + <translation>Введите имя тега</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="78"/> + <source>Select to specify a revision by a branch</source> + <translation>Разрешить задание ревизии с помощью ветви</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="81"/> + <source>Branch:</source> + <translation>Ветвь:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="97"/> + <source>Enter a branch name</source> + <translation>Введите имя ветви</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="136"/> + <source>Select HEAD revision</source> + <translation>Выбрать указатель HEAD ревизии</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="139"/> + <source>HEAD</source> + <translation>HEAD</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="146"/> + <source>No revision selected</source> + <translation>Не задавать ревизию</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="107"/> + <source>Select to specify a revision by a remote branch</source> + <translation>Разрешить задание ревизии с помощью удаленной ветви</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="110"/> + <source>Remote Branch:</source> + <translation>Удаленная ветвь:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="126"/> + <source>Enter a remote branch name</source> + <translation>Введите имя удаленной ветви</translation> + </message> +</context> +<context> + <name>GitRevisionsSelectionDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="14"/> + <source>Git Diff</source> + <translation>Git: Различия</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="23"/> + <source>Revision &1</source> + <translation>Ревизия &1</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="137"/> + <source>Select to specify a revision by a revision expression</source> + <translation>Разрешить задание ревизии с помощью обозначения ревизии</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="140"/> + <source>Commit:</source> + <translation>Коммит:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="150"/> + <source>Enter a commit id</source> + <translation>Введите идентификатор коммита</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="157"/> + <source>Select to specify a revision by a tag</source> + <translation>Разрешить задание ревизии с помощью тега</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="160"/> + <source>Tag:</source> + <translation>Тег:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="170"/> + <source>Enter a tag name</source> + <translation>Введите имя тега</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="180"/> + <source>Select to specify a revision by a branch</source> + <translation>Разрешить задание ревизии с помощью ветви</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="183"/> + <source>Branch:</source> + <translation>Ветвь:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="193"/> + <source>Enter a branch name</source> + <translation>Введите имя ветви</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="203"/> + <source>Select HEAD revision</source> + <translation>Выбрать указатель HEAD ревизии</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="206"/> + <source>HEAD</source> + <translation>HEAD</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="216"/> + <source>Select revision before HEAD</source> + <translation>Выбрать ревизию предыдущую HEAD</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="219"/> + <source>HEAD^</source> + <translation>HEAD^</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="226"/> + <source>No revision selected</source> + <translation>Не задавать ревизию</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="131"/> + <source>Revision &2</source> + <translation>Ревизия &2</translation> + </message> +</context> +<context> + <name>GitStashBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="14"/> + <source>Git Stash Browser</source> + <translation>Git: Браузер стеков незавершенных изменений ("заначек")</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="42"/> + <source>Name</source> + <translation>Имя</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="47"/> + <source>Date</source> + <translation>Дата</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="52"/> + <source>Message</source> + <translation>Сообщение</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="66"/> + <source>Statistics</source> + <translation>Статистика</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="91"/> + <source>File</source> + <translation>Файл</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="96"/> + <source>Changes</source> + <translation>Изменения</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="101"/> + <source>Lines added</source> + <translation>Добавлено строк</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="106"/> + <source>Lines deleted</source> + <translation>Удалено строк</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="153"/> + <source>Errors</source> + <translation>Ошибки</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="159"/> + <source><b>Git stash errors</b><p>This shows possible error messages of the git stash command.</p></source> + <translation><b>Ошибки 'git stash' </b><p>Отображение возможных сообщений ошибки команды 'git stash'.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="175"/> + <source>Input</source> + <translation>Ввод</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="197"/> + <source>Press to send the input to the git process</source> + <translation>Отправить введеную строку на вход git процесса</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="200"/> + <source>&Send</source> + <translation>&Отправить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="203"/> + <source>Alt+S</source> + <translation>Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="210"/> + <source>Enter data to be sent to the git process</source> + <translation>Введите данные для отправки git процессу</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="217"/> + <source>Select to switch the input field to password mode</source> + <translation>Задать режим ввода пароля для поля ввода пароля</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="220"/> + <source>&Password Mode</source> + <translation>&Парольный режим</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="223"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="65"/> + <source>&Refresh</source> + <translation>&Освежить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="82"/> + <source>Show</source> + <translation>Показать</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="85"/> + <source>Restore && Keep</source> + <translation>Восстановить && Сохранить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="87"/> + <source>Restore && Delete</source> + <translation>Восстановить && Удалить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="90"/> + <source>Create Branch</source> + <translation>Создать ветвь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="93"/> + <source>Delete</source> + <translation>Удалить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="95"/> + <source>Delete All</source> + <translation>Удалить все</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="182"/> + <source>Process Generation Error</source> + <translation>Ошибка при запуске процесса</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="182"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation> + </message> + <message numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="369"/> + <source>%n file(s) changed</source> + <translation> + <numerusform>%n файл изменен</numerusform> + <numerusform>%n файла изменены</numerusform> + <numerusform>%n файлов изменены</numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="371"/> + <source>%n line(s) inserted</source> + <translation> + <numerusform>%n строка вставлена</numerusform> + <numerusform>%n строки вставлены</numerusform> + <numerusform>%n строк вставлены</numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="373"/> + <source>%n line(s) deleted</source> + <translation> + <numerusform>%n строка удалена</numerusform> + <numerusform>%n строки удалены</numerusform> + <numerusform>%n строк удалены</numerusform> + </translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="67"/> + <source>Press to refresh the list of stashes</source> + <translation>Освежить список "заначек"</translation> + </message> +</context> +<context> + <name>GitStashDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="14"/> + <source>Git Stash</source> + <translation>Git: Скрыть незавершенные изменения ("заначка")</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="23"/> + <source>Message:</source> + <translation>Сообщение:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="33"/> + <source>Enter a message for the stash</source> + <translation>Введите сообщение для "заначки"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="40"/> + <source>Keep changes in staging area</source> + <translation>Оставить изменения в области индексирования</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="47"/> + <source>Untracked/Ignored Files</source> + <translation>Неотслеживаемые/игнорируемые файлы</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="53"/> + <source>Select to not stash untracked or ignored files</source> + <translation>Разрешить не скрывать неотслеживаемые или игнорируемые файлы</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="56"/> + <source>Don't stash untracked or ignored files</source> + <translation>Не скрывать неотслеживаемые или игнорируемые файлы</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="66"/> + <source>Select to stash untracked files</source> + <translation>Разрешить скрывать неотслеживаемые файлы</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="69"/> + <source>Stash untracked files</source> + <translation>Скрывать неотслеживаемые файлы</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="76"/> + <source>Select to stash untracked and ignored files</source> + <translation>Разрешить скрывать неотслеживаемые и игнорируемые файлы</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="79"/> + <source>Stash untracked and ignored files</source> + <translation>Скрывать неотслеживаемые и игнорируемые файлы</translation> + </message> +</context> +<context> + <name>GitStatusDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="395"/> + <source>Git Status</source> + <translation>Git: Статус</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="17"/> + <source><b>Git Status</b> +<p>This dialog shows the status of the selected file or project.</p></source> + <translation><b>Git Status</b> +<p>Отображение в диалоговом окне статуса выбранного файла или проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="49"/> + <source>&Filter on Status:</source> + <translation>&Фильтр статуса:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="59"/> + <source>Select the status of entries to be shown</source> + <translation>Выберите статус записей для показа</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="662"/> + <source>Commit</source> + <translation>Зафиксировать</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="105"/> + <source>Status (Work)</source> + <translation>Статус (Рабочее дерево)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="110"/> + <source>Status (Staging)</source> + <translation>Статус (Область индексирования)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="115"/> + <source>Path</source> + <translation>Путь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="197"/> + <source>Commit the selected changes</source> + <translation>Зафиксировать выбранные изменения</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="200"/> + <source>Amend the latest commit with the selected changes</source> + <translation>Поправить (amend) последний коммит с выбранными изменениями</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="252"/> + <source>Errors</source> + <translation>Ошибки</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="271"/> + <source>Input</source> + <translation>Ввод</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="293"/> + <source>Press to send the input to the git process</source> + <translation>Отправить введеную строку на вход git процесса</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="296"/> + <source>&Send</source> + <translation>&Отправить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="299"/> + <source>Alt+S</source> + <translation>Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="306"/> + <source>Enter data to be sent to the git process</source> + <translation>Введите данные для отправки git процессу</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="313"/> + <source>Select to switch the input field to password mode</source> + <translation>Задать режим ввода пароля для поля ввода пароля</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="316"/> + <source>&Password Mode</source> + <translation>&Парольный режим</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="319"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="65"/> + <source>Refresh</source> + <translation>Освежить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="67"/> + <source>Press to refresh the status display</source> + <translation>Освежить отображение статуса</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="202"/> + <source>Select all for commit</source> + <translation>Выбрать все для фиксации</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="211"/> + <source>Stage changes</source> + <translation>Индексировать изменения</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="215"/> + <source>Unstage changes</source> + <translation>Отменить индексирование изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="242"/> + <source>Forget missing</source> + <translation>Забыть об утерянных</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="246"/> + <source>Restore missing</source> + <translation>Восстановить утерянные</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="253"/> + <source>Edit file</source> + <translation>Редактировать файл</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="260"/> + <source>Adjust column sizes</source> + <translation>Уточнить размеры колонок</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="169"/> + <source>added</source> + <translation>добавлено</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="170"/> + <source>copied</source> + <translation>скопировано</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="171"/> + <source>deleted</source> + <translation>удалено</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="172"/> + <source>modified</source> + <translation>модифицировано</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="173"/> + <source>renamed</source> + <translation>переименовано</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="175"/> + <source>not tracked</source> + <translation>не отслеживается</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="174"/> + <source>unmerged</source> + <translation>не слито</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="168"/> + <source>unmodified</source> + <translation>нет изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="176"/> + <source>ignored</source> + <translation>игнорировано</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="423"/> + <source>Process Generation Error</source> + <translation>Ошибка при запуске процесса</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="423"/> + <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/GitStatusDialog.py" line="596"/> + <source>all</source> + <translation>все</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="662"/> + <source>There are no entries selected to be committed.</source> + <translation>Не выбраны записи для фиксации.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="703"/> + <source>Add</source> + <translation>Добавить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="703"/> + <source>There are no unversioned entries available/selected.</source> + <translation>Нет доступных/выбранных неверсированных записей.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="725"/> + <source>Stage</source> + <translation>Индексировать</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="725"/> + <source>There are no stageable entries available/selected.</source> + <translation>Нет доступных/выбранных записей для индексирования.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="747"/> + <source>Unstage</source> + <translation>Отменить индексирование</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="747"/> + <source>There are no unstageable entries available/selected.</source> + <translation>Нет доступных/выбранных деиндексированных записей.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="769"/> + <source>Forget Missing</source> + <translation>Забыть об утерянных</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="810"/> + <source>There are no missing entries available/selected.</source> + <translation>Нет доступных/выбраных недостающих записей.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="786"/> + <source>Revert</source> + <translation>Отменить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="786"/> + <source>There are no uncommitted, unstaged changes available/selected.</source> + <translation>Нет доступных/выбранных нефиксированных, неиндексированных изменений.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="810"/> + <source>Restore Missing</source> + <translation>Восстановить утерянные</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="839"/> + <source>Differences</source> + <translation>Различия</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="839"/> + <source>There are no uncommitted changes available/selected.</source> + <translation>Нет доступных/выбранных нефиксированных изменений.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="891"/> + <source>Working Tree to Staging Area</source> + <translation>Рабочее дерево проекта и область индексирования</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="870"/> + <source>Staging Area to HEAD Commit</source> + <translation>Область индексирования и HEAD коммит</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="892"/> + <source>Working Tree to HEAD Commit</source> + <translation>Рабочее дерево проекта и HEAD коммит</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="894"/> + <source>Side-by-Side Difference</source> + <translation>Сводка различий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="894"/> + <source>Select the compare method.</source> + <translation>Выберите метод сравнения.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="155"/> + <source>Difference Working to Staging</source> + <translation>Различия рабочего дерева и области индексирования</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="209"/> + <source>Difference Staging to HEAD</source> + <translation>Различия области индексирования и HEAD коммита</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="105"/> + <source>Stage Selected Lines</source> + <translation>Индексировать выбранные строки</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="109"/> + <source>Revert Selected Lines</source> + <translation>Отменить изменения выбранных строк</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="113"/> + <source>Stage Hunk</source> + <translation>Индексировать фрагмент</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="117"/> + <source>Revert Hunk</source> + <translation>Отменить изменения фрагмента</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="123"/> + <source>Unstage Selected Lines</source> + <translation>Отменить индексирование выбранных строк</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="127"/> + <source>Unstage Hunk</source> + <translation>Отменить индексирование фрагмента</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1201"/> + <source>Revert selected lines</source> + <translation>Отменить изменения выбранных строк</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1203"/> + <source>Revert hunk</source> + <translation>Отменить изменения фрагмента</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1204"/> + <source>Are you sure you want to revert the selected changes?</source> + <translation>Вы действительно хотите отменить выбранные изменения?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="26"/> + <source>Select action from menu</source> + <translation>Выберите действие из меню</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="198"/> + <source>Amend</source> + <translation>Поправить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="204"/> + <source>Unselect all from commit</source> + <translation>Отменить все выбранное для фиксации</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="210"/> + <source>Add the selected files</source> + <translation>Добавить выбранные файлы</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="213"/> + <source>Stages all changes of the selected files</source> + <translation>Индексировать все изменения выбранных файлов</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="217"/> + <source>Unstages all changes of the selected files</source> + <translation>Отменить индексирование всех изменений выбранных файлов</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="224"/> + <source>Shows the differences of the selected entry in a separate dialog</source> + <translation>Показать различия выбранных записей в отдельном диалоге</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="227"/> + <source>Differences Side-By-Side</source> + <translation>Различия построчно</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="229"/> + <source>Shows the differences of the selected entry side-by-side in a separate dialog</source> + <translation>Показать различия выбранных записей построчно в отдельном диалоге</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="237"/> + <source>Reverts the changes of the selected files</source> + <translation>Отменить изменения выбранных файлов</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="244"/> + <source>Forgets about the selected missing files</source> + <translation>Забыть об отмеченных утерянных файлах</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="248"/> + <source>Restores the selected missing files</source> + <translation>Восстановить выбранные утерянные файлы</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="255"/> + <source>Edit the selected conflicting file</source> + <translation>Редактировать выбранный конфликтующий файл</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="262"/> + <source>Adjusts the width of all columns to their contents</source> + <translation>Настроить ширину колонок по их содержимому</translation> + </message> +</context> +<context> + <name>GitStatusMonitorThread</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py" line="93"/> + <source>Could not start the Git process.</source> + <translation>Невозможно запустить Git.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py" line="133"/> + <source>Git status checked successfully</source> + <translation>Статус Git успешно проверен</translation> + </message> +</context> +<context> + <name>GitSubmoduleAddDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="14"/> + <source>Add Submodule</source> + <translation>Добавить подмодуль</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="23"/> + <source>&URL:</source> + <translation>&URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="39"/> + <source>Enter the URL of the repository</source> + <translation>Введите URL репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="55"/> + <source>Select the repository URL via a directory selection dialog</source> + <translation>Выберите URL репозитория посредством диалога выбора директории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="62"/> + <source>Press to clear the history of entered repository URLs</source> + <translation>Очистить историю URLов, заданных для репозиториев</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="69"/> + <source>Submodule &Directory:</source> + <translation>Директория &подмодуля:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="79"/> + <source>Enter the directory for the submodule (leave empty to use default).</source> + <translation>Задайте директорию подмодуля (оставить пустым при использовании по умолчанию).</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="89"/> + <source>&Branch:</source> + <translation>&Ветвь:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="99"/> + <source>Enter a branch name</source> + <translation>Введите имя ветви</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="106"/> + <source>&Logical Name:</source> + <translation>&Логическое имя:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="116"/> + <source>Enter a logical name</source> + <translation>Введите логическое имя</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="123"/> + <source>Select to enforce the operation</source> + <translation>Разрешить принудительное выполнение операций</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="126"/> + <source>&Force Operation</source> + <translation>&Принудительное выполнение</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="92"/> + <source>Select Submodule Repository Directory</source> + <translation>Выберите директорию репозитория подмодулей</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="118"/> + <source>Select Submodule Directory</source> + <translation>Выберите директорию подмодуля</translation> + </message> +</context> +<context> + <name>GitSubmodulesDeinitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="14"/> + <source>Unregister Submodules</source> + <translation>Отмена регистрации подмодулей</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="23"/> + <source>Select to unregister all submodules</source> + <translation>Разрешить отмену регистрации всех подмодулей</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="26"/> + <source>Unregister All Submodules</source> + <translation>Отменить регистрацию всех подмодулей</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="33"/> + <source>Selected Submodules:</source> + <translation>Выбранные подмодули:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="40"/> + <source>Select the submodules to be unregistered</source> + <translation>Выберите подмодули для отмены их регистрации</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="53"/> + <source>Select to enforce unregistering</source> + <translation>Разрешить принудительную отмену регистрации</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="56"/> + <source>Enforce Operation</source> + <translation>Выполнять принудительно</translation> + </message> +</context> +<context> + <name>GitSubmodulesListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="14"/> + <source>Defined Submodules</source> + <translation>Определенные подмодули</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="39"/> + <source>Name</source> + <translation>Имя</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="44"/> + <source>Path</source> + <translation>Путь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="49"/> + <source>URL</source> + <translation>URL</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="54"/> + <source>Branch</source> + <translation>Ветвь</translation> + </message> +</context> +<context> + <name>GitSubmodulesStatusDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="14"/> + <source>Submodules Status</source> + <translation>Статус подмодулей</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="33"/> + <source>Submodule</source> + <translation>Подмодуль</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="38"/> + <source>Status</source> + <translation>Статус</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="43"/> + <source>Commit ID</source> + <translation>ID коммита</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="48"/> + <source>Info</source> + <translation>Инфо</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="58"/> + <source>Select to show the status for the index</source> + <translation>Разрешить отображать статус индекса</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="61"/> + <source>Show Status for Index</source> + <translation>Показывать статус индекса</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="68"/> + <source>Perform a recursive operation</source> + <translation>Выполнять рекурсивные операции</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="71"/> + <source>Recursive</source> + <translation>Рекурсия</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="99"/> + <source>Errors</source> + <translation>Ошибки</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="46"/> + <source>up-to-date</source> + <translation>новейший</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="47"/> + <source>not initialized</source> + <translation>не инициализирован</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="48"/> + <source>different to index</source> + <translation>отличный от индекса</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="49"/> + <source>merge conflicts</source> + <translation>конфликты слияния</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="55"/> + <source>Refresh</source> + <translation>Освежить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="57"/> + <source>Press to refresh the status display</source> + <translation>Освежить отображение статуса</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="105"/> + <source>The process {0} did not finish within 30 seconds.</source> + <translation>Процесс {0} не завершился в течение 30 сек.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="109"/> + <source>The process {0} finished with an error. +Error: {1}</source> + <translation>Процесс {0} завершился с ошибкой. +Ошибка: {1}</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="115"/> + <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/GitSubmodulesStatusDialog.py" line="134"/> + <source>unknown</source> + <translation>неизвестный</translation> + </message> +</context> +<context> + <name>GitSubmodulesSummaryOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="23"/> + <source>Selected Submodules:</source> + <translation>Выбранные подмодули:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="30"/> + <source>Select the submodules to show the summary for</source> + <translation>Выберите подмодули для отображения сводки о них</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="43"/> + <source>Select to show summary information for the index of the superproject</source> + <translation>Разрешить отображение сводной информации для индекса суперпроекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="46"/> + <source>Show Summary for Superproject Index</source> + <translation>Отображать сводку индекса суперпроекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="53"/> + <source>Select to show summary information for the index</source> + <translation>Разрешить отображение сводной информации для индекса</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="56"/> + <source>Show Summary for Index</source> + <translation>Отображать сводку индекса</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="63"/> + <source>Commit:</source> + <translation>Коммит:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="70"/> + <source>Enter a commit ID to show summary information for</source> + <translation>Введите ID коммита для отображения для него сводки</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="73"/> + <source>Enter Commit ID</source> + <translation>Введите ID коммита</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="80"/> + <source>Limit:</source> + <translation>Лимит:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="87"/> + <source>Enter the maximum number of entries to be shown per submodule</source> + <translation>Максимальное количество записей, отображаемых для подмодуля</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="93"/> + <source>No Limit</source> + <translation>Без ограничений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="14"/> + <source>Submodule Summary Options</source> + <translation>Параметры сводки подмодуля</translation> + </message> +</context> +<context> + <name>GitSubmodulesSyncDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="14"/> + <source>Synchronize Submodule URLs</source> + <translation>Синхронизировать URL-адреса подмодулей</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="23"/> + <source>Selected Submodules:</source> + <translation>Выбранные подмодули:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="30"/> + <source>Select the submodules to be synchronized</source> + <translation>Выберите подмодули для синхронизации</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="43"/> + <source>Select to perform a recursive synchronization</source> + <translation>Разрешить выполнение рекурсивной синхронизации</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="46"/> + <source>Recursive Operation</source> + <translation>Рекурсивные операции</translation> + </message> +</context> +<context> + <name>GitSubmodulesUpdateOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="14"/> + <source>Submodule Update Options</source> + <translation>Параметры обновления подмодуля</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="23"/> + <source>Update Procedure</source> + <translation>Процедура обновления</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="29"/> + <source>Select to perform a 'checkout' procedure</source> + <translation>Разрешить выполнение процедуры 'checkout'</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="32"/> + <source>checkout</source> + <translation>checkout</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="42"/> + <source>Select to perform a 'rebase' procedure</source> + <translation>Разрешить выполнение процедуры 'rebase'</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="45"/> + <source>rebase</source> + <translation>rebase</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="52"/> + <source>Select to perform a 'merge' procedure</source> + <translation>Разрешить выполнение процедуры 'merge'</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="55"/> + <source>merge</source> + <translation>merge</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="65"/> + <source>Select to initialize submodules before the update</source> + <translation>Разрешить инициализацию подмодулей перед обновлением</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="68"/> + <source>Initialize before Update</source> + <translation>Инициализация перед обновлением</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="75"/> + <source>Fetch remote changes before updating</source> + <translation>Получать удаленные изменения перед обновлением</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="78"/> + <source>Synchronize with remote</source> + <translation>Синхронизация с удаленным репозиторием</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="88"/> + <source>Select to not fetch the remote</source> + <translation>Разрешить не получать (not fetch) удаленные изменения</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="91"/> + <source>Don't Fetch</source> + <translation>Не получать изменения</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="98"/> + <source>Selected Submodules:</source> + <translation>Выбранные подмодули:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="105"/> + <source>Select the submodules to be updated</source> + <translation>Выберите подмодули для обновления</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="118"/> + <source>Select to enforce the update</source> + <translation>Разрешить принудительное обновление</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="121"/> + <source>Enforce Operation</source> + <translation>Выполнять принудительно</translation> + </message> +</context> +<context> + <name>GitTagBranchListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="14"/> + <source>Git Tag List</source> + <translation>Git: Список тегов</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="17"/> + <source><b>Git Tag/Branch List</b> +<p>This dialog shows a list of the projects tags or branches.</p></source> + <translation><b>Список тегов/ветвей Git</b> +<p>Отображение в диалоговом окне списка тегов и ветвей проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="33"/> + <source><b>Tag/Branches List</b> +<p>This shows a list of the projects tags or branches.</p></source> + <translation><b>Список тегов/ветвей</b> +<p>Отображение списка тегов или ветвей проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="99"/> + <source>Commit</source> + <translation>Коммит</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="99"/> + <source>Name</source> + <translation>Имя ветви</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="69"/> + <source>Errors</source> + <translation>Ошибки</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="88"/> + <source>Input</source> + <translation>Ввод</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="110"/> + <source>Press to send the input to the git process</source> + <translation>Отправить введеную строку на вход git процесса</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="113"/> + <source>&Send</source> + <translation>&Отправить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="116"/> + <source>Alt+S</source> + <translation>Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="123"/> + <source>Enter data to be sent to the git process</source> + <translation>Введите данные для отправки git процессу</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="130"/> + <source>Select to switch the input field to password mode</source> + <translation>Задать режим ввода пароля для поля ввода пароля</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="133"/> + <source>&Password Mode</source> + <translation>&Парольный режим</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="136"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="94"/> + <source>Annotation Message</source> + <translation>Сообщение аннотации</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="98"/> + <source>Git Branches List</source> + <translation>Git: Список ветвей</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="135"/> + <source>Process Generation Error</source> + <translation>Ошибка при запуске процесса</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="135"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation> + </message> +</context> +<context> + <name>GitTagDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="14"/> + <source>Git Tag</source> + <translation>Git: Теги</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="23"/> + <source>Name:</source> + <translation>Имя:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="36"/> + <source>Enter the name of the tag</source> + <translation>Задайте имя тега</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="39"/> + <source><b>Tag Name</b> +<p>Enter the name of the tag to be created, deleted or verified.</p></source> + <translation><b>Имя тега</b> +<p>Введите имя тега для создания/удаления/проверки.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="53"/> + <source>Revision:</source> + <translation>Ревизия:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="60"/> + <source>Enter a revision to set a tag for</source> + <translation>Задайте ревизию для установки тега</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="67"/> + <source>Tag Action</source> + <translation>Операции с тегами</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="73"/> + <source>Select to create a tag</source> + <translation>Разрешить создание тега</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="76"/> + <source><b>Create Tag</b> +<p>Select this entry in order to create a tag.</p></source> + <translation><b>Создать тег</b> +<p>Выбор зтого пункта позволяет создавать тег.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="80"/> + <source>Create Tag</source> + <translation>Создать тег</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="90"/> + <source>Select to delete a tag</source> + <translation>Разрешить удаление тега</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="93"/> + <source><b>Delete Tag</b> +<p>Select this entry in order to delete the selected tag.</p></source> + <translation><b>Удалить тег</b> +<p>Выбор этого пункта позволяет удалять выбранный тег.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="97"/> + <source>Delete Tag</source> + <translation>Удалить тег</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="104"/> + <source>Select to verify a tag</source> + <translation>Разрешить проверку тега</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="107"/> + <source><b>Verify Tag</b> +<p>Select this entry in order to verify the selected tag.</p></source> + <translation><b>Проверить тег</b> +<p>Выберите этот пункт для проверки выбранного тега.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="111"/> + <source>Verify Tag</source> + <translation>Проверить тег</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="121"/> + <source>Tag Type</source> + <translation>Тип тега</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="127"/> + <source>Select to create/delete/verify a global tag</source> + <translation>Разрешить создание/удаление/проверку глобального тега</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="130"/> + <source>Global Tag</source> + <translation>Глобальный тег</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="140"/> + <source>Select to create/delete/verify a signed tag</source> + <translation>Разрешить создание/удаление/проверку подписанного тега</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="143"/> + <source>Signed Tag</source> + <translation>Подписанный тег</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="150"/> + <source>Select to create/delete/verify a local tag</source> + <translation>Разрешить создание/удаление/проверку локального тега</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="153"/> + <source>Local Tag</source> + <translation>Локальный тег</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="163"/> + <source>Select to enforce the create operation</source> + <translation>Разрешить принудительное выполнение операции</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="166"/> + <source>Enforce Operation</source> + <translation>Выполнять принудительно</translation> + </message> +</context> +<context> + <name>GitUserConfigDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="14"/> + <source>Git User Data</source> + <translation>Git: Данные пользователя</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="23"/> + <source>User Data</source> + <translation>Данные пользователя</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="29"/> + <source>First Name:</source> + <translation>Имя:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="36"/> + <source>Enter the first name</source> + <translation>Введите имя пользователя</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="43"/> + <source>Last Name:</source> + <translation>Фамилия:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="50"/> + <source>Enter the last name</source> + <translation>Введите фамилию пользователя</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="57"/> + <source>Email:</source> + <translation>Email:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="64"/> + <source>Enter the email address</source> + <translation>Задайте адрес электронной почты</translation> + </message> +</context> +<context> <name>GlosbeEngine</name> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/GlosbeEngine.py" line="88"/> @@ -69611,6 +76209,19 @@ </message> </context> <context> + <name>VcsGitPlugin</name> + <message> + <location filename="../Plugins/PluginVcsGit.py" line="60"/> + <source>Version Control - Git</source> + <translation>Контроль версий - Git</translation> + </message> + <message> + <location filename="../Plugins/PluginVcsGit.py" line="135"/> + <source>Git</source> + <translation>Git</translation> + </message> +</context> +<context> <name>VcsMercurialPlugin</name> <message> <location filename="../Plugins/PluginVcsMercurial.py" line="60"/>
--- a/i18n/eric6_tr.ts Sun Dec 10 16:43:11 2017 +0100 +++ b/i18n/eric6_tr.ts Sun Dec 10 17:42:11 2017 +0100 @@ -17815,6 +17815,6578 @@ </message> </context> <context> + <name>Git</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="211"/> + <source>The git process finished with the exit code {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1565"/> + <source>The git process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="218"/> + <source>Could not start the git executable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="246"/> + <source>Create project repository</source> + <translation type="unfinished">Bilgi havuzu projesi oluştur</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="246"/> + <source>The project repository could not be created.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="274"/> + <source>Creating Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="289"/> + <source>Adding files to Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="300"/> + <source>Initial commit to Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="330"/> + <source>Cloning project from a Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="419"/> + <source>Commit Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="419"/> + <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="478"/> + <source>Committing changes to Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="501"/> + <source>Switch</source> + <translation type="unfinished">Değiştirmek</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="501"/> + <source><p>Do you really want to switch to <b>{0}</b>?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="532"/> + <source>Synchronizing with the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="579"/> + <source>Adding files/directories to the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="653"/> + <source>Removing files/directories from the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="710"/> + <source>Renaming {0}</source> + <translation type="unfinished">Yenşden adlandırılıyor {0}</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="833"/> + <source>Unstage files/directories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="884"/> + <source>Revert changes</source> + <translation type="unfinished">Değişiklikleri başa döndür</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="875"/> + <source>Do you really want to revert all changes to these files or directories?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="884"/> + <source>Do you really want to revert all changes of the project?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="890"/> + <source>Reverting changes</source> + <translation type="unfinished">Değişiklikler eski haline alınıyor</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="942"/> + <source>Merging</source> + <translation type="unfinished">Birleştiriliyor</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="967"/> + <source>Master branch head</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1200"/> + <source>Git Command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1287"/> + <source><tr><td><b>Commit</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1291"/> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Esas</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1295"/> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Etiketler</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1299"/> + <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Branşlar</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1302"/> + <source><tr><td><b>Author</b></td><td>{0} &lt;{1}&gt;</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1305"/> + <source><tr><td><b>Date</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1308"/> + <source><tr><td><b>Committer</b></td><td>{0} &lt;{1}&gt;</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1311"/> + <source><tr><td><b>Committed Date</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1314"/> + <source><tr><td><b>Subject</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1322"/> + <source><h3>Repository information</h3> +<p><table> +<tr><td><b>Git V.</b></td><td>{0}</td></tr> +<tr></tr> +{1}</table></p> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1390"/> + <source>Create {0} file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1390"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation type="unfinished"><p><b>{0}</b> dosyası halihazırda bulunuyor. Üzerine yazılsın mı?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1449"/> + <source>Git Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1434"/> + <source><p>Copying the directory <b>{0}</b> failed.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1449"/> + <source><p>Copying the file <b>{0}</b> failed.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2634"/> + <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/git.py" line="1636"/> + <source>Git Side-by-Side Difference</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1636"/> + <source><p>The file <b>{0}</b> could not be read.</p></source> + <translation type="unfinished"><p>Dosya <b>{0}</b> okunamıyor.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1685"/> + <source>Fetching from a remote Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1723"/> + <source>Pulling from a remote Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1764"/> + <source>Pushing to a remote Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1792"/> + <source>Committing failed merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1819"/> + <source>Aborting uncommitted/failed merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1852"/> + <source>Applying patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1884"/> + <source>Check patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1887"/> + <source>Apply patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1969"/> + <source>Tagging in the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2200"/> + <source>Branching in the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2240"/> + <source>Delete Remote Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2261"/> + <source>Current Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2261"/> + <source><p>The current branch is <b>{0}</b>.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2325"/> + <source>Create Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2290"/> + <source>Git Bundle Files (*.bundle)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2307"/> + <source><p>The Git bundle file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2355"/> + <source>Verify Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2485"/> + <source>Git Bundle Files (*.bundle);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2385"/> + <source>List Bundle Heads</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2485"/> + <source>Apply Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2508"/> + <source>Applying a bundle file (fetch)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2535"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2738"/> + <source>Git Bisect ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2634"/> + <source>Process Generation Error</source> + <translation type="unfinished">İşlem Üretecinde Hata</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2678"/> + <source>Create Bisect Replay File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2644"/> + <source>Git Bisect Replay Files (*.replay)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2661"/> + <source><p>The Git bisect replay file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2678"/> + <source><p>The file <b>{0}</b> could not be written.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2699"/> + <source>Edit Bisect Replay File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2726"/> + <source>Git Bisect Replay Files (*.replay);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2726"/> + <source>Bisect Replay</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2980"/> + <source>Show Remote Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2927"/> + <source>Rename Remote Repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2927"/> + <source>Enter new name for remote repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3004"/> + <source>Show Shortlog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3062"/> + <source>Cherry-pick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3092"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3117"/> + <source>Copy Changesets (Quit)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3143"/> + <source>Copy Changesets (Cancel)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3223"/> + <source>Saving stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3422"/> + <source>Show Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3422"/> + <source>Select a stash (empty for latest stash):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3334"/> + <source>Restore Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3348"/> + <source>Restoring stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3382"/> + <source>Create Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3372"/> + <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="3397"/> + <source>Creating branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3431"/> + <source>Delete Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3431"/> + <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="3442"/> + <source>Deleting stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> + <source>Delete All Stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> + <source>Do you really want to delete all stashes?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3470"/> + <source>Deleting all stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3542"/> + <source>Showing the combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3568"/> + <source>Verifying the integrity of the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3593"/> + <source>Performing Repository Housekeeping</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3637"/> + <source><tr><td><b>Statistics</b></td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3638"/> + <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="3642"/> + <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="3646"/> + <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="3650"/> + <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="3654"/> + <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="3658"/> + <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="3662"/> + <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="3666"/> + <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="3672"/> + <source><p><b>No statistics available.</b></p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3738"/> + <source>Creating Archive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3781"/> + <source>Add Submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3840"/> + <source>List Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3840"/> + <source>No submodules defined for the project.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3855"/> + <source>All</source> + <translation type="unfinished">Hepsi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <source>Submodule Path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <source>Select a submodule path:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3911"/> + <source>Initialize Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3948"/> + <source>Unregister Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4028"/> + <source>Update Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4062"/> + <source>Synchronize Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4120"/> + <source>Submodules Summary</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitAddRemoteDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="14"/> + <source>Git Add Remote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished">Adı:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="30"/> + <source>Enter the remote name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="37"/> + <source>URL:</source> + <translation type="unfinished">URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="44"/> + <source>Enter the remote URL</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitApplyBundleDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="14"/> + <source>Git Apply Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="23"/> + <source>Bundle Head:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="36"/> + <source>Select a head to apply</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="43"/> + <source>Local Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="56"/> + <source>Enter a local branch</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitArchiveDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="14"/> + <source>Git Archive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Gözden Geçirme</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="29"/> + <source>Select to specify a revision by a revision expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="32"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="42"/> + <source>Enter a commit id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="52"/> + <source>Tag:</source> + <translation type="unfinished">Etiket:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="68"/> + <source>Enter a tag name</source> + <translation type="unfinished">Etiket adı gir</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="78"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="81"/> + <source>Branch:</source> + <translation type="unfinished">Sınıf(Branş):</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="97"/> + <source>Enter a branch name</source> + <translation type="unfinished">Bir branş adı giriniz</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="107"/> + <source>Select HEAD revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="110"/> + <source>HEAD</source> + <translation type="unfinished">BAŞ</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="125"/> + <source>Format:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="132"/> + <source>Select the archive format</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="139"/> + <source>File Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="146"/> + <source>Enter the name of the archive file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="153"/> + <source>Select the archive file via a file selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="160"/> + <source>Prefix:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="167"/> + <source>Enter a prefix to be prepended to each file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.py" line="88"/> + <source>Select Archive File</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBisectLogBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="14"/> + <source>Git Bisect Log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="42"/> + <source>Commit</source> + <translation type="unfinished">Teslimat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="47"/> + <source>Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="52"/> + <source>Subject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="66"/> + <source>Errors</source> + <translation type="unfinished">Hatalar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="72"/> + <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/GitBisectLogBrowserDialog.ui" line="88"/> + <source>Input</source> + <translation type="unfinished">Girdi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="110"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="113"/> + <source>&Send</source> + <translation type="unfinished">&Gönder</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="116"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="123"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="130"/> + <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/GitBisectLogBrowserDialog.ui" line="133"/> + <source>&Password Mode</source> + <translation type="unfinished">&Parola Modu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="136"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="57"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="59"/> + <source>Press to refresh the list of commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="175"/> + <source>Process Generation Error</source> + <translation type="unfinished">İşlem Üretecinde Hata</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="175"/> + <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> +</context> +<context> + <name>GitBisectStartDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="14"/> + <source>Git Bisect Start</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="23"/> + <source>Bad Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="30"/> + <source>Enter a bad commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="37"/> + <source>Good Commits:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="44"/> + <source>Enter a list of good commits separated by space</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="51"/> + <source>Select to not checkout the working tree</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="54"/> + <source>Don't checkout working tree</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBlameDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="14"/> + <source>Git Blame</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="45"/> + <source>Commit</source> + <translation type="unfinished">Teslimat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="50"/> + <source>Author</source> + <translation type="unfinished">Yazar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="55"/> + <source>Date</source> + <translation type="unfinished">Tarih</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="60"/> + <source>Time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="65"/> + <source>Line</source> + <translation type="unfinished">Satır</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="79"/> + <source>Errors</source> + <translation type="unfinished">Hatalar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="98"/> + <source>Input</source> + <translation type="unfinished">Girdi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="120"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="123"/> + <source>&Send</source> + <translation type="unfinished">&Gönder</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="126"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="133"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="140"/> + <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/GitBlameDialog.ui" line="143"/> + <source>&Password Mode</source> + <translation type="unfinished">&Parola Modu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="146"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="119"/> + <source>Process Generation Error</source> + <translation type="unfinished">İşlem Üretecinde Hata</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="119"/> + <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> +</context> +<context> + <name>GitBranchDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="14"/> + <source>Git Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="23"/> + <source>Branch Action</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="29"/> + <source>Select to create a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="32"/> + <source><b>Create Branch</b> +<p>Select this entry in order to create a branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="36"/> + <source>Create</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="46"/> + <source>Select to rename a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="49"/> + <source><b>Rename</b> +<p>Select this entry in order to rename the selected branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="53"/> + <source>Rename</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="60"/> + <source>Select to delete a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="63"/> + <source><b>Delete Branch</b> +<p>Select this entry in order to delete the selected branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="67"/> + <source>Delete</source> + <translation type="unfinished">Sil</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="74"/> + <source>Select to create a new branch and switch to it</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="77"/> + <source><b>Create &amp; Switch</b>\n<p>Select this entry in order to create a new branch and switch the working tree to it.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="80"/> + <source>Create && Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="87"/> + <source>Select to create a tracking branch and switch to it</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="90"/> + <source><b>Create Tracking Branch &amp; Switch</b>\n<p>Select this entry in order to create a new branch tracking a remote repository branch. The working tree is switched to it.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="93"/> + <source>Create Tracking Branch && Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="100"/> + <source>Select to associate a remote branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="209"/> + <source>Set Tracking Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="110"/> + <source>Select to de-associate a remote branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="113"/> + <source>Unset Tracking Branch Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="125"/> + <source>Name:</source> + <translation type="unfinished">Adı:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="138"/> + <source>Enter the name of the branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="141"/> + <source><b>Branch Name</b> +<p>Enter the name of the branch to be created, deleted or moved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="157"/> + <source>Create Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="163"/> + <source>Revision:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="170"/> + <source>Enter a revision at which to start the branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="183"/> + <source>Rename Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="189"/> + <source>New Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="196"/> + <source>Enter a new name for the selected branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="215"/> + <source>Remote Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="228"/> + <source>Select the remote branch to associate</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="238"/> + <source>Select to enforce the create operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="241"/> + <source>Enforce Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBranchPushDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="14"/> + <source>Git Push Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="23"/> + <source>Branch Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="36"/> + <source>Select the branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="43"/> + <source>Remote Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="56"/> + <source>Select the remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.py" line="36"/> + <source><all branches></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBundleDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="14"/> + <source>Git Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Gözden Geçirme</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="29"/> + <source>Select to specify a revision or revision range</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="32"/> + <source>Revisions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="42"/> + <source>Enter revisions or revision range expressions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="52"/> + <source>Tag:</source> + <translation type="unfinished">Etiket:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="62"/> + <source>Enter a tag name</source> + <translation type="unfinished">Etiket adı gir</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="72"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="75"/> + <source>Branch:</source> + <translation type="unfinished">Sınıf(Branş):</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="85"/> + <source>Enter a branch name</source> + <translation type="unfinished">Bir branş adı giriniz</translation> + </message> +</context> +<context> + <name>GitCherryPickDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="14"/> + <source>Git Cherry-pick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="23"/> + <source>Commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="29"/> + <source>Enter commits by id, branch or tag one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="45"/> + <source>Select to append cherry-pick info to the commit message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="48"/> + <source>Append Cherry-pick &Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="58"/> + <source>Select to add a 'Signed-off-by' line to the commit message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="61"/> + <source>Append '&Signed-off-by' line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="68"/> + <source>Select to not commit the cherry-pick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="71"/> + <source>Don't &commit</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitCommandDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="14"/> + <source>Git Command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="23"/> + <source>Git Command:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="36"/> + <source>Enter the Git command to be executed with all necessary parameters</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="39"/> + <source><b>Git Command</b> +<p>Enter the Git command to be executed including all necessary +parameters. If a parameter of the commandline includes a space you have to +surround this parameter by single or double quotes. Do not include the name +of the Git client executable (i.e. git).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="65"/> + <source>Project Directory:</source> + <translation type="unfinished">Proje Dizini:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="78"/> + <source>This shows the root directory of the current project.</source> + <translation type="unfinished">Bu geçerli projenin ana dizinini gösterir.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="81"/> + <source>project directory</source> + <translation type="unfinished">proje dizini</translation> + </message> +</context> +<context> + <name>GitCommitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="14"/> + <source>Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="20"/> + <source>Commit Message</source> + <translation type="unfinished">Teslimat mesajı</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="26"/> + <source>Enter the log message.</source> + <translation type="unfinished">Kayıt mesajı gir.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="29"/> + <source><b>Log Message</b> +<p>Enter the log message for the commit action.</p></source> + <translation type="unfinished"><b>Kayıt Mesajı</b> +<p>Teslim işlemi için kayıt mesajı gir.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="43"/> + <source>Recent commit messages</source> + <translation type="unfinished">Geçmiş teslimet mesajları</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="50"/> + <source>Select a recent commit message to use</source> + <translation type="unfinished">Geçmiş kayıt mesajlarından seç</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="60"/> + <source>Select to commit only staged changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="63"/> + <source>Commit staged changes only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="70"/> + <source>Select to amend the last commit (leave message empty to keep it)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="73"/> + <source>Amend the last commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="80"/> + <source>Select to reset the author information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="83"/> + <source>Reset Author Info</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitCopyDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="14"/> + <source>Git Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="25"/> + <source>Source:</source> + <translation type="unfinished">Kaynak:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="32"/> + <source>Shows the name of the source</source> + <translation type="unfinished">Kaynağın adını göster</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="35"/> + <source><b>Source name</b> +<p>This field shows the name of the source.</p></source> + <translation type="unfinished"><b>Kaynak adı</b> +<p>Bu alan kaynağın adını gösterir.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="46"/> + <source>Enter the target name</source> + <translation type="unfinished">Hedefin adını gir</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="49"/> + <source><b>Target name</b> +<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="57"/> + <source>Target:</source> + <translation type="unfinished">Hedef:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="64"/> + <source>Press to open a selection dialog</source> + <translation type="unfinished">Bir seçim diyaloğu açmak için basınız</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="67"/> + <source><b>Target directory</b> +<p>Select the target name for the operation via a selection dialog.</p></source> + <translation type="unfinished"><b>Hedef Dizin</b> +<p>Seçim diyaloğu yolu ile bu çalışma için bir hedef isim seçin.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="77"/> + <source>Select to force the operation</source> + <translation type="unfinished">Zorunlu çalıştırlacakları seç</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="80"/> + <source>Enforce operation</source> + <translation type="unfinished">Zorunlu çalışma</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.py" line="51"/> + <source>Git Move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.py" line="89"/> + <source>Select target</source> + <translation type="unfinished">Hedefi seç</translation> + </message> +</context> +<context> + <name>GitDescribeDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="14"/> + <source>Git Tag List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="42"/> + <source>Commit</source> + <translation type="unfinished">Teslimat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="47"/> + <source>Tag Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="61"/> + <source>Errors</source> + <translation type="unfinished">Hatalar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="80"/> + <source>Input</source> + <translation type="unfinished">Girdi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="102"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="105"/> + <source>&Send</source> + <translation type="unfinished">&Gönder</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="108"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="115"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="122"/> + <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/GitDescribeDialog.ui" line="125"/> + <source>&Password Mode</source> + <translation type="unfinished">&Parola Modu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="128"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py" line="117"/> + <source>Process Generation Error</source> + <translation type="unfinished">İşlem Üretecinde Hata</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py" line="117"/> + <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> +</context> +<context> + <name>GitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="14"/> + <source>Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="29"/> + <source>Output</source> + <translation type="unfinished">Çıktı</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="57"/> + <source>Errors</source> + <translation type="unfinished">Hatalar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="76"/> + <source>Input</source> + <translation type="unfinished">Girdi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="98"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="101"/> + <source>&Send</source> + <translation type="unfinished">&Gönder</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="104"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="111"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="118"/> + <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/GitDialog.ui" line="121"/> + <source>&Password Mode</source> + <translation type="unfinished">&Parola Modu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="124"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="88"/> + <source>Additional Output</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="104"/> + <source>Process canceled.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="116"/> + <source>Process finished successfully.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="118"/> + <source>Process crashed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="120"/> + <source>Proces finished with exit code {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/> + <source>Process Generation Error</source> + <translation type="unfinished">İşlem Üretecinde Hata</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/> + <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> +</context> +<context> + <name>GitDiffDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="14"/> + <source>Git Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="26"/> + <source>Difference</source> + <translation type="unfinished">Farklılık</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="39"/> + <source><b>Git Diff</b><p>This shows the output of the git diff command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="56"/> + <source><b>Git Diff</b><p>This shows the output of the git diff command (stage to repo) if the dialog was asked to show separate diffs.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="85"/> + <source>Errors</source> + <translation type="unfinished">Hatalar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="48"/> + <source>Refresh</source> + <translation type="unfinished">Tazele</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="50"/> + <source>Press to refresh the display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="96"/> + <source>Working Tree to Staging Area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="97"/> + <source>Staging Area to HEAD Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="98"/> + <source>Working Tree to HEAD Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="99"/> + <source>Working to Staging (top) and Staging to HEAD (bottom)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="101"/> + <source>Stash Contents</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="102"/> + <source>Stash Contents of {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="171"/> + <source>Difference ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="179"/> + <source>Process Generation Error</source> + <translation type="unfinished">İşlem Üretecinde Hata</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="179"/> + <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/GitDiffDialog.py" line="206"/> + <source>There is no difference.</source> + <translation type="unfinished">Herhangi bir farklılık bulunamadı.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="227"/> + <source><Start></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="228"/> + <source><End></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="356"/> + <source>Save Diff</source> + <translation type="unfinished">Farklılıkları Kaydet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="322"/> + <source>Patch Files (*.diff)</source> + <translation type="unfinished">Patch Dosyaları (*.diff)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="339"/> + <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"><p>Yama dosyası <b>{0}</b> zaten var. Üzerine yazılsın mı?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="356"/> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation type="unfinished"><p><b>{0}</b>yama kaydedilemedi.<br>Sebep: {1}</p></translation> + </message> +</context> +<context> + <name>GitFetchDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="14"/> + <source>Git Fetch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="23"/> + <source>Remote Repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="30"/> + <source>Select the remote repository to fetch from</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="46"/> + <source>Remote Branches:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="56"/> + <source>Press to update the list of remote branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="59"/> + <source>Update</source> + <translation type="unfinished">Güncelle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="81"/> + <source>Select the remote branches to be fetched</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="94"/> + <source>Local Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="101"/> + <source>Select the local branch to fetch into</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="111"/> + <source>Select to remove non-existing tracking references </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="114"/> + <source>Prune obsolete tracking references</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="121"/> + <source>Select to fetch tags as well</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="124"/> + <source>Include tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.py" line="36"/> + <source><All></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.py" line="37"/> + <source><Custom></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitListDialog.ui" line="14"/> + <source>Git Select</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitListDialog.ui" line="23"/> + <source>Select from the list:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitLogBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="14"/> + <source>Git Log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="22"/> + <source>Select action from menu</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="45"/> + <source>Select the mode (find or filter)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="65"/> + <source>From:</source> + <translation type="unfinished">Den:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="72"/> + <source>Enter the start date</source> + <translation type="unfinished">Başlangıç tarihini gir</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="82"/> + <source>To:</source> + <translation type="unfinished">E:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="89"/> + <source>Enter the end date</source> + <translation type="unfinished">Bitiş tarihini gir</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="112"/> + <source>Select the field to filter on</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="119"/> + <source>Enter the regular expression to filter on or search for</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="126"/> + <source>Press to find the previous occurrence</source> + <translation type="unfinished">Birönceki eşleşmeyi bulmak için basınız</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="133"/> + <source>Press to find the next occurrence</source> + <translation type="unfinished">Sonraki eşlişmeyi bulmak için basınız</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="174"/> + <source>Graph</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="101"/> + <source>Commit ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="102"/> + <source>Author</source> + <translation type="unfinished">Yazar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="189"/> + <source>Date</source> + <translation type="unfinished">Tarih</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="103"/> + <source>Committer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="199"/> + <source>Commit Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="104"/> + <source>Subject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="209"/> + <source>Branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="214"/> + <source>Tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="224"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="234"/> + <source>Press to move down in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="257"/> + <source>Press to get the next bunch of log entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="260"/> + <source>&Next</source> + <translation type="unfinished">So&nraki</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="267"/> + <source>Enter the limit of entries to fetch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="286"/> + <source>Select to stop listing log messages at a copy or move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="289"/> + <source>Stop on Copy/Move</source> + <translation type="unfinished">Kopyalama/Taşımıyı Durdur</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="378"/> + <source>Action</source> + <translation type="unfinished">İşlem</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="383"/> + <source>Path</source> + <translation type="unfinished">Yol</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="388"/> + <source>Additions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="393"/> + <source>Deletions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="398"/> + <source>Copy from</source> + <translation type="unfinished">den Kopyala</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2119"/> + <source>Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="445"/> + <source><a href="save:me">Save</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="491"/> + <source>Errors</source> + <translation type="unfinished">Hatalar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="497"/> + <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/GitLogBrowserDialog.ui" line="513"/> + <source>Input</source> + <translation type="unfinished">Girdi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="535"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="538"/> + <source>&Send</source> + <translation type="unfinished">&Gönder</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="541"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="548"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="555"/> + <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/GitLogBrowserDialog.ui" line="558"/> + <source>&Password Mode</source> + <translation type="unfinished">&Parola Modu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="561"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="88"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="90"/> + <source>Press to refresh the list of commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="98"/> + <source>Find</source> + <translation type="unfinished">Bul</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="99"/> + <source>Filter</source> + <translation type="unfinished">Süzgeç</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="105"/> + <source>File</source> + <translation type="unfinished">Dosya</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="122"/> + <source><table><tr><td><b>Commit ID</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2} &lt;{3}&gt;</td></tr><tr><td><b>Commit Date</b></td><td>{4}</td></tr><tr><td><b>Committer</b></td><td>{5} &lt;{6}&gt;</td></tr>{7}<tr><td><b>Subject</b></td><td>{8}</td></tr>{9}</table></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="134"/> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Esas</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="137"/> + <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="140"/> + <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Branşlar</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="143"/> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Etiketler</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="146"/> + <source><tr><td><b>Message</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="198"/> + <source>Added</source> + <translation type="unfinished">Eklendi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="199"/> + <source>Deleted</source> + <translation type="unfinished">Silindi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="200"/> + <source>Modified</source> + <translation type="unfinished">Değiştirildi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="201"/> + <source>Copied</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="202"/> + <source>Renamed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="203"/> + <source>Type changed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="204"/> + <source>Unmerged</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="205"/> + <source>Unknown</source> + <translation type="unfinished">Bilinmeyen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="241"/> + <source>Show Commit ID Column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="243"/> + <source>Press to show the commit ID column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="251"/> + <source>Show Author Columns</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="253"/> + <source>Press to show the author columns</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="261"/> + <source>Show Committer Columns</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="263"/> + <source>Press to show the committer columns</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="271"/> + <source>Show Branches Column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="273"/> + <source>Press to show the branches column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="281"/> + <source>Show Tags Column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="283"/> + <source>Press to show the Tags column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="313"/> + <source>Copy Commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="315"/> + <source>Cherry-pick the selected commits to the current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="320"/> + <source>Tag</source> + <translation type="unfinished">Etiket</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="322"/> + <source>Tag the selected commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1812"/> + <source>Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="326"/> + <source>Create a new branch at the selected commit.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="328"/> + <source>Branch && Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="330"/> + <source>Create a new branch at the selected commit and switch the work tree to it.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1864"/> + <source>Switch</source> + <translation type="unfinished">Değiştirmek</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="336"/> + <source>Switch the working directory to the selected commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1890"/> + <source>Show Short Log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="342"/> + <source>Show a dialog with a log output for release notes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="345"/> + <source>Describe</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="347"/> + <source>Show the most recent tag reachable from a commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="648"/> + <source>The git process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="651"/> + <source>Could not start the git executable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="654"/> + <source>Git Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="769"/> + <source>{0} ({1}%)</source> + <comment>action, confidence</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="835"/> + <source>Process Generation Error</source> + <translation type="unfinished">İşlem Üretecinde Hata</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="835"/> + <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/GitLogBrowserDialog.py" line="1275"/> + <source>Side-by-Side Diff to Parent {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1287"/> + <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1725"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1864"/> + <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/GitLogBrowserDialog.py" line="1890"/> + <source>Select a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/> + <source>Select a default branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/> + <source>Branch & Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2073"/> + <source>Find Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2073"/> + <source>'{0}' was not found.</source> + <translation type="unfinished">'{0}' bulunamadı.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2133"/> + <source>Differences to Parent {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2148"/> + <source>Diff to Parent {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2174"/> + <source>There is no difference.</source> + <translation type="unfinished">Herhangi bir farklılık bulunamadı.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2337"/> + <source>Save Diff</source> + <translation type="unfinished">Farklılıkları Kaydet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2303"/> + <source>Patch Files (*.diff)</source> + <translation type="unfinished">Patch Dosyaları (*.diff)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2320"/> + <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"><p>Yama dosyası <b>{0}</b> zaten var. Üzerine yazılsın mı?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2337"/> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation type="unfinished"><p><b>{0}</b>yama kaydedilemedi.<br>Sebep: {1}</p></translation> + </message> +</context> +<context> + <name>GitMergeDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="14"/> + <source>Git Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Gözden Geçirme</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="29"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="32"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="42"/> + <source>Enter a commit id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="52"/> + <source>Tag:</source> + <translation type="unfinished">Etiket:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="62"/> + <source>Enter a tag name</source> + <translation type="unfinished">Etiket adı gir</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="72"/> + <source>Select to specify a revision by a local branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="75"/> + <source>Local Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="85"/> + <source>Enter a local branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="95"/> + <source>Select to specify a revision by a remote branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="98"/> + <source>Remote Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="108"/> + <source>Enter a remote branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="118"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="121"/> + <source>No commit selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="134"/> + <source>Select to commit the merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="137"/> + <source>Commit Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="146"/> + <source>Commit Message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="153"/> + <source>Enter a message for the merge commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="163"/> + <source>Select to append the log summaries of merged commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="166"/> + <source>Add Log Message Summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="176"/> + <source>Select to show diff statistics at the end of the merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="179"/> + <source>Show diff statistics</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitNewProjectOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="14"/> + <source>New Project from Repository</source> + <translation type="unfinished">Kaynak Havuzundan Yeni Proje</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="17"/> + <source><b>New Project from Repository Dialog</b> +<p>Enter the various repository infos into the entry fields. These values are used, when the new project is retrieved from the repository.</p> +<p>For remote repositories the URL must contain the hostname.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="28"/> + <source>&URL:</source> + <translation type="unfinished">&URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="44"/> + <source>Enter the URL of the repository</source> + <translation type="unfinished">Kaynak havuzunun URL'sini giriniz</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="60"/> + <source>Select the repository url via a directory selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="67"/> + <source>Press to clear the history of entered repository URLs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="74"/> + <source>Project &Directory:</source> + <translation type="unfinished">Proje &Dizini:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="84"/> + <source>Enter the directory of the new project.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="87"/> + <source><b>Project Directory</b> +<p>Enter the directory of the new project. It will be retrieved from +the repository and be placed in this directory.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py" line="87"/> + <source>Select Repository-Directory</source> + <translation type="unfinished">Kaynak Havuzu- Dizinin Seç</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py" line="102"/> + <source>Select Project Directory</source> + <translation type="unfinished">Proje Dizinini Seç</translation> + </message> +</context> +<context> + <name>GitOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="14"/> + <source>Initial Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="17"/> + <source><b>Initial Commit Dialog</b> +<p>Enter the message for the initial commit.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="29"/> + <source>Commit &Message:</source> + <translation type="unfinished">Teslimat &Mesajı:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="39"/> + <source>Enter the log message for the new project.</source> + <translation type="unfinished">Yeni proje için kayıt mesajlarını giriniz.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="42"/> + <source><b>Log Message</b> +<p>Enter the log message to be used for the new project.</p></source> + <translation type="unfinished"><b>Mesaj Günlüğü</b> +<p>Kullanılan yeni projenin mesaj günlüğünü gir.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="46"/> + <source>new project started</source> + <translation type="unfinished">yeni proje başladı</translation> + </message> +</context> +<context> + <name>GitPage</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="14"/> + <source>Select to perform an expensive copy detection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="20"/> + <source><b>Configure Git Interface</b></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="40"/> + <source>Log</source> + <translation type="unfinished">Günlük</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="46"/> + <source>No. of log messages shown:</source> + <translation type="unfinished">Gösterilecek kayıt mesajı sayısı:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="53"/> + <source>Enter the number of log messages to be shown</source> + <translation type="unfinished">Gösterilecek kayıt mesajlarının sayısını girin</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="82"/> + <source>No. of subject characters shown in list:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="89"/> + <source>Enter the number of characters of the commit subject to be shown in the list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="95"/> + <source>All</source> + <translation type="unfinished">Hepsi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="105"/> + <source>Select to perform expensive copy detection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="108"/> + <source>Find copies harder</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="118"/> + <source>Commit</source> + <translation type="unfinished">Teslimat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="124"/> + <source>No. of commit messages to remember:</source> + <translation type="unfinished">Teslim etmek için hatırlanacak mesaj sayısı:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="131"/> + <source>Enter the number of commit messages to remember</source> + <translation type="unfinished">Teslim edilmek için hatırlanacak mesj sayısını girin</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="160"/> + <source>Commit ID length:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="167"/> + <source>Enter the number of character to show for the commit ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="199"/> + <source>Cleanup</source> + <translation type="unfinished">Temizle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="205"/> + <source>Pattern:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="212"/> + <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="222"/> + <source>Repository Optimization</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="228"/> + <source>Select this to use the '--aggressive' option for garbage collection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="231"/> + <source>Perform aggressive repository optimization</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="241"/> + <source>Edit the Git configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="244"/> + <source>Edit configuration file</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitPatchFilesDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py" line="83"/> + <source>Patch Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="37"/> + <source>Press to add patch files to the list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="44"/> + <source>Press to delete the selected patch files from the list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="58"/> + <source>Press to move the selected file up</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="65"/> + <source>Press to move the selected file down</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="91"/> + <source>Strip Count:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="98"/> + <source>Enter number of leading directories to strip off (default 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="129"/> + <source>Select, if the patch has inaccurate end-of-file markers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="132"/> + <source>Patch has inaccurate end-of-file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="139"/> + <source>Select, if the line counts of the patch header may be wrong</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="142"/> + <source>Don't trust line counts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py" line="83"/> + <source>Patch Files (*.diff *.patch);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitPatchStatisticsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="14"/> + <source>Patch Statistics</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="23"/> + <source>Insertions and Deletions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="52"/> + <source># Insertions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="57"/> + <source># Deletions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="62"/> + <source>File</source> + <translation type="unfinished">Dosya</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="70"/> + <source>Summary Information:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="122"/> + <source>Process Generation Error</source> + <translation type="unfinished">İşlem Üretecinde Hata</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="122"/> + <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> +</context> +<context> + <name>GitProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="488"/> + <source>Version Control</source> + <translation type="unfinished">Sürüm Kontrol</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="499"/> + <source>Commit changes to repository...</source> + <translation type="unfinished">Yapılan değişiklekleri kaynak havuzuna teslim et...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="505"/> + <source>Add/Stage to repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="508"/> + <source>Unstage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="514"/> + <source>Remove from repository (and disk)</source> + <translation type="unfinished">Kaynak havuzundan kaldır (ve diskten)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="588"/> + <source>Remove from repository only</source> + <translation type="unfinished">Yalnızca kaynak havuzundan kaldır</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="430"/> + <source>Copy</source> + <translation type="unfinished">Kopyala</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="432"/> + <source>Move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="435"/> + <source>Show log browser</source> + <translation type="unfinished">Kayıt gözatıcısını gösted</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="520"/> + <source>Show status</source> + <translation type="unfinished">Durumu Göster</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="525"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="229"/> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="529"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="238"/> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="244"/> + <source>Show annotated file</source> + <translation type="unfinished">Açıklama dosyalarını göster</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="535"/> + <source>Revert changes</source> + <translation type="unfinished">Değişiklikleri başa döndür</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="542"/> + <source>Select all local file entries</source> + <translation type="unfinished">tüm yerel dosyalırın girişini seç</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="544"/> + <source>Select all versioned file entries</source> + <translation type="unfinished">Giriş yapılan tüm dosyaları seç</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="546"/> + <source>Select all local directory entries</source> + <translation type="unfinished">Tüm yerel dizin kalemlerini seç</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="548"/> + <source>Select all versioned directory entries</source> + <translation type="unfinished">Giriş yapılan tüm dizinleri seç</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="551"/> + <source>Configure...</source> + <translation type="unfinished">Ayarlanıyor...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="588"/> + <source>Do you really want to remove these files from the repository?</source> + <translation type="unfinished">Bu dosyaları gerçekten kaynak havuzundan kaldırmak istiyor musunuz?</translation> + </message> +</context> +<context> + <name>GitProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="73"/> + <source>New from repository</source> + <translation type="unfinished">Kaynak havuzundan yeni</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="73"/> + <source>&New from repository...</source> + <translation type="unfinished">Kay&nak havuzundan yeni...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="78"/> + <source>Create (clone) a new project from a Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="81"/> + <source><b>New from repository</b><p>This creates (clones) a new local project from a Git repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="89"/> + <source>Fetch changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="94"/> + <source>Fetch changes from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="97"/> + <source><b>Fetch changes</b><p>This fetches changes from a remote repository into the local repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="105"/> + <source>Pull changes</source> + <translation type="unfinished">Değişiklikleri çek</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="110"/> + <source>Pull changes from a remote repository and update the work area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="113"/> + <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository and updates the work area.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="121"/> + <source>Commit changes to repository</source> + <translation type="unfinished">Yapılan değişiklekleri kaynak havuzuna teslim et</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="121"/> + <source>Commit changes to repository...</source> + <translation type="unfinished">Yapılan değişiklekleri kaynak havuzuna teslim et...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="126"/> + <source>Commit changes of the local project to the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="129"/> + <source><b>Commit changes to repository</b><p>This commits changes of the local project to the Git repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="137"/> + <source>Push changes</source> + <translation type="unfinished">değişiklikleri kabul et</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="142"/> + <source>Push changes to a remote repository</source> + <translation type="unfinished">Uzak kaynak havuzuna değişiklikleri gönder</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="145"/> + <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="153"/> + <source>Export from repository</source> + <translation type="unfinished">Kaynak havuzundan ihraç et</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="153"/> + <source>&Export from repository...</source> + <translation type="unfinished">Dışarı kaynak havuzundan ihraç &et...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="158"/> + <source>Export a project from the repository</source> + <translation type="unfinished">Dışa Kaynak havuzundan proje aktar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="161"/> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation type="unfinished"><b>Kaynak havuzundan dışa aktar</b><p>Bu kaynak havuzundan bir projeyi dışa aktarır.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="168"/> + <source>Show log browser</source> + <translation type="unfinished">Kayıt gözatıcısını gösted</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="173"/> + <source>Show a dialog to browse the log of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="176"/> + <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="185"/> + <source>Show reflog browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="190"/> + <source>Show a dialog to browse the reflog of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="193"/> + <source><b>Show reflog browser</b><p>This shows a dialog to browse the reflog of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="202"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="202"/> + <source>Show &differences...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="207"/> + <source>Show the differences of the local project to the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="210"/> + <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="218"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="218"/> + <source>Show differences (extended) ...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="223"/> + <source>Show the difference of revisions of the project to the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="226"/> + <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="234"/> + <source>Show status</source> + <translation type="unfinished">Durumu Göster</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="234"/> + <source>Show &status...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="239"/> + <source>Show the status of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="242"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="249"/> + <source>Switch</source> + <translation type="unfinished">Değiştirmek</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="249"/> + <source>S&witch...</source> + <translation type="unfinished">Deği&ştirmek...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="254"/> + <source>Switch the working directory to another revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="257"/> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="265"/> + <source>Tag in repository</source> + <translation type="unfinished">Kaynak havuzu etiketi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="265"/> + <source>&Tag in repository...</source> + <translation type="unfinished">Kaynak havuzu e&tiketi...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="270"/> + <source>Perform tag operations for the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="273"/> + <source><b>Tag in repository</b><p>This performs selectable tag operations for the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="281"/> + <source>List tags</source> + <translation type="unfinished">Etiketleri listele</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="281"/> + <source>&List tags...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="285"/> + <source>List tags of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="288"/> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="295"/> + <source>Show most recent tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="299"/> + <source>Show the most recent tag reachable from the work tree</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="302"/> + <source><b>Show most recent tag</b><p>This shows the most recent tag reachable from the work tree.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="310"/> + <source>List branches</source> + <translation type="unfinished">Branşlar listesi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="310"/> + <source>&List branches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="314"/> + <source>List branches of the project</source> + <translation type="unfinished">Prosenin branşlar listesi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="317"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation type="unfinished"><b>Branş listesi</b><p>Bu listeler prosenin branş listeleridir.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="324"/> + <source>List merged branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="324"/> + <source>List &merged branches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="328"/> + <source>List merged branches of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="331"/> + <source><b>List merged branches</b><p>This lists the merged branches of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="339"/> + <source>List non-merged branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="339"/> + <source>List &non-merged branches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="343"/> + <source>List non-merged branches of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="346"/> + <source><b>List non-merged branches</b><p>This lists the non-merged branches of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="354"/> + <source>Branch in repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="354"/> + <source>&Branch in repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="359"/> + <source>Perform branch operations for the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="362"/> + <source><b>Branch in repository</b><p>This performs selectable branch operations for the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="370"/> + <source>Delete Remote Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="370"/> + <source>&Delete Remote Branch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="374"/> + <source>Delete a branch from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="377"/> + <source><b>Delete Remote Branch</b><p>This deletes a branch from a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="384"/> + <source>Show current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="388"/> + <source>Show the current branch of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="391"/> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="398"/> + <source>Revert changes</source> + <translation type="unfinished">Değişiklikleri başa döndür</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="398"/> + <source>Re&vert changes</source> + <translation type="unfinished">Değişiklikleri ba&şa döndür</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="403"/> + <source>Revert all changes made to the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="406"/> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="413"/> + <source>Unstage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="413"/> + <source>&Unstage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="418"/> + <source>Unstage all changes made to the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="421"/> + <source><b>Unstage changes</b><p>This unstages all changes made to the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="428"/> + <source>Merge</source> + <translation type="unfinished">Birleştir</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="428"/> + <source>Mer&ge changes...</source> + <translation type="unfinished">De&ğişiklikleri birleştir...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="433"/> + <source>Merge changes into the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="436"/> + <source><b>Merge</b><p>This merges changes into the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="443"/> + <source>Cancel uncommitted/failed merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="447"/> + <source>Cancel an uncommitted or failed merge and lose all changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="450"/> + <source><b>Cancel uncommitted/failed merge</b><p>This cancels an uncommitted or failed merge causing all changes to be lost.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="458"/> + <source>Commit failed merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="462"/> + <source>Commit a failed merge after conflicts have been resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="465"/> + <source><b>Commit failed merge</b><p>This commits a failed merge after conflicts have been resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="473"/> + <source>Cleanup</source> + <translation type="unfinished">Temizle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="473"/> + <source>Cleanu&p</source> + <translation type="unfinished">Temi&zle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="477"/> + <source>Cleanup the local project</source> + <translation type="unfinished">Yerel projeyi temizle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="480"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation type="unfinished"><b>Temizle</b><p>Bu yerel projeyi sıfırlar.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="487"/> + <source>Execute command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="487"/> + <source>E&xecute command...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="491"/> + <source>Execute an arbitrary Git command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="494"/> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Git command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="502"/> + <source>Configure</source> + <translation type="unfinished">Yapılandırma</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="502"/> + <source>Configure...</source> + <translation type="unfinished">Ayarlanıyor...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="506"/> + <source>Show the configuration dialog with the Git page selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="509"/> + <source><b>Configure</b><p>Show the configuration dialog with the Git page selected.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="517"/> + <source>Show Remotes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="517"/> + <source>Show Remotes...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="521"/> + <source>Show the available remote repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="539"/> + <source><b>Show Remotes</b><p>This shows the remote repositories available for pulling, fetching and pushing.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1765"/> + <source>Show Remote Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="532"/> + <source>Show Remote Info...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="536"/> + <source>Show information about a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1161"/> + <source>Add</source> + <translation type="unfinished">Ekle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="547"/> + <source>Add...</source> + <translation type="unfinished">Ekle...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="551"/> + <source>Add a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="554"/> + <source><b>Add</b><p>This adds a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1785"/> + <source>Remove</source> + <translation type="unfinished">Kaldır</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="561"/> + <source>Remove...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="565"/> + <source>Remove a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="568"/> + <source><b>Remove</b><p>This removes a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1799"/> + <source>Prune</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="575"/> + <source>Prune...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="579"/> + <source>Prune stale remote-tracking branches of a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="582"/> + <source><b>Prune</b><p>This prunes stale remote-tracking branches of a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <source>Rename</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="590"/> + <source>Rename...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="594"/> + <source>Rename a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="597"/> + <source><b>Rename</b><p>This renames a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1833"/> + <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> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="649"/> + <source>Cancel 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> + <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> + <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> + <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> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> + <source>Show stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> + <source>Show stash...</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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="702"/> + <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"/> + <source>Restore && Keep</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="714"/> + <source>Restore a stash but keep it</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="717"/> + <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"/> + <source>Restore && Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="728"/> + <source>Restore a stash and delete it</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="731"/> + <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"/> + <source>Create Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="742"/> + <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"/> + <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"/> + <source>Delete</source> + <translation type="unfinished">Sil</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="757"/> + <source>Delete a stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="760"/> + <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"/> + <source>Delete All</source> + <translation type="unfinished">Hepsini Sil</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="771"/> + <source>Delete all stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="774"/> + <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"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="785"/> + <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"/> + <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"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="799"/> + <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> + <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> + <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> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="862"/> + <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"/> + <source>Repository Statistics</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <source>Repository Statistics...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="873"/> + <source>Show some statistics of the local repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="876"/> + <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"/> + <source>Create Archive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="887"/> + <source>Create an archive from the local repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="890"/> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> + <source>List bundle heads...</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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="934"/> + <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"/> + <source>Apply Bundle (fetch)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <source>Apply Bundle (fetch)...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="945"/> + <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"/> + <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"/> + <source>Apply Bundle (pull)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="955"/> + <source>Apply Bundle (pull)...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="959"/> + <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"/> + <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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1003"/> + <source>Mark a selectable revision as good</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> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1017"/> + <source>Mark a selectable revision as bad</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1020"/> + <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"/> + <source>Skip</source> + <translation type="unfinished">Atla</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <source>Skip...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1031"/> + <source>Skip a selectable revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1034"/> + <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"/> + <source>Reset</source> + <translation type="unfinished">Başadön</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <source>Reset...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1045"/> + <source>Reset the bisect session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1048"/> + <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"/> + <source>Show bisect log browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1060"/> + <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"/> + <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"/> + <source>Create replay file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1076"/> + <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"/> + <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"/> + <source>Edit replay file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1092"/> + <source>Edit a bisect replay file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1095"/> + <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"/> + <source>Replay session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1107"/> + <source>Replay a bisect session from file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1110"/> + <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"/> + <source>Check patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1121"/> + <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"/> + <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"/> + <source>Apply patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1136"/> + <source>Apply a list of patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1139"/> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1180"/> + <source>List the submodule of the current project</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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1195"/> + <source>Initialize the submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1198"/> + <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> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1244"/> + <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"/> + <source>Fetch and Update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1257"/> + <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>Synchronize URLs of submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1293"/> + <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"/> + <source>Show Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1306"/> + <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"/> + <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"/> + <source>Show Summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1322"/> + <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"/> + <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"/> + <source>Administration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1360"/> + <source>Bundle Management</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="2237"/> + <source>Bisect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1397"/> + <source>Tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1405"/> + <source>Branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1418"/> + <source>Manage Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1426"/> + <source>Remote Repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1436"/> + <source>Cherry-pick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1444"/> + <source>Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1459"/> + <source>Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1541"/> + <source>Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1646"/> + <source>Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <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"/> + <source>Pull</source> + <translation type="unfinished">Çekmek</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1715"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1734"/> + <source>Unstage Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <source>Select a remote repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1853"/> + <source>Copy Commits (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1872"/> + <source>Copy Commits (Quit)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1892"/> + <source>Copy Commits (Cancel)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1911"/> + <source>Save Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1961"/> + <source>Restore Stash</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitPullDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="14"/> + <source>Git Pull</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="23"/> + <source>Remote Repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="30"/> + <source>Select the remote repository to pull from</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="46"/> + <source>Remote Branches:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="56"/> + <source>Press to update the list of remote branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="59"/> + <source>Update</source> + <translation type="unfinished">Güncelle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="81"/> + <source>Select the remote branches to be pulled</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="94"/> + <source>Select to remove non-existing tracking references </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="97"/> + <source>Prune obsolete tracking references</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.py" line="36"/> + <source><All></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.py" line="37"/> + <source><Custom></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitPushDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="14"/> + <source>Git Push</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="25"/> + <source>Remote Repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="32"/> + <source>Select the remote repository to push to</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="48"/> + <source>Branches to be pushed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="70"/> + <source>Push?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="75"/> + <source>Local</source> + <translation type="unfinished">Yerel</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="80"/> + <source>Remote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="85"/> + <source>Force?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="93"/> + <source>Press to select all branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="96"/> + <source>Select All</source> + <translation type="unfinished">Hepsini Seç</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="106"/> + <source><b>WARNING: The "Force" option can result in dangling branches in the remote repository.</b></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="119"/> + <source>Select to push tags as well</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="122"/> + <source>Include tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="129"/> + <source>Select this to associate a remote tracking branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="132"/> + <source>Set tracking information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="139"/> + <source>Push Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="145"/> + <source>Select to push submodules automatically</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="148"/> + <source>on-demand</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="158"/> + <source>Select to check, if submodules were pushed already</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="161"/> + <source>check</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="168"/> + <source>Select to push submodules only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="171"/> + <source>only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="178"/> + <source>Select to not push any submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="181"/> + <source>no</source> + <translation type="unfinished">no</translation> + </message> +</context> +<context> + <name>GitReflogBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="14"/> + <source>Git Reflog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="42"/> + <source>Commit</source> + <translation type="unfinished">Teslimat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="47"/> + <source>Selector</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="52"/> + <source>Name</source> + <translation type="unfinished">Adı</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="57"/> + <source>Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="62"/> + <source>Subject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="72"/> + <source>Press to get the next bunch of log entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="75"/> + <source>&Next</source> + <translation type="unfinished">So&nraki</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="82"/> + <source>Enter the limit of entries to fetch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="122"/> + <source>Errors</source> + <translation type="unfinished">Hatalar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="128"/> + <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/GitReflogBrowserDialog.ui" line="144"/> + <source>Input</source> + <translation type="unfinished">Girdi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="166"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="169"/> + <source>&Send</source> + <translation type="unfinished">&Gönder</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="172"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="179"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="186"/> + <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/GitReflogBrowserDialog.ui" line="189"/> + <source>&Password Mode</source> + <translation type="unfinished">&Parola Modu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="192"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="59"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="61"/> + <source>Press to refresh the list of commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="200"/> + <source>Process Generation Error</source> + <translation type="unfinished">İşlem Üretecinde Hata</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="200"/> + <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> +</context> +<context> + <name>GitRemoteRepositoriesDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="14"/> + <source>Git Remote Repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="17"/> + <source><b>Git Remote Repositories</b> +<p>This dialog shows the available remote repositories.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="30"/> + <source>Remote Repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="46"/> + <source>Name</source> + <translation type="unfinished">Adı</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="51"/> + <source>URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="56"/> + <source>Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="82"/> + <source>Press to add a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="85"/> + <source>&Add</source> + <translation type="unfinished">&Ekle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="92"/> + <source>Press to rename the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="95"/> + <source>&Rename</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="102"/> + <source>Press to remove 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"/> + <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"/> + <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>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="217"/> + <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"/> + <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"/> + <source>&Password Mode</source> + <translation type="unfinished">&Parola Modu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="230"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="51"/> + <source>Refresh</source> + <translation type="unfinished">Tazele</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="53"/> + <source>Press to refresh the repositories display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="148"/> + <source>Process Generation Error</source> + <translation type="unfinished">İşlem Üretecinde Hata</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="148"/> + <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> +</context> +<context> + <name>GitRevisionSelectionDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="14"/> + <source>Git Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Gözden Geçirme</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="29"/> + <source>Select to specify a revision by a revision expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="32"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="42"/> + <source>Enter a commit id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="52"/> + <source>Tag:</source> + <translation type="unfinished">Etiket:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="68"/> + <source>Enter a tag name</source> + <translation type="unfinished">Etiket adı gir</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="78"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="81"/> + <source>Branch:</source> + <translation type="unfinished">Sınıf(Branş):</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="97"/> + <source>Enter a branch name</source> + <translation type="unfinished">Bir branş adı giriniz</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="107"/> + <source>Select to specify a revision by a remote branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="110"/> + <source>Remote Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="126"/> + <source>Enter a remote branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="136"/> + <source>Select HEAD revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="139"/> + <source>HEAD</source> + <translation type="unfinished">BAŞ</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="146"/> + <source>No revision selected</source> + <translation type="unfinished">Seçilmiş gözden geçirme yok</translation> + </message> +</context> +<context> + <name>GitRevisionsSelectionDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="14"/> + <source>Git Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="23"/> + <source>Revision &1</source> + <translation type="unfinished">Gözden Geçirme &1</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="137"/> + <source>Select to specify a revision by a revision expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="140"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="150"/> + <source>Enter a commit id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="157"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="160"/> + <source>Tag:</source> + <translation type="unfinished">Etiket:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="170"/> + <source>Enter a tag name</source> + <translation type="unfinished">Etiket adı gir</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="180"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="183"/> + <source>Branch:</source> + <translation type="unfinished">Sınıf(Branş):</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="193"/> + <source>Enter a branch name</source> + <translation type="unfinished">Bir branş adı giriniz</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="203"/> + <source>Select HEAD revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="206"/> + <source>HEAD</source> + <translation type="unfinished">BAŞ</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="216"/> + <source>Select revision before HEAD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="219"/> + <source>HEAD^</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="226"/> + <source>No revision selected</source> + <translation type="unfinished">Seçilmiş gözden geçirme yok</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="131"/> + <source>Revision &2</source> + <translation type="unfinished">Gözden Geçirme &2</translation> + </message> +</context> +<context> + <name>GitStashBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="14"/> + <source>Git Stash Browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="42"/> + <source>Name</source> + <translation type="unfinished">Adı</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="47"/> + <source>Date</source> + <translation type="unfinished">Tarih</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="52"/> + <source>Message</source> + <translation type="unfinished">Mesaj</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="66"/> + <source>Statistics</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="91"/> + <source>File</source> + <translation type="unfinished">Dosya</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="96"/> + <source>Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="101"/> + <source>Lines added</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="106"/> + <source>Lines deleted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="153"/> + <source>Errors</source> + <translation type="unfinished">Hatalar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="159"/> + <source><b>Git stash errors</b><p>This shows possible error messages of the git stash command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="175"/> + <source>Input</source> + <translation type="unfinished">Girdi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="197"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="200"/> + <source>&Send</source> + <translation type="unfinished">&Gönder</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="203"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="210"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="217"/> + <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/GitStashBrowserDialog.ui" line="220"/> + <source>&Password Mode</source> + <translation type="unfinished">&Parola Modu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="223"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="65"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="67"/> + <source>Press to refresh the list of stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="82"/> + <source>Show</source> + <translation type="unfinished">Göster</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="85"/> + <source>Restore && Keep</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="87"/> + <source>Restore && Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="90"/> + <source>Create Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="93"/> + <source>Delete</source> + <translation type="unfinished">Sil</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="95"/> + <source>Delete All</source> + <translation type="unfinished">Hepsini Sil</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="182"/> + <source>Process Generation Error</source> + <translation type="unfinished">İşlem Üretecinde Hata</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="182"/> + <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 numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="369"/> + <source>%n file(s) changed</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="371"/> + <source>%n line(s) inserted</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="373"/> + <source>%n line(s) deleted</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> +</context> +<context> + <name>GitStashDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="14"/> + <source>Git Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="23"/> + <source>Message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="33"/> + <source>Enter a message for the stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="40"/> + <source>Keep changes in staging area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="47"/> + <source>Untracked/Ignored Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="53"/> + <source>Select to not stash untracked or ignored files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="56"/> + <source>Don't stash untracked or ignored files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="66"/> + <source>Select to stash untracked files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="69"/> + <source>Stash untracked files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="76"/> + <source>Select to stash untracked and ignored files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="79"/> + <source>Stash untracked and ignored files</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitStatusDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="395"/> + <source>Git Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="17"/> + <source><b>Git Status</b> +<p>This dialog shows the status of the selected file or project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="26"/> + <source>Select action from menu</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="49"/> + <source>&Filter on Status:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="59"/> + <source>Select the status of entries to be shown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="662"/> + <source>Commit</source> + <translation type="unfinished">Teslimat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="105"/> + <source>Status (Work)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="110"/> + <source>Status (Staging)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="115"/> + <source>Path</source> + <translation type="unfinished">Yol</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="155"/> + <source>Difference Working to Staging</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="209"/> + <source>Difference Staging to HEAD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="252"/> + <source>Errors</source> + <translation type="unfinished">Hatalar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="271"/> + <source>Input</source> + <translation type="unfinished">Girdi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="293"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="296"/> + <source>&Send</source> + <translation type="unfinished">&Gönder</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="299"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="306"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="313"/> + <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/GitStatusDialog.ui" line="316"/> + <source>&Password Mode</source> + <translation type="unfinished">&Parola Modu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="319"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="65"/> + <source>Refresh</source> + <translation type="unfinished">Tazele</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="67"/> + <source>Press to refresh the status display</source> + <translation type="unfinished">Durum göstergesini yenilemek için bas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="105"/> + <source>Stage Selected Lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="109"/> + <source>Revert Selected Lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="113"/> + <source>Stage Hunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="117"/> + <source>Revert Hunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="123"/> + <source>Unstage Selected Lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="127"/> + <source>Unstage Hunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="169"/> + <source>added</source> + <translation type="unfinished">eklendi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="170"/> + <source>copied</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="171"/> + <source>deleted</source> + <translation type="unfinished">silinmiş</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="172"/> + <source>modified</source> + <translation type="unfinished">değiştirildi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="173"/> + <source>renamed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="175"/> + <source>not tracked</source> + <translation type="unfinished">izlenmedi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="174"/> + <source>unmerged</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="168"/> + <source>unmodified</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="176"/> + <source>ignored</source> + <translation type="unfinished">yoksayıldı</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="197"/> + <source>Commit the selected changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="198"/> + <source>Amend</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="200"/> + <source>Amend the latest commit with the selected changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="202"/> + <source>Select all for commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="204"/> + <source>Unselect all from commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="703"/> + <source>Add</source> + <translation type="unfinished">Ekle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="210"/> + <source>Add the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="211"/> + <source>Stage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="213"/> + <source>Stages all changes of the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="215"/> + <source>Unstage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="217"/> + <source>Unstages all changes of the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="839"/> + <source>Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="224"/> + <source>Shows the differences of the selected entry in a separate dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="227"/> + <source>Differences Side-By-Side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="229"/> + <source>Shows the differences of the selected entry side-by-side in a separate dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="786"/> + <source>Revert</source> + <translation type="unfinished">Başa Dönme</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="237"/> + <source>Reverts the changes of the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="242"/> + <source>Forget missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="244"/> + <source>Forgets about the selected missing files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="246"/> + <source>Restore missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="248"/> + <source>Restores the selected missing files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="253"/> + <source>Edit file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="255"/> + <source>Edit the selected conflicting file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="260"/> + <source>Adjust column sizes</source> + <translation type="unfinished">Sütün boyutunu ayarla</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="262"/> + <source>Adjusts the width of all columns to their contents</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="423"/> + <source>Process Generation Error</source> + <translation type="unfinished">İşlem Üretecinde Hata</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="423"/> + <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/GitStatusDialog.py" line="596"/> + <source>all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="662"/> + <source>There are no entries selected to be committed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="703"/> + <source>There are no unversioned entries available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="725"/> + <source>Stage</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="725"/> + <source>There are no stageable entries available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="747"/> + <source>Unstage</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="747"/> + <source>There are no unstageable entries available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="769"/> + <source>Forget Missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="810"/> + <source>There are no missing entries available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="786"/> + <source>There are no uncommitted, unstaged changes available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="810"/> + <source>Restore Missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="839"/> + <source>There are no uncommitted changes available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="891"/> + <source>Working Tree to Staging Area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="870"/> + <source>Staging Area to HEAD Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="892"/> + <source>Working Tree to HEAD Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="894"/> + <source>Side-by-Side Difference</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="894"/> + <source>Select the compare method.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1201"/> + <source>Revert selected lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1203"/> + <source>Revert hunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1204"/> + <source>Are you sure you want to revert the selected changes?</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitStatusMonitorThread</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py" line="93"/> + <source>Could not start the Git process.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py" line="133"/> + <source>Git status checked successfully</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmoduleAddDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="14"/> + <source>Add Submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="23"/> + <source>&URL:</source> + <translation type="unfinished">&URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="39"/> + <source>Enter the URL of the repository</source> + <translation type="unfinished">Kaynak havuzunun URL'sini giriniz</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="55"/> + <source>Select the repository URL via a directory selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="62"/> + <source>Press to clear the history of entered repository URLs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="69"/> + <source>Submodule &Directory:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="79"/> + <source>Enter the directory for the submodule (leave empty to use default).</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="89"/> + <source>&Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="99"/> + <source>Enter a branch name</source> + <translation type="unfinished">Bir branş adı giriniz</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="106"/> + <source>&Logical Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="116"/> + <source>Enter a logical name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="123"/> + <source>Select to enforce the operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="126"/> + <source>&Force Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="92"/> + <source>Select Submodule Repository Directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="118"/> + <source>Select Submodule Directory</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesDeinitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="14"/> + <source>Unregister Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="23"/> + <source>Select to unregister all submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="26"/> + <source>Unregister All Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="33"/> + <source>Selected Submodules:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="40"/> + <source>Select the submodules to be unregistered</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="53"/> + <source>Select to enforce unregistering</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="56"/> + <source>Enforce Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="14"/> + <source>Defined Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="39"/> + <source>Name</source> + <translation type="unfinished">Adı</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="44"/> + <source>Path</source> + <translation type="unfinished">Yol</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="49"/> + <source>URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="54"/> + <source>Branch</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesStatusDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="14"/> + <source>Submodules Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="33"/> + <source>Submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="38"/> + <source>Status</source> + <translation type="unfinished">Durum</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="43"/> + <source>Commit ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="48"/> + <source>Info</source> + <translation type="unfinished">Bilgi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="58"/> + <source>Select to show the status for the index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="61"/> + <source>Show Status for Index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="68"/> + <source>Perform a recursive operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="71"/> + <source>Recursive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="99"/> + <source>Errors</source> + <translation type="unfinished">Hatalar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="46"/> + <source>up-to-date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="47"/> + <source>not initialized</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="48"/> + <source>different to index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="49"/> + <source>merge conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="55"/> + <source>Refresh</source> + <translation type="unfinished">Tazele</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="57"/> + <source>Press to refresh the status display</source> + <translation type="unfinished">Durum göstergesini yenilemek için bas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="105"/> + <source>The process {0} did not finish within 30 seconds.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="109"/> + <source>The process {0} finished with an error. +Error: {1}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="115"/> + <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/GitSubmodulesStatusDialog.py" line="134"/> + <source>unknown</source> + <translation type="unfinished">bilinmeyen</translation> + </message> +</context> +<context> + <name>GitSubmodulesSummaryOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="14"/> + <source>Submodule Summary Options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="23"/> + <source>Selected Submodules:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="30"/> + <source>Select the submodules to show the summary for</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="43"/> + <source>Select to show summary information for the index of the superproject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="46"/> + <source>Show Summary for Superproject Index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="53"/> + <source>Select to show summary information for the index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="56"/> + <source>Show Summary for Index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="63"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="70"/> + <source>Enter a commit ID to show summary information for</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="73"/> + <source>Enter Commit ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="80"/> + <source>Limit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="87"/> + <source>Enter the maximum number of entries to be shown per submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="93"/> + <source>No Limit</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesSyncDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="14"/> + <source>Synchronize Submodule URLs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="23"/> + <source>Selected Submodules:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="30"/> + <source>Select the submodules to be synchronized</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="43"/> + <source>Select to perform a recursive synchronization</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="46"/> + <source>Recursive Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesUpdateOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="14"/> + <source>Submodule Update Options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="23"/> + <source>Update Procedure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="29"/> + <source>Select to perform a 'checkout' procedure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="32"/> + <source>checkout</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="42"/> + <source>Select to perform a 'rebase' procedure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="45"/> + <source>rebase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="52"/> + <source>Select to perform a 'merge' procedure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="55"/> + <source>merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="65"/> + <source>Select to initialize submodules before the update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="68"/> + <source>Initialize before Update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="75"/> + <source>Fetch remote changes before updating</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="78"/> + <source>Synchronize with remote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="88"/> + <source>Select to not fetch the remote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="91"/> + <source>Don't Fetch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="98"/> + <source>Selected Submodules:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="105"/> + <source>Select the submodules to be updated</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="118"/> + <source>Select to enforce the update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="121"/> + <source>Enforce Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitTagBranchListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="14"/> + <source>Git Tag List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="17"/> + <source><b>Git Tag/Branch List</b> +<p>This dialog shows a list of the projects tags or branches.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="33"/> + <source><b>Tag/Branches List</b> +<p>This shows a list of the projects tags or branches.</p></source> + <translation type="unfinished"><b>Etiket/Branş listesi</b> +<p>Bu diyalog proje etiket yada branş listesini gösterir.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="99"/> + <source>Commit</source> + <translation type="unfinished">Teslimat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="99"/> + <source>Name</source> + <translation type="unfinished">Adı</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="69"/> + <source>Errors</source> + <translation type="unfinished">Hatalar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="88"/> + <source>Input</source> + <translation type="unfinished">Girdi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="110"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="113"/> + <source>&Send</source> + <translation type="unfinished">&Gönder</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="116"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="123"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="130"/> + <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/GitTagBranchListDialog.ui" line="133"/> + <source>&Password Mode</source> + <translation type="unfinished">&Parola Modu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="136"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="94"/> + <source>Annotation Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="98"/> + <source>Git Branches List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="135"/> + <source>Process Generation Error</source> + <translation type="unfinished">İşlem Üretecinde Hata</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="135"/> + <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> +</context> +<context> + <name>GitTagDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="14"/> + <source>Git Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished">Adı:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="36"/> + <source>Enter the name of the tag</source> + <translation type="unfinished">Etiketin adını girin</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="39"/> + <source><b>Tag Name</b> +<p>Enter the name of the tag to be created, deleted or verified.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="53"/> + <source>Revision:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="60"/> + <source>Enter a revision to set a tag for</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="67"/> + <source>Tag Action</source> + <translation type="unfinished">Etiketleme İşlemi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="73"/> + <source>Select to create a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="76"/> + <source><b>Create Tag</b> +<p>Select this entry in order to create a tag.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="80"/> + <source>Create Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="90"/> + <source>Select to delete a tag</source> + <translation type="unfinished">Bir etiketi silmek için seç</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="93"/> + <source><b>Delete Tag</b> +<p>Select this entry in order to delete the selected tag.</p></source> + <translation type="unfinished"><b>Etiketi Sil</b> +<p>Sbu girişle seçilen bir etiketi silersiniz.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="97"/> + <source>Delete Tag</source> + <translation type="unfinished">Etiketi Sil</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="104"/> + <source>Select to verify a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="107"/> + <source><b>Verify Tag</b> +<p>Select this entry in order to verify the selected tag.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="111"/> + <source>Verify Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="121"/> + <source>Tag Type</source> + <translation type="unfinished">Etiket Tipi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="127"/> + <source>Select to create/delete/verify a global tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="130"/> + <source>Global Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="140"/> + <source>Select to create/delete/verify a signed tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="143"/> + <source>Signed Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="150"/> + <source>Select to create/delete/verify a local tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="153"/> + <source>Local Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="163"/> + <source>Select to enforce the create operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="166"/> + <source>Enforce Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitUserConfigDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="14"/> + <source>Git User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="23"/> + <source>User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="29"/> + <source>First Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="36"/> + <source>Enter the first name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="43"/> + <source>Last Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="50"/> + <source>Enter the last name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="57"/> + <source>Email:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="64"/> + <source>Enter the email address</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GlosbeEngine</name> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/GlosbeEngine.py" line="88"/> @@ -70337,6 +76909,19 @@ </message> </context> <context> + <name>VcsGitPlugin</name> + <message> + <location filename="../Plugins/PluginVcsGit.py" line="60"/> + <source>Version Control - Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/PluginVcsGit.py" line="135"/> + <source>Git</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>VcsMercurialPlugin</name> <message> <location filename="../Plugins/PluginVcsMercurial.py" line="60"/>
--- a/i18n/eric6_zh_CN.ts Sun Dec 10 16:43:11 2017 +0100 +++ b/i18n/eric6_zh_CN.ts Sun Dec 10 17:42:11 2017 +0100 @@ -17835,6 +17835,6576 @@ </message> </context> <context> + <name>Git</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="211"/> + <source>The git process finished with the exit code {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1565"/> + <source>The git process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="218"/> + <source>Could not start the git executable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="246"/> + <source>Create project repository</source> + <translation type="unfinished">创建项目仓库</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="246"/> + <source>The project repository could not be created.</source> + <translation type="unfinished">无法创建项目仓库。</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="274"/> + <source>Creating Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="289"/> + <source>Adding files to Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="300"/> + <source>Initial commit to Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="330"/> + <source>Cloning project from a Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="419"/> + <source>Commit Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="419"/> + <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="478"/> + <source>Committing changes to Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="501"/> + <source>Switch</source> + <translation type="unfinished">转换</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="501"/> + <source><p>Do you really want to switch to <b>{0}</b>?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="532"/> + <source>Synchronizing with the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="579"/> + <source>Adding files/directories to the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="653"/> + <source>Removing files/directories from the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="710"/> + <source>Renaming {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="833"/> + <source>Unstage files/directories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="884"/> + <source>Revert changes</source> + <translation type="unfinished">还原改变</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="875"/> + <source>Do you really want to revert all changes to these files or directories?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="884"/> + <source>Do you really want to revert all changes of the project?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="890"/> + <source>Reverting changes</source> + <translation type="unfinished">还原改变</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="942"/> + <source>Merging</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="967"/> + <source>Master branch head</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1200"/> + <source>Git Command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1287"/> + <source><tr><td><b>Commit</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1291"/> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1295"/> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1299"/> + <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1302"/> + <source><tr><td><b>Author</b></td><td>{0} &lt;{1}&gt;</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1305"/> + <source><tr><td><b>Date</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1308"/> + <source><tr><td><b>Committer</b></td><td>{0} &lt;{1}&gt;</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1311"/> + <source><tr><td><b>Committed Date</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1314"/> + <source><tr><td><b>Subject</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1322"/> + <source><h3>Repository information</h3> +<p><table> +<tr><td><b>Git V.</b></td><td>{0}</td></tr> +<tr></tr> +{1}</table></p> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1390"/> + <source>Create {0} file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1390"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation type="unfinished"><p>文件 <b>{0}</b> 已经存在。是否覆盖?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1449"/> + <source>Git Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1434"/> + <source><p>Copying the directory <b>{0}</b> failed.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1449"/> + <source><p>Copying the file <b>{0}</b> failed.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2634"/> + <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/git.py" line="1636"/> + <source>Git Side-by-Side Difference</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1636"/> + <source><p>The file <b>{0}</b> could not be read.</p></source> + <translation type="unfinished"><p>文件 <b>{0}</b> 无法读取。</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1685"/> + <source>Fetching from a remote Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1723"/> + <source>Pulling from a remote Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1764"/> + <source>Pushing to a remote Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1792"/> + <source>Committing failed merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1819"/> + <source>Aborting uncommitted/failed merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1852"/> + <source>Applying patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1884"/> + <source>Check patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1887"/> + <source>Apply patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1969"/> + <source>Tagging in the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2200"/> + <source>Branching in the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2240"/> + <source>Delete Remote Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2261"/> + <source>Current Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2261"/> + <source><p>The current branch is <b>{0}</b>.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2325"/> + <source>Create Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2290"/> + <source>Git Bundle Files (*.bundle)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2307"/> + <source><p>The Git bundle file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2355"/> + <source>Verify Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2485"/> + <source>Git Bundle Files (*.bundle);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2385"/> + <source>List Bundle Heads</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2485"/> + <source>Apply Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2508"/> + <source>Applying a bundle file (fetch)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2535"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2738"/> + <source>Git Bisect ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2634"/> + <source>Process Generation Error</source> + <translation type="unfinished">进程生成错误</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2678"/> + <source>Create Bisect Replay File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2644"/> + <source>Git Bisect Replay Files (*.replay)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2661"/> + <source><p>The Git bisect replay file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2678"/> + <source><p>The file <b>{0}</b> could not be written.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2699"/> + <source>Edit Bisect Replay File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2726"/> + <source>Git Bisect Replay Files (*.replay);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2726"/> + <source>Bisect Replay</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2980"/> + <source>Show Remote Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2927"/> + <source>Rename Remote Repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2927"/> + <source>Enter new name for remote repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3004"/> + <source>Show Shortlog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3062"/> + <source>Cherry-pick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3092"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3117"/> + <source>Copy Changesets (Quit)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3143"/> + <source>Copy Changesets (Cancel)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3223"/> + <source>Saving stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3422"/> + <source>Show Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3422"/> + <source>Select a stash (empty for latest stash):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3334"/> + <source>Restore Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3348"/> + <source>Restoring stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3382"/> + <source>Create Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3372"/> + <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="3397"/> + <source>Creating branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3431"/> + <source>Delete Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3431"/> + <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="3442"/> + <source>Deleting stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> + <source>Delete All Stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> + <source>Do you really want to delete all stashes?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3470"/> + <source>Deleting all stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3542"/> + <source>Showing the combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3568"/> + <source>Verifying the integrity of the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3593"/> + <source>Performing Repository Housekeeping</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3637"/> + <source><tr><td><b>Statistics</b></td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3638"/> + <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="3642"/> + <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="3646"/> + <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="3650"/> + <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="3654"/> + <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="3658"/> + <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="3662"/> + <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="3666"/> + <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="3672"/> + <source><p><b>No statistics available.</b></p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3738"/> + <source>Creating Archive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3781"/> + <source>Add Submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3840"/> + <source>List Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3840"/> + <source>No submodules defined for the project.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3855"/> + <source>All</source> + <translation type="unfinished">全部</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <source>Submodule Path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <source>Select a submodule path:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3911"/> + <source>Initialize Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3948"/> + <source>Unregister Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4028"/> + <source>Update Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4062"/> + <source>Synchronize Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4120"/> + <source>Submodules Summary</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitAddRemoteDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="14"/> + <source>Git Add Remote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished">名称:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="30"/> + <source>Enter the remote name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="37"/> + <source>URL:</source> + <translation type="unfinished">URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="44"/> + <source>Enter the remote URL</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitApplyBundleDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="14"/> + <source>Git Apply Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="23"/> + <source>Bundle Head:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="36"/> + <source>Select a head to apply</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="43"/> + <source>Local Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui" line="56"/> + <source>Enter a local branch</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitArchiveDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="14"/> + <source>Git Archive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="29"/> + <source>Select to specify a revision by a revision expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="32"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="42"/> + <source>Enter a commit id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="52"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="68"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="78"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="81"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="97"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="107"/> + <source>Select HEAD revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="110"/> + <source>HEAD</source> + <translation type="unfinished">头部</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="125"/> + <source>Format:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="132"/> + <source>Select the archive format</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="139"/> + <source>File Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="146"/> + <source>Enter the name of the archive file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="153"/> + <source>Select the archive file via a file selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="160"/> + <source>Prefix:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui" line="167"/> + <source>Enter a prefix to be prepended to each file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.py" line="88"/> + <source>Select Archive File</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBisectLogBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="14"/> + <source>Git Bisect Log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="42"/> + <source>Commit</source> + <translation type="unfinished">提交</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="47"/> + <source>Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="52"/> + <source>Subject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="66"/> + <source>Errors</source> + <translation type="unfinished">错误</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="72"/> + <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/GitBisectLogBrowserDialog.ui" line="88"/> + <source>Input</source> + <translation type="unfinished">输入</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="110"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="113"/> + <source>&Send</source> + <translation type="unfinished">发送(&S)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="116"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="123"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="130"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished">选择将输入区域转换成密码模式</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="133"/> + <source>&Password Mode</source> + <translation type="unfinished">密码模式(&P)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui" line="136"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="57"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="59"/> + <source>Press to refresh the list of commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="175"/> + <source>Process Generation Error</source> + <translation type="unfinished">进程生成错误</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py" line="175"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + </message> +</context> +<context> + <name>GitBisectStartDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="14"/> + <source>Git Bisect Start</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="23"/> + <source>Bad Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="30"/> + <source>Enter a bad commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="37"/> + <source>Good Commits:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="44"/> + <source>Enter a list of good commits separated by space</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="51"/> + <source>Select to not checkout the working tree</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui" line="54"/> + <source>Don't checkout working tree</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBlameDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="14"/> + <source>Git Blame</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="45"/> + <source>Commit</source> + <translation type="unfinished">提交</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="50"/> + <source>Author</source> + <translation type="unfinished">作者</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="55"/> + <source>Date</source> + <translation type="unfinished">数据</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="60"/> + <source>Time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="65"/> + <source>Line</source> + <translation type="unfinished">行</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="79"/> + <source>Errors</source> + <translation type="unfinished">错误</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="98"/> + <source>Input</source> + <translation type="unfinished">输入</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="120"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="123"/> + <source>&Send</source> + <translation type="unfinished">发送(&S)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="126"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="133"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="140"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished">选择将输入区域转换成密码模式</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="143"/> + <source>&Password Mode</source> + <translation type="unfinished">密码模式(&P)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui" line="146"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="119"/> + <source>Process Generation Error</source> + <translation type="unfinished">进程生成错误</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="119"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + </message> +</context> +<context> + <name>GitBranchDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="14"/> + <source>Git Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="23"/> + <source>Branch Action</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="29"/> + <source>Select to create a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="32"/> + <source><b>Create Branch</b> +<p>Select this entry in order to create a branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="36"/> + <source>Create</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="46"/> + <source>Select to rename a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="49"/> + <source><b>Rename</b> +<p>Select this entry in order to rename the selected branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="53"/> + <source>Rename</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="60"/> + <source>Select to delete a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="63"/> + <source><b>Delete Branch</b> +<p>Select this entry in order to delete the selected branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="67"/> + <source>Delete</source> + <translation type="unfinished">删除</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="74"/> + <source>Select to create a new branch and switch to it</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="77"/> + <source><b>Create &amp; Switch</b>\n<p>Select this entry in order to create a new branch and switch the working tree to it.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="80"/> + <source>Create && Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="87"/> + <source>Select to create a tracking branch and switch to it</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="90"/> + <source><b>Create Tracking Branch &amp; Switch</b>\n<p>Select this entry in order to create a new branch tracking a remote repository branch. The working tree is switched to it.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="93"/> + <source>Create Tracking Branch && Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="100"/> + <source>Select to associate a remote branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="209"/> + <source>Set Tracking Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="110"/> + <source>Select to de-associate a remote branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="113"/> + <source>Unset Tracking Branch Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="125"/> + <source>Name:</source> + <translation type="unfinished">名称:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="138"/> + <source>Enter the name of the branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="141"/> + <source><b>Branch Name</b> +<p>Enter the name of the branch to be created, deleted or moved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="157"/> + <source>Create Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="163"/> + <source>Revision:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="170"/> + <source>Enter a revision at which to start the branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="183"/> + <source>Rename Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="189"/> + <source>New Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="196"/> + <source>Enter a new name for the selected branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="215"/> + <source>Remote Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="228"/> + <source>Select the remote branch to associate</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="238"/> + <source>Select to enforce the create operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui" line="241"/> + <source>Enforce Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBranchPushDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="14"/> + <source>Git Push Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="23"/> + <source>Branch Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="36"/> + <source>Select the branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="43"/> + <source>Remote Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui" line="56"/> + <source>Select the remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.py" line="36"/> + <source><all branches></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitBundleDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="14"/> + <source>Git Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="29"/> + <source>Select to specify a revision or revision range</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="32"/> + <source>Revisions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="42"/> + <source>Enter revisions or revision range expressions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="52"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="62"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="72"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="75"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui" line="85"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitCherryPickDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="14"/> + <source>Git Cherry-pick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="23"/> + <source>Commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="29"/> + <source>Enter commits by id, branch or tag one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="45"/> + <source>Select to append cherry-pick info to the commit message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="48"/> + <source>Append Cherry-pick &Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="58"/> + <source>Select to add a 'Signed-off-by' line to the commit message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="61"/> + <source>Append '&Signed-off-by' line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="68"/> + <source>Select to not commit the cherry-pick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="71"/> + <source>Don't &commit</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitCommandDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="14"/> + <source>Git Command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="23"/> + <source>Git Command:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="36"/> + <source>Enter the Git command to be executed with all necessary parameters</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="39"/> + <source><b>Git Command</b> +<p>Enter the Git command to be executed including all necessary +parameters. If a parameter of the commandline includes a space you have to +surround this parameter by single or double quotes. Do not include the name +of the Git client executable (i.e. git).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="65"/> + <source>Project Directory:</source> + <translation type="unfinished">项目文件夹:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="78"/> + <source>This shows the root directory of the current project.</source> + <translation type="unfinished">显示当前项目的根目录。</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui" line="81"/> + <source>project directory</source> + <translation type="unfinished">项目文件夹</translation> + </message> +</context> +<context> + <name>GitCommitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="14"/> + <source>Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="20"/> + <source>Commit Message</source> + <translation type="unfinished">提交消息</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="26"/> + <source>Enter the log message.</source> + <translation type="unfinished">输入日志消息。</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="29"/> + <source><b>Log Message</b> +<p>Enter the log message for the commit action.</p></source> + <translation type="unfinished"><b>日志消息</b> +<p>为提交动作输入日志消息。</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="43"/> + <source>Recent commit messages</source> + <translation type="unfinished">最近提交消息</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="50"/> + <source>Select a recent commit message to use</source> + <translation type="unfinished">选择使用一个最近提交消息</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="60"/> + <source>Select to commit only staged changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="63"/> + <source>Commit staged changes only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="70"/> + <source>Select to amend the last commit (leave message empty to keep it)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="73"/> + <source>Amend the last commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="80"/> + <source>Select to reset the author information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui" line="83"/> + <source>Reset Author Info</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitCopyDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="14"/> + <source>Git Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="25"/> + <source>Source:</source> + <translation type="unfinished">源:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="32"/> + <source>Shows the name of the source</source> + <translation type="unfinished">显示源名称</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="35"/> + <source><b>Source name</b> +<p>This field shows the name of the source.</p></source> + <translation type="unfinished"><b>源名称</b> +<p>该区域显示源名称。</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="46"/> + <source>Enter the target name</source> + <translation type="unfinished">输入目标名</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="49"/> + <source><b>Target name</b> +<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="57"/> + <source>Target:</source> + <translation type="unfinished">目标:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="64"/> + <source>Press to open a selection dialog</source> + <translation type="unfinished">点击打开选择对话框</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="67"/> + <source><b>Target directory</b> +<p>Select the target name for the operation via a selection dialog.</p></source> + <translation type="unfinished"><b>目标文件夹</b> +<p>通过选择对话框为操作选择目标名称。</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="77"/> + <source>Select to force the operation</source> + <translation type="unfinished">选择强制操作</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui" line="80"/> + <source>Enforce operation</source> + <translation type="unfinished">强制操作</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.py" line="51"/> + <source>Git Move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitCopyDialog.py" line="89"/> + <source>Select target</source> + <translation type="unfinished">选择目标</translation> + </message> +</context> +<context> + <name>GitDescribeDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="14"/> + <source>Git Tag List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="42"/> + <source>Commit</source> + <translation type="unfinished">提交</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="47"/> + <source>Tag Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="61"/> + <source>Errors</source> + <translation type="unfinished">错误</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="80"/> + <source>Input</source> + <translation type="unfinished">输入</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="102"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="105"/> + <source>&Send</source> + <translation type="unfinished">发送(&S)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="108"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="115"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="122"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished">选择将输入区域转换成密码模式</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="125"/> + <source>&Password Mode</source> + <translation type="unfinished">密码模式(&P)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui" line="128"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py" line="117"/> + <source>Process Generation Error</source> + <translation type="unfinished">进程生成错误</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py" line="117"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + </message> +</context> +<context> + <name>GitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="14"/> + <source>Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="29"/> + <source>Output</source> + <translation type="unfinished">输出</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="57"/> + <source>Errors</source> + <translation type="unfinished">错误</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="76"/> + <source>Input</source> + <translation type="unfinished">输入</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="98"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="101"/> + <source>&Send</source> + <translation type="unfinished">发送(&S)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="104"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="111"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="118"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished">选择将输入区域转换成密码模式</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="121"/> + <source>&Password Mode</source> + <translation type="unfinished">密码模式(&P)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.ui" line="124"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="88"/> + <source>Additional Output</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="104"/> + <source>Process canceled.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="116"/> + <source>Process finished successfully.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="118"/> + <source>Process crashed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="120"/> + <source>Proces finished with exit code {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/> + <source>Process Generation Error</source> + <translation type="unfinished">进程生成错误</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + </message> +</context> +<context> + <name>GitDiffDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="14"/> + <source>Git Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="26"/> + <source>Difference</source> + <translation type="unfinished">差异</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="39"/> + <source><b>Git Diff</b><p>This shows the output of the git diff command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="56"/> + <source><b>Git Diff</b><p>This shows the output of the git diff command (stage to repo) if the dialog was asked to show separate diffs.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui" line="85"/> + <source>Errors</source> + <translation type="unfinished">错误</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="48"/> + <source>Refresh</source> + <translation type="unfinished">刷新</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="50"/> + <source>Press to refresh the display</source> + <translation type="unfinished">点击刷新显示</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="96"/> + <source>Working Tree to Staging Area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="97"/> + <source>Staging Area to HEAD Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="98"/> + <source>Working Tree to HEAD Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="99"/> + <source>Working to Staging (top) and Staging to HEAD (bottom)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="101"/> + <source>Stash Contents</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="102"/> + <source>Stash Contents of {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="171"/> + <source>Difference ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="179"/> + <source>Process Generation Error</source> + <translation type="unfinished">进程生成错误</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="179"/> + <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/GitDiffDialog.py" line="206"/> + <source>There is no difference.</source> + <translation type="unfinished">没有差异。</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="227"/> + <source><Start></source> + <translation type="unfinished"><开始></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="228"/> + <source><End></source> + <translation type="unfinished"><结束></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="356"/> + <source>Save Diff</source> + <translation type="unfinished">保存差异</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="322"/> + <source>Patch Files (*.diff)</source> + <translation type="unfinished">补丁文件 (*.diff)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="339"/> + <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"><p>补丁文件 <b>{0}</b> 已经存在。是否覆盖?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDiffDialog.py" line="356"/> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation type="unfinished"><p>补丁文件 <b>{0}</b> 无法保存。<br />原因:{1}</p></translation> + </message> +</context> +<context> + <name>GitFetchDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="14"/> + <source>Git Fetch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="23"/> + <source>Remote Repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="30"/> + <source>Select the remote repository to fetch from</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="46"/> + <source>Remote Branches:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="56"/> + <source>Press to update the list of remote branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="59"/> + <source>Update</source> + <translation type="unfinished">更新</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="81"/> + <source>Select the remote branches to be fetched</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="94"/> + <source>Local Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="101"/> + <source>Select the local branch to fetch into</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="111"/> + <source>Select to remove non-existing tracking references </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="114"/> + <source>Prune obsolete tracking references</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="121"/> + <source>Select to fetch tags as well</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui" line="124"/> + <source>Include tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.py" line="36"/> + <source><All></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitFetchDialog.py" line="37"/> + <source><Custom></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitListDialog.ui" line="14"/> + <source>Git Select</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitListDialog.ui" line="23"/> + <source>Select from the list:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitLogBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="14"/> + <source>Git Log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="22"/> + <source>Select action from menu</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="45"/> + <source>Select the mode (find or filter)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="65"/> + <source>From:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="72"/> + <source>Enter the start date</source> + <translation type="unfinished">输入开始数据</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="82"/> + <source>To:</source> + <translation type="unfinished">到:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="89"/> + <source>Enter the end date</source> + <translation type="unfinished">输入结束数据</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="112"/> + <source>Select the field to filter on</source> + <translation type="unfinished">选择要过滤的区域</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="119"/> + <source>Enter the regular expression to filter on or search for</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="126"/> + <source>Press to find the previous occurrence</source> + <translation type="unfinished">点击查找上一次出现</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="133"/> + <source>Press to find the next occurrence</source> + <translation type="unfinished">点击查找下一次出现</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="174"/> + <source>Graph</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="101"/> + <source>Commit ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="102"/> + <source>Author</source> + <translation type="unfinished">作者</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="189"/> + <source>Date</source> + <translation type="unfinished">数据</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="103"/> + <source>Committer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="199"/> + <source>Commit Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="104"/> + <source>Subject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="209"/> + <source>Branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="214"/> + <source>Tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="224"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="234"/> + <source>Press to move down in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="257"/> + <source>Press to get the next bunch of log entries</source> + <translation type="unfinished">点击获得日志条目的下一个分支</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="260"/> + <source>&Next</source> + <translation type="unfinished">下一个(&N)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="267"/> + <source>Enter the limit of entries to fetch</source> + <translation type="unfinished">输入要提取条目的限制</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="286"/> + <source>Select to stop listing log messages at a copy or move</source> + <translation type="unfinished">选择在复制或移动时停止列出日志消息</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="289"/> + <source>Stop on Copy/Move</source> + <translation type="unfinished">复制或移动时停止</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="378"/> + <source>Action</source> + <translation type="unfinished">动作</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="383"/> + <source>Path</source> + <translation type="unfinished">路径</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="388"/> + <source>Additions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="393"/> + <source>Deletions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="398"/> + <source>Copy from</source> + <translation type="unfinished">复制自</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2119"/> + <source>Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="445"/> + <source><a href="save:me">Save</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="491"/> + <source>Errors</source> + <translation type="unfinished">错误</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="497"/> + <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/GitLogBrowserDialog.ui" line="513"/> + <source>Input</source> + <translation type="unfinished">输入</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="535"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="538"/> + <source>&Send</source> + <translation type="unfinished">发送(&S)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="541"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="548"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="555"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished">选择将输入区域转换成密码模式</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="558"/> + <source>&Password Mode</source> + <translation type="unfinished">密码模式(&P)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="561"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="88"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="90"/> + <source>Press to refresh the list of commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="98"/> + <source>Find</source> + <translation type="unfinished">查找</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="99"/> + <source>Filter</source> + <translation type="unfinished">过滤器</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="105"/> + <source>File</source> + <translation type="unfinished">文件</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="122"/> + <source><table><tr><td><b>Commit ID</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2} &lt;{3}&gt;</td></tr><tr><td><b>Commit Date</b></td><td>{4}</td></tr><tr><td><b>Committer</b></td><td>{5} &lt;{6}&gt;</td></tr>{7}<tr><td><b>Subject</b></td><td>{8}</td></tr>{9}</table></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="134"/> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="137"/> + <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="140"/> + <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="143"/> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="146"/> + <source><tr><td><b>Message</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="198"/> + <source>Added</source> + <translation type="unfinished">已添加</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="199"/> + <source>Deleted</source> + <translation type="unfinished">已删除</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="200"/> + <source>Modified</source> + <translation type="unfinished">已修改</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="201"/> + <source>Copied</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="202"/> + <source>Renamed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="203"/> + <source>Type changed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="204"/> + <source>Unmerged</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="205"/> + <source>Unknown</source> + <translation type="unfinished">未知</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="241"/> + <source>Show Commit ID Column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="243"/> + <source>Press to show the commit ID column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="251"/> + <source>Show Author Columns</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="253"/> + <source>Press to show the author columns</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="261"/> + <source>Show Committer Columns</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="263"/> + <source>Press to show the committer columns</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="271"/> + <source>Show Branches Column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="273"/> + <source>Press to show the branches column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="281"/> + <source>Show Tags Column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="283"/> + <source>Press to show the Tags column</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="313"/> + <source>Copy Commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="315"/> + <source>Cherry-pick the selected commits to the current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="320"/> + <source>Tag</source> + <translation type="unfinished">标签</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="322"/> + <source>Tag the selected commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1812"/> + <source>Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="326"/> + <source>Create a new branch at the selected commit.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="328"/> + <source>Branch && Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="330"/> + <source>Create a new branch at the selected commit and switch the work tree to it.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1864"/> + <source>Switch</source> + <translation type="unfinished">转换</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="336"/> + <source>Switch the working directory to the selected commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1890"/> + <source>Show Short Log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="342"/> + <source>Show a dialog with a log output for release notes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="345"/> + <source>Describe</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="347"/> + <source>Show the most recent tag reachable from a commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="648"/> + <source>The git process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="651"/> + <source>Could not start the git executable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="654"/> + <source>Git Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="769"/> + <source>{0} ({1}%)</source> + <comment>action, confidence</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="835"/> + <source>Process Generation Error</source> + <translation type="unfinished">进程生成错误</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="835"/> + <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/GitLogBrowserDialog.py" line="1275"/> + <source>Side-by-Side Diff to Parent {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1287"/> + <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1725"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1864"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1890"/> + <source>Select a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/> + <source>Select a default branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1844"/> + <source>Branch & Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2073"/> + <source>Find Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2073"/> + <source>'{0}' was not found.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2133"/> + <source>Differences to Parent {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2148"/> + <source>Diff to Parent {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2174"/> + <source>There is no difference.</source> + <translation type="unfinished">没有差异。</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2337"/> + <source>Save Diff</source> + <translation type="unfinished">保存差异</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2303"/> + <source>Patch Files (*.diff)</source> + <translation type="unfinished">补丁文件 (*.diff)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2320"/> + <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"><p>补丁文件 <b>{0}</b> 已经存在。是否覆盖?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2337"/> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation type="unfinished"><p>补丁文件 <b>{0}</b> 无法保存。<br />原因:{1}</p></translation> + </message> +</context> +<context> + <name>GitMergeDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="14"/> + <source>Git Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="29"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="32"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="42"/> + <source>Enter a commit id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="52"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="62"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="72"/> + <source>Select to specify a revision by a local branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="75"/> + <source>Local Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="85"/> + <source>Enter a local branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="95"/> + <source>Select to specify a revision by a remote branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="98"/> + <source>Remote Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="108"/> + <source>Enter a remote branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="118"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="121"/> + <source>No commit selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="134"/> + <source>Select to commit the merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="137"/> + <source>Commit Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="146"/> + <source>Commit Message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="153"/> + <source>Enter a message for the merge commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="163"/> + <source>Select to append the log summaries of merged commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="166"/> + <source>Add Log Message Summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="176"/> + <source>Select to show diff statistics at the end of the merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui" line="179"/> + <source>Show diff statistics</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitNewProjectOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="14"/> + <source>New Project from Repository</source> + <translation type="unfinished">从仓库新建项目</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="17"/> + <source><b>New Project from Repository Dialog</b> +<p>Enter the various repository infos into the entry fields. These values are used, when the new project is retrieved from the repository.</p> +<p>For remote repositories the URL must contain the hostname.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="28"/> + <source>&URL:</source> + <translation type="unfinished">&URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="44"/> + <source>Enter the URL of the repository</source> + <translation type="unfinished">输入仓库的 URL</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="60"/> + <source>Select the repository url via a directory selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="67"/> + <source>Press to clear the history of entered repository URLs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="74"/> + <source>Project &Directory:</source> + <translation type="unfinished">项目文件夹(&D):</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="84"/> + <source>Enter the directory of the new project.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui" line="87"/> + <source><b>Project Directory</b> +<p>Enter the directory of the new project. It will be retrieved from +the repository and be placed in this directory.</p></source> + <translation type="unfinished"><b>项目文件夹</b> +<p>输入新项目的文件夹。它将在仓库中被检索,且被放置在该文件夹中。</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py" line="87"/> + <source>Select Repository-Directory</source> + <translation type="unfinished">选择储存库文件夹</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py" line="102"/> + <source>Select Project Directory</source> + <translation type="unfinished">选择项目文件夹</translation> + </message> +</context> +<context> + <name>GitOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="14"/> + <source>Initial Commit</source> + <translation type="unfinished">初始提交</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="17"/> + <source><b>Initial Commit Dialog</b> +<p>Enter the message for the initial commit.</p></source> + <translation type="unfinished"><b>初始提交对话框</b> +<p>输入初始提交的信息。</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="29"/> + <source>Commit &Message:</source> + <translation type="unfinished">提交信息(&M):</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="39"/> + <source>Enter the log message for the new project.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="42"/> + <source><b>Log Message</b> +<p>Enter the log message to be used for the new project.</p></source> + <translation type="unfinished"><b>日志消息</b> +<p>输入将为新项目使用的日志消息。</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui" line="46"/> + <source>new project started</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitPage</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="14"/> + <source>Select to perform an expensive copy detection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="20"/> + <source><b>Configure Git Interface</b></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="40"/> + <source>Log</source> + <translation type="unfinished">日志</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="46"/> + <source>No. of log messages shown:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="53"/> + <source>Enter the number of log messages to be shown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="82"/> + <source>No. of subject characters shown in list:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="89"/> + <source>Enter the number of characters of the commit subject to be shown in the list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="95"/> + <source>All</source> + <translation type="unfinished">全部</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="105"/> + <source>Select to perform expensive copy detection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="108"/> + <source>Find copies harder</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="118"/> + <source>Commit</source> + <translation type="unfinished">提交</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="124"/> + <source>No. of commit messages to remember:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="131"/> + <source>Enter the number of commit messages to remember</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="160"/> + <source>Commit ID length:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="167"/> + <source>Enter the number of character to show for the commit ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="199"/> + <source>Cleanup</source> + <translation type="unfinished">清除</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="205"/> + <source>Pattern:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="212"/> + <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="222"/> + <source>Repository Optimization</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="228"/> + <source>Select this to use the '--aggressive' option for garbage collection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="231"/> + <source>Perform aggressive repository optimization</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="241"/> + <source>Edit the Git configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui" line="244"/> + <source>Edit configuration file</source> + <translation type="unfinished">编辑配置文件</translation> + </message> +</context> +<context> + <name>GitPatchFilesDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py" line="83"/> + <source>Patch Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="37"/> + <source>Press to add patch files to the list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="44"/> + <source>Press to delete the selected patch files from the list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="58"/> + <source>Press to move the selected file up</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="65"/> + <source>Press to move the selected file down</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="91"/> + <source>Strip Count:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="98"/> + <source>Enter number of leading directories to strip off (default 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="129"/> + <source>Select, if the patch has inaccurate end-of-file markers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="132"/> + <source>Patch has inaccurate end-of-file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="139"/> + <source>Select, if the line counts of the patch header may be wrong</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui" line="142"/> + <source>Don't trust line counts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py" line="83"/> + <source>Patch Files (*.diff *.patch);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitPatchStatisticsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="14"/> + <source>Patch Statistics</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="23"/> + <source>Insertions and Deletions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="52"/> + <source># Insertions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="57"/> + <source># Deletions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="62"/> + <source>File</source> + <translation type="unfinished">文件</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui" line="70"/> + <source>Summary Information:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="122"/> + <source>Process Generation Error</source> + <translation type="unfinished">进程生成错误</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="122"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + </message> +</context> +<context> + <name>GitProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="488"/> + <source>Version Control</source> + <translation type="unfinished">版本控制</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="499"/> + <source>Commit changes to repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="505"/> + <source>Add/Stage to repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="508"/> + <source>Unstage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="514"/> + <source>Remove from repository (and disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="588"/> + <source>Remove from repository only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="430"/> + <source>Copy</source> + <translation type="unfinished">复制</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="432"/> + <source>Move</source> + <translation type="unfinished">移动</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="435"/> + <source>Show log browser</source> + <translation type="unfinished">显示日志浏览器</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="520"/> + <source>Show status</source> + <translation type="unfinished">显示状态</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="525"/> + <source>Show differences</source> + <translation type="unfinished">显示差异</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="229"/> + <source>Show differences side-by-side</source> + <translation type="unfinished">并排显示差异</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="529"/> + <source>Show differences (extended)</source> + <translation type="unfinished">显示差异(扩展)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="238"/> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished">并排显示差异(扩展)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="244"/> + <source>Show annotated file</source> + <translation type="unfinished">显示有注释的文件</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="535"/> + <source>Revert changes</source> + <translation type="unfinished">还原改变</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="542"/> + <source>Select all local file entries</source> + <translation type="unfinished">选择所有本地文件条目</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="544"/> + <source>Select all versioned file entries</source> + <translation type="unfinished">选择所有版本化的文件条目</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="546"/> + <source>Select all local directory entries</source> + <translation type="unfinished">选择所有本地文件夹条目</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="548"/> + <source>Select all versioned directory entries</source> + <translation type="unfinished">选择所有版本化的文件夹条目</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="551"/> + <source>Configure...</source> + <translation type="unfinished">配置…</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py" line="588"/> + <source>Do you really want to remove these files from the repository?</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="73"/> + <source>New from repository</source> + <translation type="unfinished">从仓库新建</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="73"/> + <source>&New from repository...</source> + <translation type="unfinished">从仓库新建(&N)…</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="78"/> + <source>Create (clone) a new project from a Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="81"/> + <source><b>New from repository</b><p>This creates (clones) a new local project from a Git repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="89"/> + <source>Fetch changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="94"/> + <source>Fetch changes from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="97"/> + <source><b>Fetch changes</b><p>This fetches changes from a remote repository into the local repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="105"/> + <source>Pull changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="110"/> + <source>Pull changes from a remote repository and update the work area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="113"/> + <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository and updates the work area.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="121"/> + <source>Commit changes to repository</source> + <translation type="unfinished">将更改提交到仓库中</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="121"/> + <source>Commit changes to repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="126"/> + <source>Commit changes of the local project to the Git repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="129"/> + <source><b>Commit changes to repository</b><p>This commits changes of the local project to the Git repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="137"/> + <source>Push changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="142"/> + <source>Push changes to a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="145"/> + <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="153"/> + <source>Export from repository</source> + <translation type="unfinished">从仓库导出</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="153"/> + <source>&Export from repository...</source> + <translation type="unfinished">从仓库导出(&E)…</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="158"/> + <source>Export a project from the repository</source> + <translation type="unfinished">从仓库中导出一个项目</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="161"/> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation type="unfinished"><b>从仓库导出</b><p>从仓库导出一个项目。</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="168"/> + <source>Show log browser</source> + <translation type="unfinished">显示日志浏览器</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="173"/> + <source>Show a dialog to browse the log of the local project</source> + <translation type="unfinished">显示对话框以浏览本地项目的日志</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="176"/> + <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="185"/> + <source>Show reflog browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="190"/> + <source>Show a dialog to browse the reflog of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="193"/> + <source><b>Show reflog browser</b><p>This shows a dialog to browse the reflog of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="202"/> + <source>Show differences</source> + <translation type="unfinished">显示差异</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="202"/> + <source>Show &differences...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="207"/> + <source>Show the differences of the local project to the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="210"/> + <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> + <translation type="unfinished"><b>显示差异</b><p>显示本地项目与仓库之间的差异。</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="218"/> + <source>Show differences (extended)</source> + <translation type="unfinished">显示差异(扩展)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="218"/> + <source>Show differences (extended) ...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="223"/> + <source>Show the difference of revisions of the project to the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="226"/> + <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="234"/> + <source>Show status</source> + <translation type="unfinished">显示状态</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="234"/> + <source>Show &status...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="239"/> + <source>Show the status of the local project</source> + <translation type="unfinished">显示本地项目的状态</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="242"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation type="unfinished"><b>显示状态</b><p>显示本地项目的状态。</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="249"/> + <source>Switch</source> + <translation type="unfinished">转换</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="249"/> + <source>S&witch...</source> + <translation type="unfinished">转换(&w)…</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="254"/> + <source>Switch the working directory to another revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="257"/> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="265"/> + <source>Tag in repository</source> + <translation type="unfinished">在仓库中标记</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="265"/> + <source>&Tag in repository...</source> + <translation type="unfinished">在仓库中标记(&T)…</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="270"/> + <source>Perform tag operations for the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="273"/> + <source><b>Tag in repository</b><p>This performs selectable tag operations for the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="281"/> + <source>List tags</source> + <translation type="unfinished">列出标签</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="281"/> + <source>&List tags...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="285"/> + <source>List tags of the project</source> + <translation type="unfinished">列出项目的标签</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="288"/> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation type="unfinished"><b>列出标签</b><p>列出项目的标签。</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="295"/> + <source>Show most recent tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="299"/> + <source>Show the most recent tag reachable from the work tree</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="302"/> + <source><b>Show most recent tag</b><p>This shows the most recent tag reachable from the work tree.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="310"/> + <source>List branches</source> + <translation type="unfinished">列出分支</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="310"/> + <source>&List branches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="314"/> + <source>List branches of the project</source> + <translation type="unfinished">列出项目的分支</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="317"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation type="unfinished"><b>列出分支</b><p>列出项目的分支。</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="324"/> + <source>List merged branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="324"/> + <source>List &merged branches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="328"/> + <source>List merged branches of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="331"/> + <source><b>List merged branches</b><p>This lists the merged branches of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="339"/> + <source>List non-merged branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="339"/> + <source>List &non-merged branches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="343"/> + <source>List non-merged branches of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="346"/> + <source><b>List non-merged branches</b><p>This lists the non-merged branches of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="354"/> + <source>Branch in repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="354"/> + <source>&Branch in repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="359"/> + <source>Perform branch operations for the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="362"/> + <source><b>Branch in repository</b><p>This performs selectable branch operations for the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="370"/> + <source>Delete Remote Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="370"/> + <source>&Delete Remote Branch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="374"/> + <source>Delete a branch from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="377"/> + <source><b>Delete Remote Branch</b><p>This deletes a branch from a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="384"/> + <source>Show current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="388"/> + <source>Show the current branch of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="391"/> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="398"/> + <source>Revert changes</source> + <translation type="unfinished">还原改变</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="398"/> + <source>Re&vert changes</source> + <translation type="unfinished">还原改变(&v)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="403"/> + <source>Revert all changes made to the local project</source> + <translation type="unfinished">还原所有改变到本地项目中</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="406"/> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> + <translation type="unfinished"><b>还原改变</b><p>还原所有改变到本地项目中。</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="413"/> + <source>Unstage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="413"/> + <source>&Unstage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="418"/> + <source>Unstage all changes made to the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="421"/> + <source><b>Unstage changes</b><p>This unstages all changes made to the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="428"/> + <source>Merge</source> + <translation type="unfinished">合并</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="428"/> + <source>Mer&ge changes...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="433"/> + <source>Merge changes into the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="436"/> + <source><b>Merge</b><p>This merges changes into the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="443"/> + <source>Cancel uncommitted/failed merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="447"/> + <source>Cancel an uncommitted or failed merge and lose all changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="450"/> + <source><b>Cancel uncommitted/failed merge</b><p>This cancels an uncommitted or failed merge causing all changes to be lost.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="458"/> + <source>Commit failed merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="462"/> + <source>Commit a failed merge after conflicts have been resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="465"/> + <source><b>Commit failed merge</b><p>This commits a failed merge after conflicts have been resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="473"/> + <source>Cleanup</source> + <translation type="unfinished">清除</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="473"/> + <source>Cleanu&p</source> + <translation type="unfinished">清除(&P)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="477"/> + <source>Cleanup the local project</source> + <translation type="unfinished">清除本地项目</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="480"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation type="unfinished"><b>清除</b><p>执行对本地项目的清除。</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="487"/> + <source>Execute command</source> + <translation type="unfinished">执行命令</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="487"/> + <source>E&xecute command...</source> + <translation type="unfinished">执行命令(&X)…</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="491"/> + <source>Execute an arbitrary Git command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="494"/> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Git command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="502"/> + <source>Configure</source> + <translation type="unfinished">配置</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="502"/> + <source>Configure...</source> + <translation type="unfinished">配置…</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="506"/> + <source>Show the configuration dialog with the Git page selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="509"/> + <source><b>Configure</b><p>Show the configuration dialog with the Git page selected.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="517"/> + <source>Show Remotes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="517"/> + <source>Show Remotes...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="521"/> + <source>Show the available remote repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="539"/> + <source><b>Show Remotes</b><p>This shows the remote repositories available for pulling, fetching and pushing.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1765"/> + <source>Show Remote Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="532"/> + <source>Show Remote Info...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="536"/> + <source>Show information about a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1161"/> + <source>Add</source> + <translation type="unfinished">添加</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="547"/> + <source>Add...</source> + <translation type="unfinished">添加…</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="551"/> + <source>Add a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="554"/> + <source><b>Add</b><p>This adds a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1785"/> + <source>Remove</source> + <translation type="unfinished">移除</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="561"/> + <source>Remove...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="565"/> + <source>Remove a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="568"/> + <source><b>Remove</b><p>This removes a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1799"/> + <source>Prune</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="575"/> + <source>Prune...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="579"/> + <source>Prune stale remote-tracking branches of a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="582"/> + <source><b>Prune</b><p>This prunes stale remote-tracking branches of a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <source>Rename</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="590"/> + <source>Rename...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="594"/> + <source>Rename a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="597"/> + <source><b>Rename</b><p>This renames a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1833"/> + <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> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="649"/> + <source>Cancel 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> + <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> + <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> + <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> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> + <source>Show stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> + <source>Show stash...</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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="702"/> + <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"/> + <source>Restore && Keep</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="714"/> + <source>Restore a stash but keep it</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="717"/> + <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"/> + <source>Restore && Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="728"/> + <source>Restore a stash and delete it</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="731"/> + <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"/> + <source>Create Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="742"/> + <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"/> + <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"/> + <source>Delete</source> + <translation type="unfinished">删除</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="757"/> + <source>Delete a stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="760"/> + <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"/> + <source>Delete All</source> + <translation type="unfinished">全部删除</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="771"/> + <source>Delete all stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="774"/> + <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"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="785"/> + <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"/> + <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"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="799"/> + <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> + <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> + <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> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="862"/> + <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"/> + <source>Repository Statistics</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <source>Repository Statistics...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="873"/> + <source>Show some statistics of the local repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="876"/> + <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"/> + <source>Create Archive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="887"/> + <source>Create an archive from the local repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="890"/> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> + <source>List bundle heads...</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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="934"/> + <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"/> + <source>Apply Bundle (fetch)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <source>Apply Bundle (fetch)...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="945"/> + <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"/> + <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"/> + <source>Apply Bundle (pull)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="955"/> + <source>Apply Bundle (pull)...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="959"/> + <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"/> + <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> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1003"/> + <source>Mark a selectable revision as good</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> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1017"/> + <source>Mark a selectable revision as bad</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1020"/> + <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"/> + <source>Skip</source> + <translation type="unfinished">跳过</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <source>Skip...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1031"/> + <source>Skip a selectable revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1034"/> + <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"/> + <source>Reset</source> + <translation type="unfinished">重置</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <source>Reset...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1045"/> + <source>Reset the bisect session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1048"/> + <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"/> + <source>Show bisect log browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1060"/> + <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"/> + <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"/> + <source>Create replay file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1076"/> + <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"/> + <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"/> + <source>Edit replay file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1092"/> + <source>Edit a bisect replay file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1095"/> + <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"/> + <source>Replay session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1107"/> + <source>Replay a bisect session from file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1110"/> + <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"/> + <source>Check patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1121"/> + <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"/> + <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"/> + <source>Apply patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1136"/> + <source>Apply a list of patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1139"/> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1180"/> + <source>List the submodule of the current project</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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1195"/> + <source>Initialize the submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1198"/> + <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> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1244"/> + <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"/> + <source>Fetch and Update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1257"/> + <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>Synchronize URLs of submodules of the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1293"/> + <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"/> + <source>Show Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1306"/> + <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"/> + <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"/> + <source>Show Summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1322"/> + <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"/> + <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"/> + <source>Administration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1360"/> + <source>Bundle Management</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="2237"/> + <source>Bisect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1397"/> + <source>Tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1405"/> + <source>Branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1418"/> + <source>Manage Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1426"/> + <source>Remote Repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1436"/> + <source>Cherry-pick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1444"/> + <source>Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1459"/> + <source>Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1541"/> + <source>Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1646"/> + <source>Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <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"/> + <source>Pull</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1715"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1734"/> + <source>Unstage Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <source>Select a remote repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1853"/> + <source>Copy Commits (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1872"/> + <source>Copy Commits (Quit)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1892"/> + <source>Copy Commits (Cancel)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1911"/> + <source>Save Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1961"/> + <source>Restore Stash</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitPullDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="14"/> + <source>Git Pull</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="23"/> + <source>Remote Repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="30"/> + <source>Select the remote repository to pull from</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="46"/> + <source>Remote Branches:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="56"/> + <source>Press to update the list of remote branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="59"/> + <source>Update</source> + <translation type="unfinished">更新</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="81"/> + <source>Select the remote branches to be pulled</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="94"/> + <source>Select to remove non-existing tracking references </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.ui" line="97"/> + <source>Prune obsolete tracking references</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.py" line="36"/> + <source><All></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPullDialog.py" line="37"/> + <source><Custom></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitPushDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="14"/> + <source>Git Push</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="25"/> + <source>Remote Repository:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="32"/> + <source>Select the remote repository to push to</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="48"/> + <source>Branches to be pushed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="70"/> + <source>Push?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="75"/> + <source>Local</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="80"/> + <source>Remote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="85"/> + <source>Force?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="93"/> + <source>Press to select all branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="96"/> + <source>Select All</source> + <translation type="unfinished">全选</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="106"/> + <source><b>WARNING: The "Force" option can result in dangling branches in the remote repository.</b></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="119"/> + <source>Select to push tags as well</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="122"/> + <source>Include tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="129"/> + <source>Select this to associate a remote tracking branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="132"/> + <source>Set tracking information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="139"/> + <source>Push Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="145"/> + <source>Select to push submodules automatically</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="148"/> + <source>on-demand</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="158"/> + <source>Select to check, if submodules were pushed already</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="161"/> + <source>check</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="168"/> + <source>Select to push submodules only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="171"/> + <source>only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="178"/> + <source>Select to not push any submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPushDialog.ui" line="181"/> + <source>no</source> + <translation type="unfinished">否</translation> + </message> +</context> +<context> + <name>GitReflogBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="14"/> + <source>Git Reflog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="42"/> + <source>Commit</source> + <translation type="unfinished">提交</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="47"/> + <source>Selector</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="52"/> + <source>Name</source> + <translation type="unfinished">名称</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="57"/> + <source>Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="62"/> + <source>Subject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="72"/> + <source>Press to get the next bunch of log entries</source> + <translation type="unfinished">点击获得日志条目的下一个分支</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="75"/> + <source>&Next</source> + <translation type="unfinished">下一个(&N)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="82"/> + <source>Enter the limit of entries to fetch</source> + <translation type="unfinished">输入要提取条目的限制</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="122"/> + <source>Errors</source> + <translation type="unfinished">错误</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="128"/> + <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/GitReflogBrowserDialog.ui" line="144"/> + <source>Input</source> + <translation type="unfinished">输入</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="166"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="169"/> + <source>&Send</source> + <translation type="unfinished">发送(&S)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="172"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="179"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="186"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished">选择将输入区域转换成密码模式</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="189"/> + <source>&Password Mode</source> + <translation type="unfinished">密码模式(&P)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui" line="192"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="59"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="61"/> + <source>Press to refresh the list of commits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="200"/> + <source>Process Generation Error</source> + <translation type="unfinished">进程生成错误</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="200"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + </message> +</context> +<context> + <name>GitRemoteRepositoriesDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="14"/> + <source>Git Remote Repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="17"/> + <source><b>Git Remote Repositories</b> +<p>This dialog shows the available remote repositories.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="30"/> + <source>Remote Repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="46"/> + <source>Name</source> + <translation type="unfinished">名称</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="51"/> + <source>URL</source> + <translation type="unfinished">URL</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="56"/> + <source>Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="82"/> + <source>Press to add a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="85"/> + <source>&Add</source> + <translation type="unfinished">添加(&A)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="92"/> + <source>Press to rename the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="95"/> + <source>&Rename</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="102"/> + <source>Press to remove 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"/> + <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"/> + <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>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="217"/> + <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"/> + <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"/> + <source>&Password Mode</source> + <translation type="unfinished">密码模式(&P)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="230"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="51"/> + <source>Refresh</source> + <translation type="unfinished">刷新</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="53"/> + <source>Press to refresh the repositories display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="148"/> + <source>Process Generation Error</source> + <translation type="unfinished">进程生成错误</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="148"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + </message> +</context> +<context> + <name>GitRevisionSelectionDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="14"/> + <source>Git Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="29"/> + <source>Select to specify a revision by a revision expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="32"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="42"/> + <source>Enter a commit id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="49"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="52"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="68"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="78"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="81"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="97"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="107"/> + <source>Select to specify a revision by a remote branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="110"/> + <source>Remote Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="126"/> + <source>Enter a remote branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="136"/> + <source>Select HEAD revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="139"/> + <source>HEAD</source> + <translation type="unfinished">头部</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui" line="146"/> + <source>No revision selected</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitRevisionsSelectionDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="14"/> + <source>Git Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="23"/> + <source>Revision &1</source> + <translation type="unfinished">修订 &1</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="137"/> + <source>Select to specify a revision by a revision expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="140"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="150"/> + <source>Enter a commit id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="157"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="160"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="170"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="180"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="183"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="193"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="203"/> + <source>Select HEAD revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="206"/> + <source>HEAD</source> + <translation type="unfinished">头部</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="216"/> + <source>Select revision before HEAD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="219"/> + <source>HEAD^</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="226"/> + <source>No revision selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui" line="131"/> + <source>Revision &2</source> + <translation type="unfinished">修订 &2</translation> + </message> +</context> +<context> + <name>GitStashBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="14"/> + <source>Git Stash Browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="42"/> + <source>Name</source> + <translation type="unfinished">名称</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="47"/> + <source>Date</source> + <translation type="unfinished">数据</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="52"/> + <source>Message</source> + <translation type="unfinished">消息</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="66"/> + <source>Statistics</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="91"/> + <source>File</source> + <translation type="unfinished">文件</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="96"/> + <source>Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="101"/> + <source>Lines added</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="106"/> + <source>Lines deleted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="153"/> + <source>Errors</source> + <translation type="unfinished">错误</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="159"/> + <source><b>Git stash errors</b><p>This shows possible error messages of the git stash command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="175"/> + <source>Input</source> + <translation type="unfinished">输入</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="197"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="200"/> + <source>&Send</source> + <translation type="unfinished">发送(&S)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="203"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="210"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="217"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished">选择将输入区域转换成密码模式</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="220"/> + <source>&Password Mode</source> + <translation type="unfinished">密码模式(&P)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui" line="223"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="65"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="67"/> + <source>Press to refresh the list of stashes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="82"/> + <source>Show</source> + <translation type="unfinished">显示</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="85"/> + <source>Restore && Keep</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="87"/> + <source>Restore && Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="90"/> + <source>Create Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="93"/> + <source>Delete</source> + <translation type="unfinished">删除</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="95"/> + <source>Delete All</source> + <translation type="unfinished">全部删除</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="182"/> + <source>Process Generation Error</source> + <translation type="unfinished">进程生成错误</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="182"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + </message> + <message numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="369"/> + <source>%n file(s) changed</source> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="371"/> + <source>%n line(s) inserted</source> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="373"/> + <source>%n line(s) deleted</source> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> + </message> +</context> +<context> + <name>GitStashDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="14"/> + <source>Git Stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="23"/> + <source>Message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="33"/> + <source>Enter a message for the stash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="40"/> + <source>Keep changes in staging area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="47"/> + <source>Untracked/Ignored Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="53"/> + <source>Select to not stash untracked or ignored files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="56"/> + <source>Don't stash untracked or ignored files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="66"/> + <source>Select to stash untracked files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="69"/> + <source>Stash untracked files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="76"/> + <source>Select to stash untracked and ignored files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui" line="79"/> + <source>Stash untracked and ignored files</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitStatusDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="395"/> + <source>Git Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="17"/> + <source><b>Git Status</b> +<p>This dialog shows the status of the selected file or project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="26"/> + <source>Select action from menu</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="49"/> + <source>&Filter on Status:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="59"/> + <source>Select the status of entries to be shown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="662"/> + <source>Commit</source> + <translation type="unfinished">提交</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="105"/> + <source>Status (Work)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="110"/> + <source>Status (Staging)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="115"/> + <source>Path</source> + <translation type="unfinished">路径</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="155"/> + <source>Difference Working to Staging</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="209"/> + <source>Difference Staging to HEAD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="252"/> + <source>Errors</source> + <translation type="unfinished">错误</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="271"/> + <source>Input</source> + <translation type="unfinished">输入</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="293"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="296"/> + <source>&Send</source> + <translation type="unfinished">发送(&S)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="299"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="306"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="313"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished">选择将输入区域转换成密码模式</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="316"/> + <source>&Password Mode</source> + <translation type="unfinished">密码模式(&P)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="319"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="65"/> + <source>Refresh</source> + <translation type="unfinished">刷新</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="67"/> + <source>Press to refresh the status display</source> + <translation type="unfinished">点击刷新状态显示</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="105"/> + <source>Stage Selected Lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="109"/> + <source>Revert Selected Lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="113"/> + <source>Stage Hunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="117"/> + <source>Revert Hunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="123"/> + <source>Unstage Selected Lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="127"/> + <source>Unstage Hunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="169"/> + <source>added</source> + <translation type="unfinished">已添加</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="170"/> + <source>copied</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="171"/> + <source>deleted</source> + <translation type="unfinished">已删除</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="172"/> + <source>modified</source> + <translation type="unfinished">已修改</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="173"/> + <source>renamed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="175"/> + <source>not tracked</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="174"/> + <source>unmerged</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="168"/> + <source>unmodified</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="176"/> + <source>ignored</source> + <translation type="unfinished">已忽略</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="197"/> + <source>Commit the selected changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="198"/> + <source>Amend</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="200"/> + <source>Amend the latest commit with the selected changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="202"/> + <source>Select all for commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="204"/> + <source>Unselect all from commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="703"/> + <source>Add</source> + <translation type="unfinished">添加</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="210"/> + <source>Add the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="211"/> + <source>Stage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="213"/> + <source>Stages all changes of the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="215"/> + <source>Unstage changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="217"/> + <source>Unstages all changes of the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="839"/> + <source>Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="224"/> + <source>Shows the differences of the selected entry in a separate dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="227"/> + <source>Differences Side-By-Side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="229"/> + <source>Shows the differences of the selected entry side-by-side in a separate dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="786"/> + <source>Revert</source> + <translation type="unfinished">还原</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="237"/> + <source>Reverts the changes of the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="242"/> + <source>Forget missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="244"/> + <source>Forgets about the selected missing files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="246"/> + <source>Restore missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="248"/> + <source>Restores the selected missing files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="253"/> + <source>Edit file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="255"/> + <source>Edit the selected conflicting file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="260"/> + <source>Adjust column sizes</source> + <translation type="unfinished">调整列宽</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="262"/> + <source>Adjusts the width of all columns to their contents</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="423"/> + <source>Process Generation Error</source> + <translation type="unfinished">进程生成错误</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="423"/> + <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/GitStatusDialog.py" line="596"/> + <source>all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="662"/> + <source>There are no entries selected to be committed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="703"/> + <source>There are no unversioned entries available/selected.</source> + <translation type="unfinished">没有未版本化的条目可用或被选择。</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="725"/> + <source>Stage</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="725"/> + <source>There are no stageable entries available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="747"/> + <source>Unstage</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="747"/> + <source>There are no unstageable entries available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="769"/> + <source>Forget Missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="810"/> + <source>There are no missing entries available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="786"/> + <source>There are no uncommitted, unstaged changes available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="810"/> + <source>Restore Missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="839"/> + <source>There are no uncommitted changes available/selected.</source> + <translation type="unfinished">没有未提交的更改可用或被选择。</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="891"/> + <source>Working Tree to Staging Area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="870"/> + <source>Staging Area to HEAD Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="892"/> + <source>Working Tree to HEAD Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="894"/> + <source>Side-by-Side Difference</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="894"/> + <source>Select the compare method.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1201"/> + <source>Revert selected lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1203"/> + <source>Revert hunk</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1204"/> + <source>Are you sure you want to revert the selected changes?</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitStatusMonitorThread</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py" line="93"/> + <source>Could not start the Git process.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py" line="133"/> + <source>Git status checked successfully</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmoduleAddDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="14"/> + <source>Add Submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="23"/> + <source>&URL:</source> + <translation type="unfinished">&URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="39"/> + <source>Enter the URL of the repository</source> + <translation type="unfinished">输入仓库的 URL</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="55"/> + <source>Select the repository URL via a directory selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="62"/> + <source>Press to clear the history of entered repository URLs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="69"/> + <source>Submodule &Directory:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="79"/> + <source>Enter the directory for the submodule (leave empty to use default).</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="89"/> + <source>&Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="99"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="106"/> + <source>&Logical Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="116"/> + <source>Enter a logical name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="123"/> + <source>Select to enforce the operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui" line="126"/> + <source>&Force Operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="92"/> + <source>Select Submodule Repository Directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="118"/> + <source>Select Submodule Directory</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesDeinitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="14"/> + <source>Unregister Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="23"/> + <source>Select to unregister all submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="26"/> + <source>Unregister All Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="33"/> + <source>Selected Submodules:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="40"/> + <source>Select the submodules to be unregistered</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="53"/> + <source>Select to enforce unregistering</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui" line="56"/> + <source>Enforce Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="14"/> + <source>Defined Submodules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="39"/> + <source>Name</source> + <translation type="unfinished">名称</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="44"/> + <source>Path</source> + <translation type="unfinished">路径</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="49"/> + <source>URL</source> + <translation type="unfinished">URL</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui" line="54"/> + <source>Branch</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesStatusDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="14"/> + <source>Submodules Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="33"/> + <source>Submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="38"/> + <source>Status</source> + <translation type="unfinished">状态</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="43"/> + <source>Commit ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="48"/> + <source>Info</source> + <translation type="unfinished">信息</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="58"/> + <source>Select to show the status for the index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="61"/> + <source>Show Status for Index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="68"/> + <source>Perform a recursive operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="71"/> + <source>Recursive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui" line="99"/> + <source>Errors</source> + <translation type="unfinished">错误</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="46"/> + <source>up-to-date</source> + <translation type="unfinished">最新</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="47"/> + <source>not initialized</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="48"/> + <source>different to index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="49"/> + <source>merge conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="55"/> + <source>Refresh</source> + <translation type="unfinished">刷新</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="57"/> + <source>Press to refresh the status display</source> + <translation type="unfinished">点击刷新状态显示</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="105"/> + <source>The process {0} did not finish within 30 seconds.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="109"/> + <source>The process {0} finished with an error. +Error: {1}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="115"/> + <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/GitSubmodulesStatusDialog.py" line="134"/> + <source>unknown</source> + <translation type="unfinished">未知</translation> + </message> +</context> +<context> + <name>GitSubmodulesSummaryOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="14"/> + <source>Submodule Summary Options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="23"/> + <source>Selected Submodules:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="30"/> + <source>Select the submodules to show the summary for</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="43"/> + <source>Select to show summary information for the index of the superproject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="46"/> + <source>Show Summary for Superproject Index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="53"/> + <source>Select to show summary information for the index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="56"/> + <source>Show Summary for Index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="63"/> + <source>Commit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="70"/> + <source>Enter a commit ID to show summary information for</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="73"/> + <source>Enter Commit ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="80"/> + <source>Limit:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="87"/> + <source>Enter the maximum number of entries to be shown per submodule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui" line="93"/> + <source>No Limit</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesSyncDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="14"/> + <source>Synchronize Submodule URLs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="23"/> + <source>Selected Submodules:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="30"/> + <source>Select the submodules to be synchronized</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="43"/> + <source>Select to perform a recursive synchronization</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui" line="46"/> + <source>Recursive Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitSubmodulesUpdateOptionsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="14"/> + <source>Submodule Update Options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="23"/> + <source>Update Procedure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="29"/> + <source>Select to perform a 'checkout' procedure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="32"/> + <source>checkout</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="42"/> + <source>Select to perform a 'rebase' procedure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="45"/> + <source>rebase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="52"/> + <source>Select to perform a 'merge' procedure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="55"/> + <source>merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="65"/> + <source>Select to initialize submodules before the update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="68"/> + <source>Initialize before Update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="75"/> + <source>Fetch remote changes before updating</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="78"/> + <source>Synchronize with remote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="88"/> + <source>Select to not fetch the remote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="91"/> + <source>Don't Fetch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="98"/> + <source>Selected Submodules:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="105"/> + <source>Select the submodules to be updated</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="118"/> + <source>Select to enforce the update</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui" line="121"/> + <source>Enforce Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitTagBranchListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="14"/> + <source>Git Tag List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="17"/> + <source><b>Git Tag/Branch List</b> +<p>This dialog shows a list of the projects tags or branches.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="33"/> + <source><b>Tag/Branches List</b> +<p>This shows a list of the projects tags or branches.</p></source> + <translation type="unfinished"><b>标签/分支列表</b> +<p>显示一列项目标签或分支。</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="99"/> + <source>Commit</source> + <translation type="unfinished">提交</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="99"/> + <source>Name</source> + <translation type="unfinished">名称</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="69"/> + <source>Errors</source> + <translation type="unfinished">错误</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="88"/> + <source>Input</source> + <translation type="unfinished">输入</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="110"/> + <source>Press to send the input to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="113"/> + <source>&Send</source> + <translation type="unfinished">发送(&S)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="116"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="123"/> + <source>Enter data to be sent to the git process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="130"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished">选择将输入区域转换成密码模式</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="133"/> + <source>&Password Mode</source> + <translation type="unfinished">密码模式(&P)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="136"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="94"/> + <source>Annotation Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="98"/> + <source>Git Branches List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="135"/> + <source>Process Generation Error</source> + <translation type="unfinished">进程生成错误</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="135"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + </message> +</context> +<context> + <name>GitTagDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="14"/> + <source>Git Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished">名称:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="36"/> + <source>Enter the name of the tag</source> + <translation type="unfinished">输入标签的名称</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="39"/> + <source><b>Tag Name</b> +<p>Enter the name of the tag to be created, deleted or verified.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="53"/> + <source>Revision:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="60"/> + <source>Enter a revision to set a tag for</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="67"/> + <source>Tag Action</source> + <translation type="unfinished">标记动作</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="73"/> + <source>Select to create a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="76"/> + <source><b>Create Tag</b> +<p>Select this entry in order to create a tag.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="80"/> + <source>Create Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="90"/> + <source>Select to delete a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="93"/> + <source><b>Delete Tag</b> +<p>Select this entry in order to delete the selected tag.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="97"/> + <source>Delete Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="104"/> + <source>Select to verify a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="107"/> + <source><b>Verify Tag</b> +<p>Select this entry in order to verify the selected tag.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="111"/> + <source>Verify Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="121"/> + <source>Tag Type</source> + <translation type="unfinished">标签类型</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="127"/> + <source>Select to create/delete/verify a global tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="130"/> + <source>Global Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="140"/> + <source>Select to create/delete/verify a signed tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="143"/> + <source>Signed Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="150"/> + <source>Select to create/delete/verify a local tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="153"/> + <source>Local Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="163"/> + <source>Select to enforce the create operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagDialog.ui" line="166"/> + <source>Enforce Operation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>GitUserConfigDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="14"/> + <source>Git User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="23"/> + <source>User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="29"/> + <source>First Name:</source> + <translation type="unfinished">名:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="36"/> + <source>Enter the first name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="43"/> + <source>Last Name:</source> + <translation type="unfinished">姓:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="50"/> + <source>Enter the last name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="57"/> + <source>Email:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui" line="64"/> + <source>Enter the email address</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GlosbeEngine</name> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/GlosbeEngine.py" line="88"/> @@ -70585,6 +77155,19 @@ </message> </context> <context> + <name>VcsGitPlugin</name> + <message> + <location filename="../Plugins/PluginVcsGit.py" line="60"/> + <source>Version Control - Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/PluginVcsGit.py" line="135"/> + <source>Git</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>VcsMercurialPlugin</name> <message> <location filename="../Plugins/PluginVcsMercurial.py" line="60"/>