Mercurial Repositories > eric / changeset
changeset
Added capability to select from existing change lists and added a dialog to browse the change lists.
Sun, 03 Jun 2012 12:51:15 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 03 Jun 2012 12:51:15 +0200
- changeset 1888
- 03f59d88a62d
- parent 1886
- 732f94385668
- child 1889
- 6de0f43f6678
Added capability to select from existing change lists and added a dialog to browse the change lists.
--- a/APIs/Python3/eric5.api Sat Jun 02 17:41:24 2012 +0200 +++ b/APIs/Python3/eric5.api Sun Jun 03 12:51:15 2012 +0200 @@ -4157,6 +4157,10 @@ eric5.Plugins.VcsPlugins.vcsPySvn.SvnBlameDialog.SvnBlameDialog.on_buttonBox_clicked?4(button) eric5.Plugins.VcsPlugins.vcsPySvn.SvnBlameDialog.SvnBlameDialog.start?4(fn) eric5.Plugins.VcsPlugins.vcsPySvn.SvnBlameDialog.SvnBlameDialog?1(vcs, parent=None) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnChangeListsDialog.SvnChangeListsDialog.on_buttonBox_clicked?4(button) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnChangeListsDialog.SvnChangeListsDialog.on_changeLists_currentItemChanged?4(current, previous) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnChangeListsDialog.SvnChangeListsDialog.start?4(path) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnChangeListsDialog.SvnChangeListsDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommandDialog.SvnCommandDialog.getData?4() eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommandDialog.SvnCommandDialog.on_commandCombo_editTextChanged?4(text) eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommandDialog.SvnCommandDialog.on_dirButton_clicked?4() @@ -4171,7 +4175,7 @@ eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommitDialog.SvnCommitDialog.on_recentComboBox_activated?4(txt) eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommitDialog.SvnCommitDialog.rejected?7 eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommitDialog.SvnCommitDialog.showEvent?4(evt) -eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommitDialog.SvnCommitDialog?1(parent=None) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommitDialog.SvnCommitDialog?1(changelists, parent=None) eric5.Plugins.VcsPlugins.vcsPySvn.SvnConst.svnNotifyActionMap?7 eric5.Plugins.VcsPlugins.vcsPySvn.SvnConst.svnStatusMap?7 eric5.Plugins.VcsPlugins.vcsPySvn.SvnCopyDialog.SvnCopyDialog.getData?4() @@ -4296,6 +4300,7 @@ eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnCopy?4(name, project) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnDelProp?4(name, recursive=False) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnExtendedDiff?4(name) +eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnGetChangelists?4() eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnGetReposName?4(path) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnInfo?4(projectPath, name) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnListProps?4(name, recursive=False) @@ -4308,6 +4313,7 @@ eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnRepoBrowser?4(projectPath=None) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnResolve?4(name) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnSetProp?4(name, recursive=False) +eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnShowChangelists?4(path) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnUnlock?4(name, breakIt=False, parent=None) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnUrlDiff?4(name) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsAdd?4(name, isDir=False, noDialog=False) @@ -4372,6 +4378,14 @@ eric5.Plugins.VcsPlugins.vcsSubversion.SvnBlameDialog.SvnBlameDialog.on_sendButton_clicked?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnBlameDialog.SvnBlameDialog.start?4(fn) eric5.Plugins.VcsPlugins.vcsSubversion.SvnBlameDialog.SvnBlameDialog?1(vcs, parent=None) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnChangeListsDialog.SvnChangeListsDialog.keyPressEvent?4(evt) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnChangeListsDialog.SvnChangeListsDialog.on_buttonBox_clicked?4(button) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnChangeListsDialog.SvnChangeListsDialog.on_changeLists_currentItemChanged?4(current, previous) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnChangeListsDialog.SvnChangeListsDialog.on_input_returnPressed?4() +eric5.Plugins.VcsPlugins.vcsSubversion.SvnChangeListsDialog.SvnChangeListsDialog.on_passwordCheckBox_toggled?4(isOn) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnChangeListsDialog.SvnChangeListsDialog.on_sendButton_clicked?4() +eric5.Plugins.VcsPlugins.vcsSubversion.SvnChangeListsDialog.SvnChangeListsDialog.start?4(path) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnChangeListsDialog.SvnChangeListsDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsSubversion.SvnCommandDialog.SvnCommandDialog.getData?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnCommandDialog.SvnCommandDialog.on_commandCombo_editTextChanged?4(text) eric5.Plugins.VcsPlugins.vcsSubversion.SvnCommandDialog.SvnCommandDialog.on_dirButton_clicked?4() @@ -4523,6 +4537,7 @@ eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnCopy?4(name, project) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnDelProp?4(name, recursive=False) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnExtendedDiff?4(name) +eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnGetChangelists?4() eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnGetReposName?4(path) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnListProps?4(name, recursive=False) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnListTagBranch?4(path, tags=True) @@ -4534,6 +4549,7 @@ eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnRepoBrowser?4(projectPath=None) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnResolve?4(name) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnSetProp?4(name, recursive=False) +eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnShowChangelists?4(path) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnUnlock?4(name, breakIt=False, parent=None) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnUrlDiff?4(name) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsAdd?4(name, isDir=False, noDialog=False)
--- a/APIs/Python3/eric5.bas Sat Jun 02 17:41:24 2012 +0200 +++ b/APIs/Python3/eric5.bas Sun Jun 03 12:51:15 2012 +0200 @@ -556,6 +556,7 @@ SubversionPage ConfigurationPageBase Ui_SubversionPage SvgDiagram QMainWindow SvnBlameDialog QDialog Ui_SvnBlameDialog +SvnChangeListsDialog QDialog Ui_SvnChangeListsDialog SvnCommandDialog QDialog Ui_SvnCommandDialog SvnCommitDialog QWidget Ui_SvnCommitDialog SvnCopyDialog QDialog Ui_SvnCopyDialog
--- a/Documentation/Help/source.qhp Sat Jun 02 17:41:24 2012 +0200 +++ b/Documentation/Help/source.qhp Sun Jun 03 12:51:15 2012 +0200 @@ -520,6 +520,7 @@ <section title="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.html" /> <section title="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html" /> <section title="eric5.Plugins.VcsPlugins.vcsPySvn.SvnBlameDialog" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnBlameDialog.html" /> + <section title="eric5.Plugins.VcsPlugins.vcsPySvn.SvnChangeListsDialog" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnChangeListsDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommandDialog" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommandDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommitDialog" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommitDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsPySvn.SvnConst" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnConst.html" /> @@ -557,6 +558,7 @@ <section title="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.html" /> <section title="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html" /> <section title="eric5.Plugins.VcsPlugins.vcsSubversion.SvnBlameDialog" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnBlameDialog.html" /> + <section title="eric5.Plugins.VcsPlugins.vcsSubversion.SvnChangeListsDialog" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnChangeListsDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsSubversion.SvnCommandDialog" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnCommandDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsSubversion.SvnCommitDialog" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnCommitDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsSubversion.SvnCopyDialog" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnCopyDialog.html" /> @@ -8883,6 +8885,8 @@ <keyword name="Subversion.svnDelProp" id="Subversion.svnDelProp" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.svnDelProp" /> <keyword name="Subversion.svnExtendedDiff" id="Subversion.svnExtendedDiff" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.svnExtendedDiff" /> <keyword name="Subversion.svnExtendedDiff" id="Subversion.svnExtendedDiff" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.svnExtendedDiff" /> + <keyword name="Subversion.svnGetChangelists" id="Subversion.svnGetChangelists" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.svnGetChangelists" /> + <keyword name="Subversion.svnGetChangelists" id="Subversion.svnGetChangelists" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.svnGetChangelists" /> <keyword name="Subversion.svnGetReposName" id="Subversion.svnGetReposName" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.svnGetReposName" /> <keyword name="Subversion.svnGetReposName" id="Subversion.svnGetReposName" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.svnGetReposName" /> <keyword name="Subversion.svnInfo" id="Subversion.svnInfo" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.svnInfo" /> @@ -8906,6 +8910,8 @@ <keyword name="Subversion.svnResolve" id="Subversion.svnResolve" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.svnResolve" /> <keyword name="Subversion.svnSetProp" id="Subversion.svnSetProp" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.svnSetProp" /> <keyword name="Subversion.svnSetProp" id="Subversion.svnSetProp" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.svnSetProp" /> + <keyword name="Subversion.svnShowChangelists" id="Subversion.svnShowChangelists" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.svnShowChangelists" /> + <keyword name="Subversion.svnShowChangelists" id="Subversion.svnShowChangelists" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.svnShowChangelists" /> <keyword name="Subversion.svnUnlock" id="Subversion.svnUnlock" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.svnUnlock" /> <keyword name="Subversion.svnUnlock" id="Subversion.svnUnlock" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.svnUnlock" /> <keyword name="Subversion.svnUrlDiff" id="Subversion.svnUrlDiff" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.svnUrlDiff" /> @@ -9031,6 +9037,27 @@ <keyword name="SvnBlameDialog.on_sendButton_clicked" id="SvnBlameDialog.on_sendButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnBlameDialog.html#SvnBlameDialog.on_sendButton_clicked" /> <keyword name="SvnBlameDialog.start" id="SvnBlameDialog.start" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnBlameDialog.html#SvnBlameDialog.start" /> <keyword name="SvnBlameDialog.start" id="SvnBlameDialog.start" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnBlameDialog.html#SvnBlameDialog.start" /> + <keyword name="SvnChangeListsDialog" id="SvnChangeListsDialog" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnChangeListsDialog.html#SvnChangeListsDialog" /> + <keyword name="SvnChangeListsDialog" id="SvnChangeListsDialog" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnChangeListsDialog.html#SvnChangeListsDialog" /> + <keyword name="SvnChangeListsDialog (Constructor)" id="SvnChangeListsDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnChangeListsDialog.html#SvnChangeListsDialog.__init__" /> + <keyword name="SvnChangeListsDialog (Constructor)" id="SvnChangeListsDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnChangeListsDialog.html#SvnChangeListsDialog.__init__" /> + <keyword name="SvnChangeListsDialog (Module)" id="SvnChangeListsDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnChangeListsDialog.html" /> + <keyword name="SvnChangeListsDialog (Module)" id="SvnChangeListsDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnChangeListsDialog.html" /> + <keyword name="SvnChangeListsDialog.__finish" id="SvnChangeListsDialog.__finish" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnChangeListsDialog.html#SvnChangeListsDialog.__finish" /> + <keyword name="SvnChangeListsDialog.__finish" id="SvnChangeListsDialog.__finish" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnChangeListsDialog.html#SvnChangeListsDialog.__finish" /> + <keyword name="SvnChangeListsDialog.__procFinished" id="SvnChangeListsDialog.__procFinished" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnChangeListsDialog.html#SvnChangeListsDialog.__procFinished" /> + <keyword name="SvnChangeListsDialog.__readStderr" id="SvnChangeListsDialog.__readStderr" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnChangeListsDialog.html#SvnChangeListsDialog.__readStderr" /> + <keyword name="SvnChangeListsDialog.__readStdout" id="SvnChangeListsDialog.__readStdout" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnChangeListsDialog.html#SvnChangeListsDialog.__readStdout" /> + <keyword name="SvnChangeListsDialog.keyPressEvent" id="SvnChangeListsDialog.keyPressEvent" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnChangeListsDialog.html#SvnChangeListsDialog.keyPressEvent" /> + <keyword name="SvnChangeListsDialog.on_buttonBox_clicked" id="SvnChangeListsDialog.on_buttonBox_clicked" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnChangeListsDialog.html#SvnChangeListsDialog.on_buttonBox_clicked" /> + <keyword name="SvnChangeListsDialog.on_buttonBox_clicked" id="SvnChangeListsDialog.on_buttonBox_clicked" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnChangeListsDialog.html#SvnChangeListsDialog.on_buttonBox_clicked" /> + <keyword name="SvnChangeListsDialog.on_changeLists_currentItemChanged" id="SvnChangeListsDialog.on_changeLists_currentItemChanged" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnChangeListsDialog.html#SvnChangeListsDialog.on_changeLists_currentItemChanged" /> + <keyword name="SvnChangeListsDialog.on_changeLists_currentItemChanged" id="SvnChangeListsDialog.on_changeLists_currentItemChanged" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnChangeListsDialog.html#SvnChangeListsDialog.on_changeLists_currentItemChanged" /> + <keyword name="SvnChangeListsDialog.on_input_returnPressed" id="SvnChangeListsDialog.on_input_returnPressed" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnChangeListsDialog.html#SvnChangeListsDialog.on_input_returnPressed" /> + <keyword name="SvnChangeListsDialog.on_passwordCheckBox_toggled" id="SvnChangeListsDialog.on_passwordCheckBox_toggled" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnChangeListsDialog.html#SvnChangeListsDialog.on_passwordCheckBox_toggled" /> + <keyword name="SvnChangeListsDialog.on_sendButton_clicked" id="SvnChangeListsDialog.on_sendButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnChangeListsDialog.html#SvnChangeListsDialog.on_sendButton_clicked" /> + <keyword name="SvnChangeListsDialog.start" id="SvnChangeListsDialog.start" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnChangeListsDialog.html#SvnChangeListsDialog.start" /> + <keyword name="SvnChangeListsDialog.start" id="SvnChangeListsDialog.start" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnChangeListsDialog.html#SvnChangeListsDialog.start" /> <keyword name="SvnCommandDialog" id="SvnCommandDialog" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommandDialog.html#SvnCommandDialog" /> <keyword name="SvnCommandDialog" id="SvnCommandDialog" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnCommandDialog.html#SvnCommandDialog" /> <keyword name="SvnCommandDialog (Constructor)" id="SvnCommandDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommandDialog.html#SvnCommandDialog.__init__" /> @@ -9344,6 +9371,8 @@ <keyword name="SvnProjectHelper (Constructor)" id="SvnProjectHelper (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.__init__" /> <keyword name="SvnProjectHelper.__svnBranchList" id="SvnProjectHelper.__svnBranchList" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__svnBranchList" /> <keyword name="SvnProjectHelper.__svnBranchList" id="SvnProjectHelper.__svnBranchList" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.__svnBranchList" /> + <keyword name="SvnProjectHelper.__svnChangeLists" id="SvnProjectHelper.__svnChangeLists" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__svnChangeLists" /> + <keyword name="SvnProjectHelper.__svnChangeLists" id="SvnProjectHelper.__svnChangeLists" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.__svnChangeLists" /> <keyword name="SvnProjectHelper.__svnConfigure" id="SvnProjectHelper.__svnConfigure" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__svnConfigure" /> <keyword name="SvnProjectHelper.__svnConfigure" id="SvnProjectHelper.__svnConfigure" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.__svnConfigure" /> <keyword name="SvnProjectHelper.__svnExtendedDiff" id="SvnProjectHelper.__svnExtendedDiff" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__svnExtendedDiff" /> @@ -12407,6 +12436,7 @@ <file>eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.html</file> <file>eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html</file> <file>eric5.Plugins.VcsPlugins.vcsPySvn.SvnBlameDialog.html</file> + <file>eric5.Plugins.VcsPlugins.vcsPySvn.SvnChangeListsDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommandDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommitDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsPySvn.SvnConst.html</file> @@ -12440,6 +12470,7 @@ <file>eric5.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.html</file> <file>eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html</file> <file>eric5.Plugins.VcsPlugins.vcsSubversion.SvnBlameDialog.html</file> + <file>eric5.Plugins.VcsPlugins.vcsSubversion.SvnChangeListsDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsSubversion.SvnCommandDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsSubversion.SvnCommitDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsSubversion.SvnCopyDialog.html</file>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html Sat Jun 02 17:41:24 2012 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html Sun Jun 03 12:51:15 2012 +0200 @@ -64,8 +64,11 @@ <td><a href="#SvnProjectHelper.__svnBranchList">__svnBranchList</a></td> <td>Private slot used to list the branches of the project.</td> </tr><tr> +<td><a href="#SvnProjectHelper.__svnChangeLists">__svnChangeLists</a></td> +<td>Private slot used to show a list of change lists.</td> +</tr><tr> <td><a href="#SvnProjectHelper.__svnConfigure">__svnConfigure</a></td> -<td>Private method to open the configuration dialog.</td> +<td>Private slot to open the configuration dialog.</td> </tr><tr> <td><a href="#SvnProjectHelper.__svnExtendedDiff">__svnExtendedDiff</a></td> <td>Private slot used to perform a svn diff with the selection of revisions.</td> @@ -138,11 +141,16 @@ <b>__svnBranchList</b>(<i></i>) <p> Private slot used to list the branches of the project. +</p><a NAME="SvnProjectHelper.__svnChangeLists" ID="SvnProjectHelper.__svnChangeLists"></a> +<h4>SvnProjectHelper.__svnChangeLists</h4> +<b>__svnChangeLists</b>(<i></i>) +<p> + Private slot used to show a list of change lists. </p><a NAME="SvnProjectHelper.__svnConfigure" ID="SvnProjectHelper.__svnConfigure"></a> <h4>SvnProjectHelper.__svnConfigure</h4> <b>__svnConfigure</b>(<i></i>) <p> - Private method to open the configuration dialog. + Private slot to open the configuration dialog. </p><a NAME="SvnProjectHelper.__svnExtendedDiff" ID="SvnProjectHelper.__svnExtendedDiff"></a> <h4>SvnProjectHelper.__svnExtendedDiff</h4> <b>__svnExtendedDiff</b>(<i></i>)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnChangeListsDialog.html Sun Jun 03 12:51:15 2012 +0200 @@ -0,0 +1,135 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' +'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<html><head> +<title>eric5.Plugins.VcsPlugins.vcsPySvn.SvnChangeListsDialog</title> +<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>eric5.Plugins.VcsPlugins.vcsPySvn.SvnChangeListsDialog</h1> +<p> +Module implementing a dialog to browse the change lists. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#SvnChangeListsDialog">SvnChangeListsDialog</a></td> +<td>Class implementing a dialog to browse the change lists.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="SvnChangeListsDialog" ID="SvnChangeListsDialog"></a> +<h2>SvnChangeListsDialog</h2> +<p> + Class implementing a dialog to browse the change lists. +</p> +<h3>Derived from</h3> +QDialog, SvnDialogMixin, Ui_SvnChangeListsDialog +<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="#SvnChangeListsDialog.__init__">SvnChangeListsDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#SvnChangeListsDialog.__finish">__finish</a></td> +<td>Private slot called when the user pressed the button.</td> +</tr><tr> +<td><a href="#SvnChangeListsDialog.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="#SvnChangeListsDialog.on_changeLists_currentItemChanged">on_changeLists_currentItemChanged</a></td> +<td>Private slot to handle the selection of a new item.</td> +</tr><tr> +<td><a href="#SvnChangeListsDialog.start">start</a></td> +<td>Public slot to populate the data.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="SvnChangeListsDialog.__init__" ID="SvnChangeListsDialog.__init__"></a> +<h4>SvnChangeListsDialog (Constructor)</h4> +<b>SvnChangeListsDialog</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="SvnChangeListsDialog.__finish" ID="SvnChangeListsDialog.__finish"></a> +<h4>SvnChangeListsDialog.__finish</h4> +<b>__finish</b>(<i></i>) +<p> + Private slot called when the user pressed the button. +</p><a NAME="SvnChangeListsDialog.on_buttonBox_clicked" ID="SvnChangeListsDialog.on_buttonBox_clicked"></a> +<h4>SvnChangeListsDialog.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="SvnChangeListsDialog.on_changeLists_currentItemChanged" ID="SvnChangeListsDialog.on_changeLists_currentItemChanged"></a> +<h4>SvnChangeListsDialog.on_changeLists_currentItemChanged</h4> +<b>on_changeLists_currentItemChanged</b>(<i>current, previous</i>) +<p> + Private slot to handle the selection of a new item. +</p><dl> +<dt><i>current</i></dt> +<dd> +current item (QListWidgetItem) +</dd><dt><i>previous</i></dt> +<dd> +previous current item (QListWidgetItem) +</dd> +</dl><a NAME="SvnChangeListsDialog.start" ID="SvnChangeListsDialog.start"></a> +<h4>SvnChangeListsDialog.start</h4> +<b>start</b>(<i>path</i>) +<p> + Public slot to populate the data. +</p><dl> +<dt><i>path</i></dt> +<dd> +directory name to show change lists for (string) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommitDialog.html Sat Jun 02 17:41:24 2012 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommitDialog.html Sun Jun 03 12:51:15 2012 +0200 @@ -101,11 +101,14 @@ </table> <a NAME="SvnCommitDialog.__init__" ID="SvnCommitDialog.__init__"></a> <h4>SvnCommitDialog (Constructor)</h4> -<b>SvnCommitDialog</b>(<i>parent=None</i>) +<b>SvnCommitDialog</b>(<i>changelists, parent=None</i>) <p> Constructor </p><dl> -<dt><i>parent</i></dt> +<dt><i>changelists</i></dt> +<dd> +list of available change lists (list of strings) +</dd><dt><i>parent</i></dt> <dd> parent widget (QWidget) </dd>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html Sat Jun 02 17:41:24 2012 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html Sun Jun 03 12:51:15 2012 +0200 @@ -112,6 +112,9 @@ <td><a href="#Subversion.svnExtendedDiff">svnExtendedDiff</a></td> <td>Public method used to view the difference of a file/directory to the Subversion repository.</td> </tr><tr> +<td><a href="#Subversion.svnGetChangelists">svnGetChangelists</a></td> +<td>Public method to get a list of all defined change lists.</td> +</tr><tr> <td><a href="#Subversion.svnGetReposName">svnGetReposName</a></td> <td>Public method used to retrieve the URL of the subversion repository path.</td> </tr><tr> @@ -148,6 +151,9 @@ <td><a href="#Subversion.svnSetProp">svnSetProp</a></td> <td>Public method used to add a property to a file/directory.</td> </tr><tr> +<td><a href="#Subversion.svnShowChangelists">svnShowChangelists</a></td> +<td>Public method used to inspect the change lists defined for the project.</td> +</tr><tr> <td><a href="#Subversion.svnUnlock">svnUnlock</a></td> <td>Public method used to unlock a file in the Subversion repository.</td> </tr><tr> @@ -499,6 +505,16 @@ <dd> file/directory name to be diffed (string) </dd> +</dl><a NAME="Subversion.svnGetChangelists" ID="Subversion.svnGetChangelists"></a> +<h4>Subversion.svnGetChangelists</h4> +<b>svnGetChangelists</b>(<i></i>) +<p> + Public method to get a list of all defined change lists. +</p><dl> +<dt>Returns:</dt> +<dd> +list of defined change list names (list of strings) +</dd> </dl><a NAME="Subversion.svnGetReposName" ID="Subversion.svnGetReposName"></a> <h4>Subversion.svnGetReposName</h4> <b>svnGetReposName</b>(<i>path</i>) @@ -652,6 +668,16 @@ <dd> flag indicating a recursive set is requested </dd> +</dl><a NAME="Subversion.svnShowChangelists" ID="Subversion.svnShowChangelists"></a> +<h4>Subversion.svnShowChangelists</h4> +<b>svnShowChangelists</b>(<i>path</i>) +<p> + Public method used to inspect the change lists defined for the project. +</p><dl> +<dt><i>path</i></dt> +<dd> +directory name to show change lists for (string) +</dd> </dl><a NAME="Subversion.svnUnlock" ID="Subversion.svnUnlock"></a> <h4>Subversion.svnUnlock</h4> <b>svnUnlock</b>(<i>name, breakIt=False, parent=None</i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html Sat Jun 02 17:41:24 2012 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html Sun Jun 03 12:51:15 2012 +0200 @@ -64,8 +64,11 @@ <td><a href="#SvnProjectHelper.__svnBranchList">__svnBranchList</a></td> <td>Private slot used to list the branches of the project.</td> </tr><tr> +<td><a href="#SvnProjectHelper.__svnChangeLists">__svnChangeLists</a></td> +<td>Private slot used to show a list of change lists.</td> +</tr><tr> <td><a href="#SvnProjectHelper.__svnConfigure">__svnConfigure</a></td> -<td>Private method to open the configuration dialog.</td> +<td>Private slot to open the configuration dialog.</td> </tr><tr> <td><a href="#SvnProjectHelper.__svnExtendedDiff">__svnExtendedDiff</a></td> <td>Private slot used to perform a svn diff with the selection of revisions.</td> @@ -135,11 +138,16 @@ <b>__svnBranchList</b>(<i></i>) <p> Private slot used to list the branches of the project. +</p><a NAME="SvnProjectHelper.__svnChangeLists" ID="SvnProjectHelper.__svnChangeLists"></a> +<h4>SvnProjectHelper.__svnChangeLists</h4> +<b>__svnChangeLists</b>(<i></i>) +<p> + Private slot used to show a list of change lists. </p><a NAME="SvnProjectHelper.__svnConfigure" ID="SvnProjectHelper.__svnConfigure"></a> <h4>SvnProjectHelper.__svnConfigure</h4> <b>__svnConfigure</b>(<i></i>) <p> - Private method to open the configuration dialog. + Private slot to open the configuration dialog. </p><a NAME="SvnProjectHelper.__svnExtendedDiff" ID="SvnProjectHelper.__svnExtendedDiff"></a> <h4>SvnProjectHelper.__svnExtendedDiff</h4> <b>__svnExtendedDiff</b>(<i></i>)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnChangeListsDialog.html Sun Jun 03 12:51:15 2012 +0200 @@ -0,0 +1,216 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' +'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<html><head> +<title>eric5.Plugins.VcsPlugins.vcsSubversion.SvnChangeListsDialog</title> +<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>eric5.Plugins.VcsPlugins.vcsSubversion.SvnChangeListsDialog</h1> +<p> +Module implementing a dialog to browse the change lists. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#SvnChangeListsDialog">SvnChangeListsDialog</a></td> +<td>Class implementing a dialog to browse the change lists.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="SvnChangeListsDialog" ID="SvnChangeListsDialog"></a> +<h2>SvnChangeListsDialog</h2> +<p> + Class implementing a dialog to browse the change lists. +</p> +<h3>Derived from</h3> +QDialog, Ui_SvnChangeListsDialog +<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="#SvnChangeListsDialog.__init__">SvnChangeListsDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#SvnChangeListsDialog.__finish">__finish</a></td> +<td>Private slot called when the process finished or the user pressed the button.</td> +</tr><tr> +<td><a href="#SvnChangeListsDialog.__procFinished">__procFinished</a></td> +<td>Private slot connected to the finished signal.</td> +</tr><tr> +<td><a href="#SvnChangeListsDialog.__readStderr">__readStderr</a></td> +<td>Private slot to handle the readyReadStandardError signal.</td> +</tr><tr> +<td><a href="#SvnChangeListsDialog.__readStdout">__readStdout</a></td> +<td>Private slot to handle the readyReadStandardOutput signal.</td> +</tr><tr> +<td><a href="#SvnChangeListsDialog.keyPressEvent">keyPressEvent</a></td> +<td>Protected slot to handle a key press event.</td> +</tr><tr> +<td><a href="#SvnChangeListsDialog.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="#SvnChangeListsDialog.on_changeLists_currentItemChanged">on_changeLists_currentItemChanged</a></td> +<td>Private slot to handle the selection of a new item.</td> +</tr><tr> +<td><a href="#SvnChangeListsDialog.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="#SvnChangeListsDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> +<td>Private slot to handle the password checkbox toggled.</td> +</tr><tr> +<td><a href="#SvnChangeListsDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> +<td>Private slot to send the input to the subversion process.</td> +</tr><tr> +<td><a href="#SvnChangeListsDialog.start">start</a></td> +<td>Public slot to populate the data.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="SvnChangeListsDialog.__init__" ID="SvnChangeListsDialog.__init__"></a> +<h4>SvnChangeListsDialog (Constructor)</h4> +<b>SvnChangeListsDialog</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="SvnChangeListsDialog.__finish" ID="SvnChangeListsDialog.__finish"></a> +<h4>SvnChangeListsDialog.__finish</h4> +<b>__finish</b>(<i></i>) +<p> + Private slot called when the process finished or the user pressed + the button. +</p><a NAME="SvnChangeListsDialog.__procFinished" ID="SvnChangeListsDialog.__procFinished"></a> +<h4>SvnChangeListsDialog.__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="SvnChangeListsDialog.__readStderr" ID="SvnChangeListsDialog.__readStderr"></a> +<h4>SvnChangeListsDialog.__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="SvnChangeListsDialog.__readStdout" ID="SvnChangeListsDialog.__readStdout"></a> +<h4>SvnChangeListsDialog.__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="SvnChangeListsDialog.keyPressEvent" ID="SvnChangeListsDialog.keyPressEvent"></a> +<h4>SvnChangeListsDialog.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="SvnChangeListsDialog.on_buttonBox_clicked" ID="SvnChangeListsDialog.on_buttonBox_clicked"></a> +<h4>SvnChangeListsDialog.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="SvnChangeListsDialog.on_changeLists_currentItemChanged" ID="SvnChangeListsDialog.on_changeLists_currentItemChanged"></a> +<h4>SvnChangeListsDialog.on_changeLists_currentItemChanged</h4> +<b>on_changeLists_currentItemChanged</b>(<i>current, previous</i>) +<p> + Private slot to handle the selection of a new item. +</p><dl> +<dt><i>current</i></dt> +<dd> +current item (QListWidgetItem) +</dd><dt><i>previous</i></dt> +<dd> +previous current item (QListWidgetItem) +</dd> +</dl><a NAME="SvnChangeListsDialog.on_input_returnPressed" ID="SvnChangeListsDialog.on_input_returnPressed"></a> +<h4>SvnChangeListsDialog.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="SvnChangeListsDialog.on_passwordCheckBox_toggled" ID="SvnChangeListsDialog.on_passwordCheckBox_toggled"></a> +<h4>SvnChangeListsDialog.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="SvnChangeListsDialog.on_sendButton_clicked" ID="SvnChangeListsDialog.on_sendButton_clicked"></a> +<h4>SvnChangeListsDialog.on_sendButton_clicked</h4> +<b>on_sendButton_clicked</b>(<i></i>) +<p> + Private slot to send the input to the subversion process. +</p><a NAME="SvnChangeListsDialog.start" ID="SvnChangeListsDialog.start"></a> +<h4>SvnChangeListsDialog.start</h4> +<b>start</b>(<i>path</i>) +<p> + Public slot to populate the data. +</p><dl> +<dt><i>path</i></dt> +<dd> +directory name to show change lists for (string) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html Sat Jun 02 17:41:24 2012 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html Sun Jun 03 12:51:15 2012 +0200 @@ -109,6 +109,9 @@ <td><a href="#Subversion.svnExtendedDiff">svnExtendedDiff</a></td> <td>Public method used to view the difference of a file/directory to the Subversion repository.</td> </tr><tr> +<td><a href="#Subversion.svnGetChangelists">svnGetChangelists</a></td> +<td>Public method to get a list of all defined change lists.</td> +</tr><tr> <td><a href="#Subversion.svnGetReposName">svnGetReposName</a></td> <td>Public method used to retrieve the URL of the subversion repository path.</td> </tr><tr> @@ -142,6 +145,9 @@ <td><a href="#Subversion.svnSetProp">svnSetProp</a></td> <td>Public method used to add a property to a file/directory.</td> </tr><tr> +<td><a href="#Subversion.svnShowChangelists">svnShowChangelists</a></td> +<td>Public method used to inspect the change lists defined for the project.</td> +</tr><tr> <td><a href="#Subversion.svnUnlock">svnUnlock</a></td> <td>Public method used to unlock a file in the Subversion repository.</td> </tr><tr> @@ -483,6 +489,16 @@ <dd> file/directory name to be diffed (string) </dd> +</dl><a NAME="Subversion.svnGetChangelists" ID="Subversion.svnGetChangelists"></a> +<h4>Subversion.svnGetChangelists</h4> +<b>svnGetChangelists</b>(<i></i>) +<p> + Public method to get a list of all defined change lists. +</p><dl> +<dt>Returns:</dt> +<dd> +list of defined change list names (list of strings) +</dd> </dl><a NAME="Subversion.svnGetReposName" ID="Subversion.svnGetReposName"></a> <h4>Subversion.svnGetReposName</h4> <b>svnGetReposName</b>(<i>path</i>) @@ -623,6 +639,16 @@ <dd> flag indicating a recursive list is requested </dd> +</dl><a NAME="Subversion.svnShowChangelists" ID="Subversion.svnShowChangelists"></a> +<h4>Subversion.svnShowChangelists</h4> +<b>svnShowChangelists</b>(<i>path</i>) +<p> + Public method used to inspect the change lists defined for the project. +</p><dl> +<dt><i>path</i></dt> +<dd> +directory name to show change lists for (string) +</dd> </dl><a NAME="Subversion.svnUnlock" ID="Subversion.svnUnlock"></a> <h4>Subversion.svnUnlock</h4> <b>svnUnlock</b>(<i>name, breakIt=False, parent=None</i>)
--- a/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsPySvn.html Sat Jun 02 17:41:24 2012 +0200 +++ b/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsPySvn.html Sun Jun 03 12:51:15 2012 +0200 @@ -51,6 +51,9 @@ <td><a href="eric5.Plugins.VcsPlugins.vcsPySvn.SvnBlameDialog.html">SvnBlameDialog</a></td> <td>Module implementing a dialog to show the output of the svn blame command.</td> </tr><tr> +<td><a href="eric5.Plugins.VcsPlugins.vcsPySvn.SvnChangeListsDialog.html">SvnChangeListsDialog</a></td> +<td>Module implementing a dialog to browse the change lists.</td> +</tr><tr> <td><a href="eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommandDialog.html">SvnCommandDialog</a></td> <td>Module implementing the Subversion command dialog.</td> </tr><tr>
--- a/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsSubversion.html Sat Jun 02 17:41:24 2012 +0200 +++ b/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsSubversion.html Sun Jun 03 12:51:15 2012 +0200 @@ -51,6 +51,9 @@ <td><a href="eric5.Plugins.VcsPlugins.vcsSubversion.SvnBlameDialog.html">SvnBlameDialog</a></td> <td>Module implementing a dialog to show the output of the svn blame command.</td> </tr><tr> +<td><a href="eric5.Plugins.VcsPlugins.vcsSubversion.SvnChangeListsDialog.html">SvnChangeListsDialog</a></td> +<td>Module implementing a dialog to browse the change lists.</td> +</tr><tr> <td><a href="eric5.Plugins.VcsPlugins.vcsSubversion.SvnCommandDialog.html">SvnCommandDialog</a></td> <td>Module implementing the Subversion command dialog.</td> </tr><tr>
--- a/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py Sat Jun 02 17:41:24 2012 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py Sun Jun 03 12:51:15 2012 +0200 @@ -188,6 +188,21 @@ self.vcsStatusAct.triggered[()].connect(self._vcsStatus) self.actions.append(self.vcsStatusAct) + self.svnChangeListsAct = E5Action(self.trUtf8('Show change lists'), + UI.PixmapCache.getIcon("vcsChangeLists.png"), + self.trUtf8('Show change lists'), + 0, 0, self, 'subversion_changelists') + self.svnChangeListsAct.setStatusTip(self.trUtf8( + 'Show the change lists and associated files of the local project' + )) + self.svnChangeListsAct.setWhatsThis(self.trUtf8( + """<b>Show change lists</b>""" + """<p>This shows the change lists and associated files of the""" + """ local project.</p>""" + )) + self.svnChangeListsAct.triggered[()].connect(self.__svnChangeLists) + self.actions.append(self.svnChangeListsAct) + self.svnRepoInfoAct = E5Action(self.trUtf8('Show repository info'), UI.PixmapCache.getIcon("vcsRepo.png"), self.trUtf8('Show repository info'), @@ -478,6 +493,7 @@ menu.addAction(self.svnLogBrowserAct) menu.addSeparator() menu.addAction(self.vcsStatusAct) + menu.addAction(self.svnChangeListsAct) menu.addAction(self.svnRepoInfoAct) menu.addSeparator() menu.addAction(self.vcsDiffAct) @@ -578,6 +594,12 @@ def __svnConfigure(self): """ - Private method to open the configuration dialog. + Private slot to open the configuration dialog. """ e5App().getObject("UserInterface").showPreferences("zzz_subversionPage") + + def __svnChangeLists(self): + """ + Private slot used to show a list of change lists. + """ + self.vcs.svnShowChangelists(self.project.ppath)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnChangeListsDialog.py Sun Jun 03 12:51:15 2012 +0200 @@ -0,0 +1,123 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2012 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to browse the change lists. +""" + +import os + +import pysvn + +from PyQt4.QtCore import pyqtSlot, Qt, QMutexLocker +from PyQt4.QtGui import QDialog, QDialogButtonBox, QListWidgetItem, QApplication, \ + QCursor + +from .SvnDialogMixin import SvnDialogMixin + +from .Ui_SvnChangeListsDialog import Ui_SvnChangeListsDialog + + +class SvnChangeListsDialog(QDialog, SvnDialogMixin, Ui_SvnChangeListsDialog): + """ + Class implementing a dialog to browse the change lists. + """ + def __init__(self, vcs, parent=None): + """ + Constructor + + @param vcs reference to the vcs object + @param parent parent widget (QWidget) + """ + super().__init__(parent) + self.setupUi(self) + SvnDialogMixin.__init__(self) + + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) + + self.vcs = vcs + + self.client = self.vcs.getClient() + self.client.callback_cancel = \ + self._clientCancelCallback + self.client.callback_get_login = \ + self._clientLoginCallback + self.client.callback_ssl_server_trust_prompt = \ + self._clientSslServerTrustPromptCallback + + @pyqtSlot(QListWidgetItem, QListWidgetItem) + def on_changeLists_currentItemChanged(self, current, previous): + """ + Private slot to handle the selection of a new item. + + @param current current item (QListWidgetItem) + @param previous previous current item (QListWidgetItem) + """ + self.filesList.clear() + if current is not None: + changelist = current.text() + if changelist in self.changeListsDict: + self.filesList.addItems(sorted(self.changeListsDict[changelist])) + + def start(self, path): + """ + Public slot to populate the data. + + @param path directory name to show change lists for (string) + """ + self.changeListsDict = {} + self.cancelled = False + + self.filesLabel.setText(self.trUtf8("Files (relative to {0}):").format(path)) + + QApplication.setOverrideCursor(QCursor(Qt.WaitCursor)) + QApplication.processEvents() + + locker = QMutexLocker(self.vcs.vcsExecutionMutex) + try: + entries = self.client.get_changelist(path, depth=pysvn.depth.infinity) + for entry in entries: + file = entry[0] + changelist = entry[1] + if changelist not in self.changeListsDict: + self.changeListsDict[changelist] = [] + filename = file.replace(path + os.sep, "") + if filename not in self.changeListsDict[changelist]: + self.changeListsDict[changelist].append(filename) + except pysvn.ClientError as e: + locker.unlock() + self.__showError(e.args[0]) + self.__finish() + + def __finish(self): + """ + Private slot called when the user pressed the button. + """ + self.changeLists.addItems(sorted(self.changeListsDict.keys())) + QApplication.restoreOverrideCursor() + + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) + self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) + + if len(self.changeListsDict) == 0: + self.changeLists.addItem(self.trUtf8("No changelists found")) + self.buttonBox.button(QDialogButtonBox.Close).setFocus(Qt.OtherFocusReason) + else: + self.changeLists.setCurrentRow(0) + self.changeLists.setFocus(Qt.OtherFocusReason) + + 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()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnChangeListsDialog.ui Sun Jun 03 12:51:15 2012 +0200 @@ -0,0 +1,123 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>SvnChangeListsDialog</class> + <widget class="QDialog" name="SvnChangeListsDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>519</width> + <height>494</height> + </rect> + </property> + <property name="windowTitle"> + <string>Subversion Change Lists</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Change Lists:</string> + </property> + </widget> + </item> + <item> + <widget class="QListWidget" name="changeLists"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="whatsThis"> + <string><b>Change Lists</b> +<p>Select a change list here to see the associated files in the list below.</p></string> + </property> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="filesLabel"> + <property name="text"> + <string/> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QListWidget" name="filesList"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>2</verstretch> + </sizepolicy> + </property> + <property name="whatsThis"> + <string><b>Files</b> +<p>This shows a list of files associated with the change list selected above.</p></string> + </property> + <property name="alternatingRowColors"> + <bool>true</bool> + </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</set> + </property> + </widget> + </item> + </layout> + </widget> + <tabstops> + <tabstop>changeLists</tabstop> + <tabstop>filesList</tabstop> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>SvnChangeListsDialog</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>SvnChangeListsDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>316</x> + <y>260</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py Sat Jun 02 17:41:24 2012 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py Sun Jun 03 12:51:15 2012 +0200 @@ -27,10 +27,11 @@ accepted = pyqtSignal() rejected = pyqtSignal() - def __init__(self, parent=None): + def __init__(self, changelists, parent=None): """ Constructor + @param changelists list of available change lists (list of strings) @param parent parent widget (QWidget) """ super().__init__(parent, Qt.WindowFlags(Qt.Window)) @@ -38,6 +39,8 @@ if pysvn.svn_version < (1, 5, 0) or pysvn.version < (1, 6, 0): self.changeListsGroup.hide() + else: + self.changeLists.addItems(sorted(changelists)) def showEvent(self, evt): """ @@ -78,10 +81,7 @@ @return flag indicating availability of changelists (boolean) """ - listsTxt = self.changeListsEdit.text() - lists = listsTxt.split(';') - slists = [l.strip() for l in lists if l.strip() != ""] - return len(slists) > 0 + return len(self.changeLists.selectedItems()) > 0 def changelistsData(self): """ @@ -90,9 +90,8 @@ @return tuple containing the changelists (list of strings) and a flag indicating to keep changelists (boolean) """ - listsTxt = self.changeListsEdit.text() - lists = listsTxt.split(';') - slists = [l.strip() for l in lists if l.strip() != ""] + slists = [l.text().strip() for l in self.changeLists.selectedItems() + if l.text().strip() != ""] if len(slists) == 0: return [], False
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui Sat Jun 02 17:41:24 2012 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui Sun Jun 03 12:51:15 2012 +0200 @@ -1,51 +1,52 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>SvnCommitDialog</class> - <widget class="QWidget" name="SvnCommitDialog" > - <property name="geometry" > + <widget class="QWidget" name="SvnCommitDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> <width>450</width> - <height>384</height> + <height>396</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Subversion</string> </property> - <layout class="QVBoxLayout" name="verticalLayout_3" > + <layout class="QVBoxLayout" name="verticalLayout_3"> <item> - <widget class="QGroupBox" name="logGroup" > - <property name="title" > + <widget class="QGroupBox" name="logGroup"> + <property name="title"> <string>Commit Message</string> </property> - <layout class="QVBoxLayout" name="verticalLayout" > + <layout class="QVBoxLayout" name="verticalLayout"> <item> - <widget class="QTextEdit" name="logEdit" > - <property name="toolTip" > + <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 name="whatsThis"> + <string><b>Log Message</b> +<p>Enter the log message for the commit action.</p></string> </property> - <property name="tabChangesFocus" > + <property name="tabChangesFocus"> <bool>true</bool> </property> - <property name="acceptRichText" > + <property name="acceptRichText"> <bool>false</bool> </property> </widget> </item> <item> - <widget class="QLabel" name="label" > - <property name="text" > + <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" > + <widget class="QComboBox" name="recentComboBox"> + <property name="toolTip"> <string>Select a recent commit message to use</string> </property> </widget> @@ -54,24 +55,24 @@ </widget> </item> <item> - <widget class="QGroupBox" name="changeListsGroup" > - <property name="title" > + <widget class="QGroupBox" name="changeListsGroup"> + <property name="title"> <string>Changelists</string> </property> - <layout class="QVBoxLayout" name="verticalLayout_2" > + <layout class="QVBoxLayout" name="verticalLayout_2"> <item> - <widget class="QLineEdit" name="changeListsEdit" > - <property name="toolTip" > - <string>Enter the list of changelists separated by ';'</string> + <widget class="QListWidget" name="changeLists"> + <property name="toolTip"> + <string>Select the change lists to limit the commit</string> </property> </widget> </item> <item> - <widget class="QCheckBox" name="keepChangeListsCheckBox" > - <property name="toolTip" > + <widget class="QCheckBox" name="keepChangeListsCheckBox"> + <property name="toolTip"> <string>Select to keep the changelists</string> </property> - <property name="text" > + <property name="text"> <string>Keep changelists</string> </property> </widget> @@ -80,23 +81,23 @@ </widget> </item> <item> - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="orientation" > + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="standardButtons" > + <property name="standardButtons"> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close|QDialogButtonBox::Ok</set> </property> </widget> </item> </layout> </widget> - <layoutdefault spacing="6" margin="6" /> + <layoutdefault spacing="6" margin="6"/> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <tabstops> <tabstop>logEdit</tabstop> <tabstop>recentComboBox</tabstop> - <tabstop>changeListsEdit</tabstop> + <tabstop>changeLists</tabstop> <tabstop>keepChangeListsCheckBox</tabstop> <tabstop>buttonBox</tabstop> </tabstops>
--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py Sat Jun 02 17:41:24 2012 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py Sun Jun 03 12:51:15 2012 +0200 @@ -47,6 +47,7 @@ from .SvnRelocateDialog import SvnRelocateDialog from .SvnUrlSelectionDialog import SvnUrlSelectionDialog from .SvnRepoBrowserDialog import SvnRepoBrowserDialog +from .SvnChangeListsDialog import SvnChangeListsDialog from .SvnStatusMonitorThread import SvnStatusMonitorThread from .SvnUtilities import getConfigPath, amendConfig, createDefaultConfig @@ -473,7 +474,7 @@ if not noDialog and not message: # call CommitDialog and get message from there if self.__commitDialog is None: - self.__commitDialog = SvnCommitDialog(self.__ui) + self.__commitDialog = SvnCommitDialog(self.svnGetChangelists(), self.__ui) self.__commitDialog.accepted.connect(self.__vcsCommit_Step2) self.__commitDialog.show() self.__commitDialog.raise_() @@ -2149,11 +2150,12 @@ if not isinstance(names, list): names = [names] - clname, ok = QInputDialog.getText( + clname, ok = QInputDialog.getItem( None, self.trUtf8("Add to changelist"), self.trUtf8("Enter name of the changelist:"), - QLineEdit.Normal) + sorted(self.svnGetChangelists()), + 0, True) if not ok or not clname: return @@ -2173,8 +2175,39 @@ dlg.finish() dlg.exec_() - # TODO: add a svnShowChangelists method to show the changelists - # TODO: add a svnGetChangelists method returning the changelists and their associated files + def svnShowChangelists(self, path): + """ + Public method used to inspect the change lists defined for the project. + + @param path directory name to show change lists for (string) + """ + self.changeLists = SvnChangeListsDialog(self) + self.changeLists.show() + QApplication.processEvents() + self.changeLists.start(path) + + def svnGetChangelists(self): + """ + Public method to get a list of all defined change lists. + + @return list of defined change list names (list of strings) + """ + changelists = [] + client = self.getClient() + if hasattr(client, 'get_changelist'): + ppath = e5App().getObject("Project").getProjectPath() + locker = QMutexLocker(self.vcsExecutionMutex) + try: + entries = client.get_changelist(ppath, depth=pysvn.depth.infinity) + for entry in entries: + changelist = entry[1] + if changelist not in changelists: + changelists.append(changelist) + except pysvn.ClientError: + pass + locker.unlock() + + return changelists ############################################################################ ## Private Subversion specific methods are below.
--- a/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py Sat Jun 02 17:41:24 2012 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py Sun Jun 03 12:51:15 2012 +0200 @@ -188,6 +188,21 @@ self.vcsStatusAct.triggered[()].connect(self._vcsStatus) self.actions.append(self.vcsStatusAct) + self.svnChangeListsAct = E5Action(self.trUtf8('Show change lists'), + UI.PixmapCache.getIcon("vcsChangeLists.png"), + self.trUtf8('Show change lists'), + 0, 0, self, 'subversion_changelists') + self.svnChangeListsAct.setStatusTip(self.trUtf8( + 'Show the change lists and associated files of the local project' + )) + self.svnChangeListsAct.setWhatsThis(self.trUtf8( + """<b>Show change lists</b>""" + """<p>This shows the change lists and associated files of the""" + """ local project.</p>""" + )) + self.svnChangeListsAct.triggered[()].connect(self.__svnChangeLists) + self.actions.append(self.svnChangeListsAct) + self.vcsTagAct = E5Action(self.trUtf8('Tag in repository'), UI.PixmapCache.getIcon("vcsTag.png"), self.trUtf8('&Tag in repository...'), @@ -463,6 +478,7 @@ menu.addAction(self.svnLogBrowserAct) menu.addSeparator() menu.addAction(self.vcsStatusAct) + menu.addAction(self.svnChangeListsAct) menu.addSeparator() menu.addAction(self.vcsDiffAct) menu.addAction(self.svnExtDiffAct) @@ -556,6 +572,12 @@ def __svnConfigure(self): """ - Private method to open the configuration dialog. + Private slot to open the configuration dialog. """ e5App().getObject("UserInterface").showPreferences("zzz_subversionPage") + + def __svnChangeLists(self): + """ + Private slot used to show a list of change lists. + """ + self.vcs.svnShowChangelists(self.project.ppath)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py Sun Jun 03 12:51:15 2012 +0200 @@ -0,0 +1,257 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2012 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to browse the change lists. +""" + +import os + +from PyQt4.QtCore import pyqtSlot, Qt, QProcess, QRegExp, QTimer +from PyQt4.QtGui import QDialog, QDialogButtonBox, QListWidgetItem, QLineEdit + +from E5Gui import E5MessageBox + +from .Ui_SvnChangeListsDialog import Ui_SvnChangeListsDialog + +import Preferences + + +class SvnChangeListsDialog(QDialog, Ui_SvnChangeListsDialog): + """ + Class implementing a dialog to browse the change lists. + """ + def __init__(self, vcs, parent=None): + """ + Constructor + + @param vcs reference to the vcs object + @param parent parent widget (QWidget) + """ + super().__init__(parent) + self.setupUi(self) + + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) + + self.process = None + self.vcs = vcs + + self.rx_status = \ + QRegExp('(.{8,9})\\s+([0-9-]+)\\s+([0-9?]+)\\s+([\\w?]+)\\s+(.+)\\s*') + # flags (8 or 9 anything), revision, changed rev, author, path + self.rx_status2 = \ + QRegExp('(.{8,9})\\s+(.+)\\s*') + # flags (8 or 9 anything), path + self.rx_changelist = \ + QRegExp('--- \\S+ .([\\w\\s]+).:\\s+') + # three dashes, Changelist (translated), quote, + # changelist name, quote, : + + @pyqtSlot(QListWidgetItem, QListWidgetItem) + def on_changeLists_currentItemChanged(self, current, previous): + """ + Private slot to handle the selection of a new item. + + @param current current item (QListWidgetItem) + @param previous previous current item (QListWidgetItem) + """ + self.filesList.clear() + if current is not None: + changelist = current.text() + if changelist in self.changeListsDict: + self.filesList.addItems(sorted(self.changeListsDict[changelist])) + + def start(self, path): + """ + Public slot to populate the data. + + @param path directory name to show change lists for (string) + """ + self.changeListsDict = {} + + self.filesLabel.setText(self.trUtf8("Files (relative to {0}):").format(path)) + + self.errorGroup.hide() + self.intercept = False + + self.path = path + self.currentChangelist = "" + + self.process = QProcess() + self.process.finished.connect(self.__procFinished) + self.process.readyReadStandardOutput.connect(self.__readStdout) + self.process.readyReadStandardError.connect(self.__readStderr) + + args = [] + args.append('status') + self.vcs.addArguments(args, self.vcs.options['global']) + self.vcs.addArguments(args, self.vcs.options['status']) + if '--verbose' not in self.vcs.options['global'] and \ + '--verbose' not in self.vcs.options['status']: + args.append('--verbose') + if isinstance(path, list): + self.dname, fnames = self.vcs.splitPathList(path) + self.vcs.addArguments(args, fnames) + else: + self.dname, fname = self.vcs.splitPath(path) + args.append(fname) + + self.process.setWorkingDirectory(self.dname) + + self.process.start('svn', args) + procStarted = self.process.waitForStarted() + if not procStarted: + self.inputGroup.setEnabled(False) + self.inputGroup.hide() + E5MessageBox.critical(self, + self.trUtf8('Process Generation Error'), + self.trUtf8( + 'The process {0} could not be started. ' + 'Ensure, that it is in the search path.' + ).format('svn')) + 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.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() + + if len(self.changeListsDict) == 0: + self.changeLists.addItem(self.trUtf8("No changelists found")) + self.buttonBox.button(QDialogButtonBox.Close).setFocus(Qt.OtherFocusReason) + else: + self.changeLists.addItems(sorted(self.changeListsDict.keys())) + self.changeLists.setCurrentRow(0) + self.changeLists.setFocus(Qt.OtherFocusReason) + + 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 __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(): + s = str(self.process.readLine(), + Preferences.getSystem("IOEncoding"), + 'replace') + if self.currentChangelist != "" and self.rx_status.exactMatch(s): + file = self.rx_status.cap(5).strip() + filename = file.replace(self.path + os.sep, "") + if filename not in self.changeListsDict[self.currentChangelist]: + self.changeListsDict[self.currentChangelist].append(filename) + elif self.currentChangelist != "" and self.rx_status2.exactMatch(s): + file = self.rx_status2.cap(2).strip() + filename = file.replace(self.path + os.sep, "") + if filename not in self.changeListsDict[self.currentChangelist]: + self.changeListsDict[self.currentChangelist].append(filename) + elif self.rx_changelist.exactMatch(s): + self.currentChangelist = self.rx_changelist.cap(1) + if self.currentChangelist not in self.changeListsDict: + self.changeListsDict[self.currentChangelist] = [] + + 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: + self.errorGroup.show() + s = str(self.process.readAllStandardError(), + Preferences.getSystem("IOEncoding"), + 'replace') + 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 subversion process. + """ + input = self.input.text() + input += os.linesep + + if self.passwordCheckBox.isChecked(): + self.errors.insertPlainText(os.linesep) + self.errors.ensureCursorVisible() + else: + self.errors.insertPlainText(input) + self.errors.ensureCursorVisible() + + self.process.write(input) + + 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().keyPressEvent(evt)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui Sun Jun 03 12:51:15 2012 +0200 @@ -0,0 +1,210 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>SvnChangeListsDialog</class> + <widget class="QDialog" name="SvnChangeListsDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>519</width> + <height>494</height> + </rect> + </property> + <property name="windowTitle"> + <string>Subversion Change Lists</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Change Lists:</string> + </property> + </widget> + </item> + <item> + <widget class="QListWidget" name="changeLists"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="whatsThis"> + <string><b>Change Lists</b> +<p>Select a change list here to see the associated files in the list below.</p></string> + </property> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="filesLabel"> + <property name="text"> + <string/> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QListWidget" name="filesList"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>2</verstretch> + </sizepolicy> + </property> + <property name="whatsThis"> + <string><b>Files</b> +<p>This shows a list of files associated with the change list selected above.</p></string> + </property> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + </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" 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 subversion 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 subversion 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>changeLists</tabstop> + <tabstop>filesList</tabstop> + <tabstop>errors</tabstop> + <tabstop>input</tabstop> + <tabstop>passwordCheckBox</tabstop> + <tabstop>sendButton</tabstop> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>SvnChangeListsDialog</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>SvnChangeListsDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>316</x> + <y>260</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py Sat Jun 02 17:41:24 2012 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py Sun Jun 03 12:51:15 2012 +0200 @@ -37,6 +37,8 @@ if vcs.version < (1, 5, 0): self.changeListsGroup.hide() + else: + self.changeLists.addItems(sorted(vcs.svnGetChangelists())) def showEvent(self, evt): """ @@ -74,10 +76,7 @@ @return flag indicating availability of changelists (boolean) """ - listsTxt = self.changeListsEdit.text() - lists = listsTxt.split(';') - slists = [l.strip() for l in lists if l.strip() != ""] - return len(slists) > 0 + return len(self.changeLists.selectedItems()) > 0 def changelistsData(self): """ @@ -86,9 +85,8 @@ @return tuple containing the changelists (list of strings) and a flag indicating to keep changelists (boolean) """ - listsTxt = self.changeListsEdit.text() - lists = listsTxt.split(';') - slists = [l.strip() for l in lists if l.strip() != ""] + slists = [l.text().strip() for l in self.changeLists.selectedItems() + if l.text().strip() != ""] if len(slists) == 0: return [], False
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.ui Sat Jun 02 17:41:24 2012 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.ui Sun Jun 03 12:51:15 2012 +0200 @@ -1,7 +1,8 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>SvnCommitDialog</class> - <widget class="QWidget" name="SvnCommitDialog" > - <property name="geometry" > + <widget class="QWidget" name="SvnCommitDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,43 +10,43 @@ <height>384</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Subversion</string> </property> - <layout class="QVBoxLayout" name="verticalLayout_3" > + <layout class="QVBoxLayout" name="verticalLayout_3"> <item> - <widget class="QGroupBox" name="logGroup" > - <property name="title" > + <widget class="QGroupBox" name="logGroup"> + <property name="title"> <string>Commit Message</string> </property> - <layout class="QVBoxLayout" name="verticalLayout" > + <layout class="QVBoxLayout" name="verticalLayout"> <item> - <widget class="QTextEdit" name="logEdit" > - <property name="toolTip" > + <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 name="whatsThis"> + <string><b>Log Message</b> +<p>Enter the log message for the commit action.</p></string> </property> - <property name="tabChangesFocus" > + <property name="tabChangesFocus"> <bool>true</bool> </property> - <property name="acceptRichText" > + <property name="acceptRichText"> <bool>false</bool> </property> </widget> </item> <item> - <widget class="QLabel" name="label" > - <property name="text" > + <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" > + <widget class="QComboBox" name="recentComboBox"> + <property name="toolTip"> <string>Select a recent commit message to use</string> </property> </widget> @@ -54,24 +55,24 @@ </widget> </item> <item> - <widget class="QGroupBox" name="changeListsGroup" > - <property name="title" > + <widget class="QGroupBox" name="changeListsGroup"> + <property name="title"> <string>Changelists</string> </property> - <layout class="QVBoxLayout" name="verticalLayout_2" > + <layout class="QVBoxLayout" name="verticalLayout_2"> <item> - <widget class="QLineEdit" name="changeListsEdit" > - <property name="toolTip" > - <string>Enter the list of changelists separated by ';'</string> + <widget class="QListWidget" name="changeLists"> + <property name="toolTip"> + <string>Select the change lists to limit the commit</string> </property> </widget> </item> <item> - <widget class="QCheckBox" name="keepChangeListsCheckBox" > - <property name="toolTip" > + <widget class="QCheckBox" name="keepChangeListsCheckBox"> + <property name="toolTip"> <string>Select to keep the changelists</string> </property> - <property name="text" > + <property name="text"> <string>Keep changelists</string> </property> </widget> @@ -80,23 +81,23 @@ </widget> </item> <item> - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="orientation" > + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="standardButtons" > + <property name="standardButtons"> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close|QDialogButtonBox::Ok</set> </property> </widget> </item> </layout> </widget> - <layoutdefault spacing="6" margin="6" /> + <layoutdefault spacing="6" margin="6"/> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <tabstops> <tabstop>logEdit</tabstop> <tabstop>recentComboBox</tabstop> - <tabstop>changeListsEdit</tabstop> + <tabstop>changeLists</tabstop> <tabstop>keepChangeListsCheckBox</tabstop> <tabstop>buttonBox</tabstop> </tabstops>
--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py Sat Jun 02 17:41:24 2012 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py Sun Jun 03 12:51:15 2012 +0200 @@ -43,6 +43,7 @@ from .SvnRelocateDialog import SvnRelocateDialog from .SvnUrlSelectionDialog import SvnUrlSelectionDialog from .SvnRepoBrowserDialog import SvnRepoBrowserDialog +from .SvnChangeListsDialog import SvnChangeListsDialog from .SvnStatusMonitorThread import SvnStatusMonitorThread from .SvnUtilities import getConfigPath, amendConfig, createDefaultConfig @@ -1929,11 +1930,12 @@ @param names name or list of names of file or directory to add (string) """ - clname, ok = QInputDialog.getText( + clname, ok = QInputDialog.getItem( None, self.trUtf8("Add to changelist"), self.trUtf8("Enter name of the changelist:"), - QLineEdit.Normal) + sorted(self.svnGetChangelists()), + 0, True) if not ok or not clname: return @@ -1953,6 +1955,55 @@ res = dia.startProcess(args, dname) if res: dia.exec_() + + def svnShowChangelists(self, path): + """ + Public method used to inspect the change lists defined for the project. + + @param path directory name to show change lists for (string) + """ + self.changeLists = SvnChangeListsDialog(self) + self.changeLists.show() + QApplication.processEvents() + self.changeLists.start(path) + + def svnGetChangelists(self): + """ + Public method to get a list of all defined change lists. + + @return list of defined change list names (list of strings) + """ + changelists = [] + rx_changelist = \ + QRegExp('--- \\S+ .([\\w\\s]+).:\\s*') + # three dashes, Changelist (translated), quote, + # changelist name, quote, : + + args = [] + args.append("status") + args.append("--non-interactive") + args.append(".") + + ppath = e5App().getObject("Project").getProjectPath() + process = QProcess() + process.setWorkingDirectory(ppath) + process.start('svn', args) + procStarted = process.waitForStarted() + 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 rx_changelist.exactMatch(line): + changelist = rx_changelist.cap(1) + if changelist not in changelists: + changelists.append(changelist) + + return changelists ############################################################################ ## Private Subversion specific methods are below.
--- a/changelog Sat Jun 02 17:41:24 2012 +0200 +++ b/changelog Sun Jun 03 12:51:15 2012 +0200 @@ -18,6 +18,9 @@ --- improved the copy/move operation a bit -- Mercurial --- added support for amending commits as of Mercurial 2.2 + -- Subversion + --- added capability to select from existing change lists and added a + dialog to browse the change lists - Web Browser -- extended the "Clear Private Data" dialog to clear flash cookies and to select a browsing history period to clear
--- a/eric5.e4p Sat Jun 02 17:41:24 2012 +0200 +++ b/eric5.e4p Sun Jun 03 12:51:15 2012 +0200 @@ -1012,6 +1012,8 @@ <Source>Tasks/Task.py</Source> <Source>Tasks/TaskFilter.py</Source> <Source>UI/SearchWidget.py</Source> + <Source>Plugins/VcsPlugins/vcsPySvn/SvnChangeListsDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py</Source> </Sources> <Forms> <Form>PyUnit/UnittestDialog.ui</Form> @@ -1301,6 +1303,8 @@ <Form>Snapshot/SnapWidget.ui</Form> <Form>UI/SearchWidget.ui</Form> <Form>Helpviewer/SiteInfo/SiteInfoNoSslDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsPySvn/SvnChangeListsDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui</Form> </Forms> <Translations> <Translation>i18n/eric5_cs.qm</Translation>
--- a/i18n/eric5_cs.ts Sat Jun 02 17:41:24 2012 +0200 +++ b/i18n/eric5_cs.ts Sun Jun 03 12:51:15 2012 +0200 @@ -39345,182 +39345,182 @@ <context> <name>Subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="223"/> <source>Create project in repository</source> <translation>Vytvořit projekt v repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="223"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation>Projekt nemůže být v repozitáři vytvořen. Buďto daný repozitář neexistuje nebo se nelze připojit k serveru s repozitářem.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="245"/> <source>New project</source> <translation>Nový projekt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="245"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation>Projekt se nepodařilo stáhnout (checkout) z repozitáře. <br />Obnovuji původní obsah.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="314"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="315"/> <source>Importing project into Subversion repository</source> <translation>Importovat projekt do Subversion repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="364"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="365"/> <source>Subversion Checkout</source> <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="427"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation>Tag musí být normální tag (tagy) nebo tag větve (větví). Prosím vyberte ze seznamu.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="385"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="386"/> <source>Checking project out of Subversion repository</source> <translation>Checkout projektu ze Subversion repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="427"/> <source>Subversion Export</source> <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="446"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="447"/> <source>Exporting project from Subversion repository</source> <translation>Exportuje projekt z Subversion repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="530"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="531"/> <source>Commiting changes to Subversion repository</source> <translation>Commit změn do Subversion repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="586"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="587"/> <source>Synchronizing with the Subversion repository</source> <translation>Synchronizovat se Subversion repozitářem</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="687"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="688"/> <source>Adding files/directories to the Subversion repository</source> <translation>Přidat soubory/adresáře do Subversion repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="786"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="787"/> <source>Adding directory trees to the Subversion repository</source> <translation>Přidat strom adresářů do Subversion repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="822"/> <source>Removing files/directories from the Subversion repository</source> <translation>Odebrat soubory/adresáře ze Subversion repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1127"/> <source>Subversion Error</source> <translation>Subversion chyba</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="987"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="988"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>Z pracovní kopie nelze získat URL repozitáře projektu. Operace tagování bude zrušena</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1011"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1012"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>URL repozitáře projektu má neplatný formát. Operace tagování bude zrušena</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1075"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1076"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1103"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>Z pracovní kopie nelze získat URL repozitáře projektu. Operace přepínání bude zrušena</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1127"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>URL repozitáře projektu má neplatný formát. Operace přepínání bude zrušena</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1564"/> <source>Subversion command</source> <translation>Subversion příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1670"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1671"/> <source>Resolving conficts</source> <translation>Řešení konfliktů</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1776"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1777"/> <source>Subversion Set Property</source> <translation>Nastavit Subversion vlastnost</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1809"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1810"/> <source>You have to supply a property name. Aborting.</source> <translation>Musíte doplnit jméno vlastnosti. Zrušeno.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1827"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1828"/> <source>Subversion Delete Property</source> <translation>Smazat Subversion vlastnost</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1647"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1648"/> <source>Enter property name</source> <translation>Zadejte jméno vlastnosti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="924"/> <source>Subversion Log</source> <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="924"/> <source>Select number of entries to show.</source> <translation>Vyberte počet položek, které se mají zobrazit.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1993"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1994"/> <source>Locking in the Subversion repository</source> <translation>Zamknout v Subversion repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2031"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2032"/> <source>Unlocking in the Subversion repository</source> <translation>Odemknout v Subversion repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1792"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1793"/> <source>Property set.</source> <translation>Vlastnost nastavena.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1842"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1843"/> <source>Property deleted.</source> <translation>Vlastnost smazána.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1974"/> <source>Subversion Lock</source> <translation>Subversion zámek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1974"/> <source>Enter lock comment</source> <translation>Zadejte komentář zámku</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2076"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2077"/> <source>Relocating</source> <translation></translation> </message> @@ -39675,37 +39675,37 @@ <translation>mimo verzi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="196"/> <source>The svn process did not finish within 30s.</source> <translation>Proces svn neskončil do 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="197"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="198"/> <source>Could not start the svn executable.</source> <translation>Nelze spustit svn proces.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2103"/> <source>Repository Browser</source> <translation>Prohlížeč repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2103"/> <source>Enter the repository URL.</source> <translation>Zadejte URL repozitáře.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2127"/> <source>Remove from changelist</source> <translation>Odebrat ze seznamu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2162"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2164"/> <source>Add to changelist</source> <translation>Přidat do seznamu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2152"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2153"/> <source>Enter name of the changelist:</source> <translation>Zadejte název seznamu změn:</translation> </message> @@ -39725,53 +39725,53 @@ <translation>Seznam změn byl přesunut</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="193"/> <source>The svn process finished with the exit code {0}</source> <translation>Proces svn skončil exit kódem {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="883"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="884"/> <source>Moving {0}</source> <translation>Přesun {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1047"/> <source>Tagging {0} in the Subversion repository</source> <translation>Tagování {0} v Subversion repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1148"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1149"/> <source>Switching to {0}</source> <translation>Přepínání do {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1250"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1251"/> <source>Merging {0}</source> <translation>Sloučení {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1527"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1528"/> <source>Cleaning up {0}</source> <translation>Vyčištění {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1709"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1710"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="330"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="331"/> <source>Imported revision {0}. </source> <translation>Inportovaná revize {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="555"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="556"/> <source>Committed revision {0}.</source> <translation>Zapsaná revize {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1155"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1156"/> <source>Revision {0}. </source> <translation>Revize {0}.</translation> @@ -39972,6 +39972,96 @@ </message> </context> <context> + <name>SvnChangeListsDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="14"/> + <source>Subversion Change Lists</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="23"/> + <source>Change Lists:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="36"/> + <source><b>Change Lists</b> +<p>Select a change list here to see the associated files in the list below.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="63"/> + <source><b>Files</b> +<p>This shows a list of files associated with the change list selected above.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="80"/> + <source>Errors</source> + <translation type="unfinished">Chyby</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="99"/> + <source>Input</source> + <translation type="unfinished">Vstup</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="121"/> + <source>Press to send the input to the subversion process</source> + <translation type="unfinished">Stisknout pro odeslání vstupu do procesu subversion</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="124"/> + <source>&Send</source> + <translation type="unfinished">Ode&slat</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="127"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="134"/> + <source>Enter data to be sent to the subversion process</source> + <translation type="unfinished">Zadejte data, která mají být do procesu subversion odeslána</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="141"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="144"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="147"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="75"/> + <source>Files (relative to {0}):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="138"/> + <source>No changelists found</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="109"/> + <source>Process Generation Error</source> + <translation type="unfinished">Chyba v procesu generování</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="109"/> + <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>SvnCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.ui" line="14"/> @@ -40058,55 +40148,60 @@ <context> <name>SvnCommitDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="25"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="26"/> <source>Enter the log message.</source> <translation>Zadání log zprávy.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="28"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="29"/> <source><b>Log Message</b> <p>Enter the log message for the commit action.</p></source> <translation><b>Log message</b><p>Zadejte log message pro provedení příkazu commit.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="13"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="14"/> <source>Subversion</source> <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="42"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="43"/> <source>Recent commit messages</source> <translation>Poslední commit zprávy</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="49"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="50"/> <source>Select a recent commit message to use</source> <translation>Výběr poslední commit zprávy</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="19"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="20"/> <source>Commit Message</source> <translation>Commit zpráva</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="59"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="60"/> <source>Changelists</source> <translation>Seznamy změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="72"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="73"/> <source>Select to keep the changelists</source> <translation>Vybrat pro zachování seznamů změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="75"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="76"/> <source>Keep changelists</source> <translation>Zachovat seznamy změn</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="65"/> <source>Enter the list of changelists separated by ';'</source> - <translation>Zadejte seznam seznamů změn oddělený ';'</translation> + <translation type="obsolete">Zadejte seznam seznamů změn oddělený ';'</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="66"/> + <source>Select the change lists to limit the commit</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -41616,122 +41711,122 @@ <translation><b>Zobrazit status</b><p>Zobrazí status lokálního projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="221"/> <source>Tag in repository</source> <translation>Vytvořit tag v repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="221"/> <source>&Tag in repository...</source> <translation>Vytvořit &tag v repozitáři...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="225"/> <source>Tag the local project in the repository</source> <translation>Vytvořit Tag - značku z lokálního projektu do repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="228"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Vytvořit tag v repozitáři</b><p>Z lokálního projektu vytvoří značku - tag v repozitáři.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="235"/> <source>Export from repository</source> <translation>Exportovat z repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="235"/> <source>&Export from repository...</source> <translation>&Exportovat z repozitáře...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="224"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="239"/> <source>Export a project from the repository</source> <translation>Export projekt z repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="227"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="242"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Exportovat z repozitáře</b><p>Exportuje projekt z repozitáře.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> <source>Command options</source> <translation>Parametry příkazu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> - <source>Command &options...</source> - <translation>&Parametry příkazu...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="237"/> - <source>Show the VCS command options</source> - <translation>Zobrazit parametry VCS příkazu</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="238"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> - <translation><b>Parametry příkazu...</b><p>Zobrazí se dialog s editací parametrů VCS příkazu.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> - <source>Revert changes</source> - <translation>Vrátit změny</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> - <source>Re&vert changes</source> - <translation>&Vrátit změny</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> - <source>Revert all changes made to the local project</source> - <translation>Vrátit všechny změny, které byly provedeny v lokálním projektu</translation> + <source>Command &options...</source> + <translation>&Parametry příkazu...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="252"/> + <source>Show the VCS command options</source> + <translation>Zobrazit parametry VCS příkazu</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="253"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation><b>Parametry příkazu...</b><p>Zobrazí se dialog s editací parametrů VCS příkazu.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <source>Revert changes</source> + <translation>Vrátit změny</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <source>Re&vert changes</source> + <translation>&Vrátit změny</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="264"/> + <source>Revert all changes made to the local project</source> + <translation>Vrátit všechny změny, které byly provedeny v lokálním projektu</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="267"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><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/vcsPySvn/ProjectHelper.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> <source>Merge</source> <translation>Sloučit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> <source>Mer&ge changes...</source> <translation>&Sloučit změny...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="263"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="278"/> <source>Merge changes of a tag/revision into the local project</source> <translation>Sloučit změny tagu/revize do lokálního projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="266"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="281"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation><b>Sloučit</b><p>Sloučí se změny tagu/revize do lokálního projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="288"/> <source>Switch</source> <translation>Přepnout</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="288"/> <source>S&witch...</source> <translation>&Přepnout...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="292"/> <source>Switch the local copy to another tag/branch</source> <translation>Přepnout lokální kopii do jiného tagu/větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="295"/> <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> <translation><b>Přepnout</b><p>Přepne lokální kopii do jiného tagu/větve.</p></translation> </message> @@ -41756,197 +41851,197 @@ <translation type="obsolete"><b>Vyřešit konflikty</b><p>Vyřeší se všechny konflikty v lokálním projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> <source>Cleanup</source> <translation>Vyčistit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> <source>Cleanu&p</source> <translation>V&yčistit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="318"/> <source>Cleanup the local project</source> <translation>Vyčistit lokální projekt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="321"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Vyčistit</b><p>Provede úklid lokálního projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="328"/> <source>Execute command</source> <translation>Provést příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="328"/> <source>E&xecute command...</source> <translation>P&rovést příkaz...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="331"/> <source>Execute an arbitrary VCS command</source> <translation>Provede se libovolný VCS příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="334"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation><b>Provést příkaz</b><p>Otevře se dialogové okno pro zadání libovolného příkazu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="341"/> <source>List tags</source> <translation>Seznam tagů</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="341"/> <source>List tags...</source> <translation>Seznam tagů...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> <source>List tags of the project</source> <translation>Seznam tagů projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="332"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="347"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Seznam tagů</b><p>Zobrazí seznam tagů projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="354"/> <source>List branches</source> <translation>Seznam větví</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="354"/> <source>List branches...</source> <translation>Seznam větví...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="342"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches of the project</source> <translation>Seznam větví projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="345"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="360"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Seznam větví</b><p>Zobrazí seznam větví projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="367"/> <source>List repository contents</source> <translation>Seznam obsahu repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="367"/> <source>List repository contents...</source> <translation>Seznam obsahu repozitáře...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="355"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="370"/> <source>Lists the contents of the repository</source> <translation>Vypisuje seznam obsahu repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="373"/> <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation><b>Seznam obsahu repozitáře</b><p>Zobrazuje seznam obsahu repozitáře.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="380"/> <source>Set Property</source> <translation>Nastavit vlastnosti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="380"/> <source>Set Property...</source> <translation>Nastavit vlastnosti...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="383"/> <source>Set a property for the project files</source> <translation>Nastaví vlastnosti souborů projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation><b>Nastavit vlastnosti</b><p>Nastavuje vlastnosti souborů projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> <source>List Properties</source> <translation>Seznam vlastností</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> <source>List Properties...</source> <translation>Seznam vlastností...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="381"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="396"/> <source>List properties of the project files</source> <translation>Seznam vlastností souborů projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation><b>Seznam vlastností</b><p>Vypisuje seznam vlastností souborů projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source>Delete Property</source> <translation>Smazat vlastnost</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source>Delete Property...</source> <translation>Smazat vlastnost...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="409"/> <source>Delete a property for the project files</source> <translation>Smaže vlastnost pro soubory projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="397"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="412"/> <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> <translation><b>Smazat vlastnost</b><p>Smaže vlastnost pro soubory projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="191"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> <source>Show repository info</source> <translation>Zobrazit info repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> <source>Show some repository related information for the local project</source> <translation>Zobrazí nějaké infomace související s repozitářem pro lokální projekt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="198"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/> <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> <translation><b>Zobrazit info repozitáře</b><p>Zobrazí nějaké infomace související s repozitářem pro lokální projekt.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> <source>Relocate</source> <translation>Přemístit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> <source>Relocate...</source> <translation>Přemístit...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="408"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="423"/> <source>Relocate the working copy to a new repository URL</source> <translation>Přemístit pracovní kopii do nového URL repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="411"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="426"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation><b>Přemístit</b><p>Pracovní kopie se přemístí na nové URL repozitáře.</p></translation> </message> @@ -41966,22 +42061,22 @@ <translation><b>Zobrazit odlišnosti (na URL)</b><p>Zobrazují se odlišnosti v projektu mezi dvěma repozitáři na URL.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="433"/> <source>Repository Browser</source> <translation>Prohlížeč repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="433"/> <source>Repository Browser...</source> <translation>Prohlížeč repozitáře...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="437"/> <source>Show the Repository Browser dialog</source> <translation>Zobrazit dialog prohlížeče repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="440"/> <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> <translation><b>Prohlížeč repozitáře</b><p>Zobrazí se dialogové okno prohlížeče repozitáře.</p></translation> </message> @@ -42001,45 +42096,60 @@ <translation><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/vcsPySvn/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> <source>Configure</source> <translation>Konfigurovat</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> <source>Configure...</source> <translation>Konfigurovat...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="450"/> <source>Show the configuration dialog with the Subversion page selected</source> <translation>Zobrazit konfigurační dialog s vybranou Subversion stranou</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="438"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="453"/> <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> <translation><b>Konfigurovat</b><p>Zobrazit konfigurační dialog s vybranou Subversion stranou.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="302"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="302"/> <source>Con&flicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="305"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="308"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="191"/> + <source>Show change lists</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> + <source>Show the change lists and associated files of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="198"/> + <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnPropDelDialog</name> @@ -42595,12 +42705,12 @@ <translation>Komitnout změny do repozitáře...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="701"/> <source>Lock</source> <translation>Zamknout</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="716"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="717"/> <source>Unlock</source> <translation>Odemknout</translation> </message> @@ -42715,32 +42825,32 @@ <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="584"/> <source>Commit</source> <translation>Commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="682"/> <source>There are no uncommitted changes available/selected.</source> <translation>Nezapsané změny nejsou dostupné/vybrané.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="701"/> <source>There are no unlocked files available/selected.</source> <translation>Odemčené soubory nejsou dostupné/vybrané.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="750"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="751"/> <source>There are no locked files available/selected.</source> <translation>Zamčené soubory nejsou dostupné/vybrané.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="733"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="734"/> <source>Break Lock</source> <translation>Prolomit zámek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="750"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="751"/> <source>Steal Lock</source> <translation>Scizit zámek</translation> </message> @@ -42755,17 +42865,17 @@ <translation>Vrátit změny</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="622"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="623"/> <source>Add</source> <translation>Přidat</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="622"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="623"/> <source>There are no unversioned entries available/selected.</source> <translation>Položky mimo verzi nejsou dostupné/vybrány.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="664"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="665"/> <source>Revert</source> <translation>Vrátit</translation> </message> @@ -42780,17 +42890,17 @@ <translation>Přidat do seznamu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="784"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="785"/> <source>Remove from Changelist</source> <translation>Odebrat ze seznamu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="766"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="767"/> <source>There are no files available/selected not belonging to a changelist.</source> <translation>Nejsou dostupné/vybrány soubory, které nepatří do seznamu změn.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="784"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="785"/> <source>There are no files available/selected belonging to a changelist.</source> <translation>Nejsou dostupné/vybrány soubory, které patří do seznamu změn.</translation> </message> @@ -42870,7 +42980,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="503"/> <source>all</source> <translation type="unfinished"></translation> </message> @@ -42880,17 +42990,17 @@ <translation type="obsolete">Odlišnosti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="682"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="584"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="664"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="665"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished">Chybějící záznamy nejsou dostupné/vybrány.</translation> </message> @@ -54999,17 +55109,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1604"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1605"/> <source>unknown</source> <translation>neznámý</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1474"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Informace z repozitáře</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Aktuální revize</b></td><td>{2}</td></tr><tr><td><b>Revize zápisu změn</b></td><td>{3}</td></tr><tr><td><b>Datum zápisu změn</b></td><td>{4}</td></tr><tr><td><b>Čas zápisu změn</b></td><td>{5}</td></tr><tr><td><b>Poslední autor</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1605"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1606"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Informace z repozitáře</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Aktuální revize</b></td><td>{4}</td></tr><tr><td><b>Revize zápisu změn</b></td><td>{5}</td></tr><tr><td><b>Datum zápisu změn</b></td><td>{6}</td></tr><tr><td><b>Čas zápisu změn</b></td><td>{7}</td></tr><tr><td><b>Poslední autor</b></td><td>{8}</td></tr></table></translation> </message>
--- a/i18n/eric5_de.ts Sat Jun 02 17:41:24 2012 +0200 +++ b/i18n/eric5_de.ts Sun Jun 03 12:51:15 2012 +0200 @@ -38112,224 +38112,224 @@ <context> <name>Subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="314"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="315"/> <source>Importing project into Subversion repository</source> <translation>Lade das Projekt in das Subversion Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="364"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="365"/> <source>Subversion Checkout</source> <translation>Subversion Checkout</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="385"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="386"/> <source>Checking project out of Subversion repository</source> <translation>Lade das Projekt aus dem Subversion Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="446"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="447"/> <source>Exporting project from Subversion repository</source> <translation>Expotiere das Projekt aus dem Subversion Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1127"/> <source>Subversion Error</source> <translation>Subversion Fehler</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="987"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="988"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>Die URL des Projektrepositories konnte nicht aus der Arbeitskopie ermittelt werden. Die Tag Operation wird abgebrochen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1011"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1012"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>Die URL des Projektrepositories hat ein ungültiges Format. Die Tag Operation wird abgebrochen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1047"/> <source>Tagging {0} in the Subversion repository</source> <translation>Markiere {0} im Subversion Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1103"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>Die URL des Projektrepositories konnte nicht aus der Arbeitskopie ermittelt werden. Die Umschaltoperation wird abgebrochen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1127"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>Die URL des Projektrepositories hat ein ungültiges Format. Die Umschaltoperation wird abgebrochen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1148"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1149"/> <source>Switching to {0}</source> <translation>Schalte {0} um</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1250"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1251"/> <source>Merging {0}</source> <translation>Arbeite Änderungen in {0} ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1527"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1528"/> <source>Cleaning up {0}</source> <translation>Räume {0} auf</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1564"/> <source>Subversion command</source> <translation>Subversion Befehl</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1709"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1710"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="883"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="884"/> <source>Moving {0}</source> <translation>Verschiebe {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="427"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation>Das Tag muß ein normales Tag (tags) oder ein Zweigtag (branches) sein. Bitte aus der Liste auswählen.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="427"/> <source>Subversion Export</source> <translation>Subversion Export</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1776"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1777"/> <source>Subversion Set Property</source> <translation>Subversion Eigenschaft definieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1809"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1810"/> <source>You have to supply a property name. Aborting.</source> <translation>Sie müssen einen Namen für die Eigenschaft angeben. Abbruch.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1827"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1828"/> <source>Subversion Delete Property</source> <translation>Subversion Eigenschaft löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1647"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1648"/> <source>Enter property name</source> <translation>Gib den Namen der Eigenschaft ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="530"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="531"/> <source>Commiting changes to Subversion repository</source> <translation>Pflege Änderungen in das Subversion Repository ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="586"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="587"/> <source>Synchronizing with the Subversion repository</source> <translation>Gleiche mit dem Subversion Repository ab</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="687"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="688"/> <source>Adding files/directories to the Subversion repository</source> <translation>Füge Dateien/Verzeichnisse dem Subversion Repository hinzu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="786"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="787"/> <source>Adding directory trees to the Subversion repository</source> <translation>Füge Verzeichnisbäume dem Subversion Repository hinzu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="822"/> <source>Removing files/directories from the Subversion repository</source> <translation>Lösche Dateien/Verzeichnisse aus dem Subversion Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1075"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1076"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1670"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1671"/> <source>Resolving conficts</source> <translation>Löse Konflikte</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="223"/> <source>Create project in repository</source> <translation>Projekt im Repository anlegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="223"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation>Das Projekt konnte nicht im Repository angelegt werden. Vielleicht existiert das angegebene Repository nicht oder der Repository-Server ist nicht verfügbar.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="245"/> <source>New project</source> <translation>Neues Projekt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="245"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation>Das Projekt konnte nicht aus dem Repository geladen werden.<br />Stelle das Original wieder her.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="924"/> <source>Subversion Log</source> <translation>Subversion Log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="924"/> <source>Select number of entries to show.</source> <translation>Wähle Anzahl der anzuzeigenden Einträge.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1993"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1994"/> <source>Locking in the Subversion repository</source> <translation>Sperren im Subversion Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2031"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2032"/> <source>Unlocking in the Subversion repository</source> <translation>Entsperren im Subversion Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="555"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="556"/> <source>Committed revision {0}.</source> <translation>Revision {0} eingepflegt.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1155"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1156"/> <source>Revision {0}. </source> <translation>Revision {0}. </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1792"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1793"/> <source>Property set.</source> <translation>Eigenschaft definiert.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1842"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1843"/> <source>Property deleted.</source> <translation>Eigenschaft gelöscht.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1974"/> <source>Subversion Lock</source> <translation>Subversion Sperre</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1974"/> <source>Enter lock comment</source> <translation>Gib eine Kommentar für die Sperre ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2076"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2077"/> <source>Relocating</source> <translation>Relozierung</translation> </message> @@ -38484,49 +38484,49 @@ <translation>unversioniert</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="330"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="331"/> <source>Imported revision {0}. </source> <translation>Revision {0} importiert. </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="193"/> <source>The svn process finished with the exit code {0}</source> <translation>Der svn Prozess endete mit dem Code {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="196"/> <source>The svn process did not finish within 30s.</source> <translation>Der svn Prozess endete nicht innerhalb von 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="197"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="198"/> <source>Could not start the svn executable.</source> <translation>Das svn Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2103"/> <source>Repository Browser</source> <translation>Repository Browser</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2103"/> <source>Enter the repository URL.</source> <translation>Gib die URL des Repository ein.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2127"/> <source>Remove from changelist</source> <translation>Von Änderungsliste entfernen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2162"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2164"/> <source>Add to changelist</source> <translation>Zu Änderungsliste hinzufügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2152"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2153"/> <source>Enter name of the changelist:</source> <translation>Gib deb Namen der Änderungsliste ein:</translation> </message> @@ -38741,6 +38741,98 @@ </message> </context> <context> + <name>SvnChangeListsDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="14"/> + <source>Subversion Change Lists</source> + <translation>Subversion Änderungslisten</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="23"/> + <source>Change Lists:</source> + <translation>Änderungslisten:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="36"/> + <source><b>Change Lists</b> +<p>Select a change list here to see the associated files in the list below.</p></source> + <translation><b>Änderungslisten</b> +<p>Wähle eine Änderungsliste aus, um unten die zugeordneten Dateien zu sehen.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="63"/> + <source><b>Files</b> +<p>This shows a list of files associated with the change list selected above.</p></source> + <translation><b>Dateien</b> +<p>Dies zeigt eine Liste der Dateien an, die der oben ausgewählten Änderungsliste zugeordnet sind.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="80"/> + <source>Errors</source> + <translation>Fehler</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="99"/> + <source>Input</source> + <translation>Eingabe</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="121"/> + <source>Press to send the input to the subversion process</source> + <translation>Drücken um die Eingabe an den Subversion Prozess zu senden</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="124"/> + <source>&Send</source> + <translation>Sen&den</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="127"/> + <source>Alt+S</source> + <translation>Alt+D</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="134"/> + <source>Enter data to be sent to the subversion process</source> + <translation>Gib die Daten ein, die an den Subversion Prozess geschickt werden sollen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="141"/> + <source>Select to switch the input field to password mode</source> + <translation>Anwählen, um den Kennwort Modus für das Eingabefeld auszuwählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="144"/> + <source>&Password Mode</source> + <translation>&Kennwort Modus</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="147"/> + <source>Alt+P</source> + <translation>Alt+K</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="75"/> + <source>Files (relative to {0}):</source> + <translation>Dateien (relativ zu {0}):</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="138"/> + <source>No changelists found</source> + <translation>Keine Änderungslisten gefunden</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="109"/> + <source>Process Generation Error</source> + <translation>Fehler beim Prozessstart</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="109"/> + <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>SvnCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py" line="70"/> @@ -38831,56 +38923,56 @@ <context> <name>SvnCommitDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="25"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="26"/> <source>Enter the log message.</source> <translation>Die Änderungsbeschreibung eingeben.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="28"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.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/vcsPySvn/SvnCommitDialog.ui" line="13"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="14"/> <source>Subversion</source> <translation>Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="42"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="43"/> <source>Recent commit messages</source> <translation>Letzte Änderungsbeschreibungen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="49"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.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/vcsPySvn/SvnCommitDialog.ui" line="19"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="20"/> <source>Commit Message</source> <translation>Änderungsbeschreibung</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="59"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="60"/> <source>Changelists</source> <translation>Änderungslisten</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="72"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="73"/> <source>Select to keep the changelists</source> <translation>Auswählen, um die Änderungslisten zu erhalten</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="75"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="76"/> <source>Keep changelists</source> <translation>Änderungslisten erhalten</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="65"/> - <source>Enter the list of changelists separated by ';'</source> - <translation>Gib die Liste der Änderungslisten durch ';' getrennt ein</translation> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="66"/> + <source>Select the change lists to limit the commit</source> + <translation>Wähle Änderungslisten aus, um die Einpflegeaktion zu begrenzen</translation> </message> </context> <context> @@ -40337,317 +40429,317 @@ <translation><b>Status anzeigen</b><p>Dies zeigt den Status des lokalen Projektes an.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="221"/> <source>Tag in repository</source> <translation>Im Repository markieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="221"/> <source>&Tag in repository...</source> <translation>Im Repository &markieren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="225"/> <source>Tag the local project in the repository</source> <translation>Das lokale Projekt im Repository markieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="228"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Im Repository markieren</b><p>Dies markiert das lokale Projekt im Repository.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="235"/> <source>Export from repository</source> <translation>Export aus Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="235"/> <source>&Export from repository...</source> <translation>&Export aus Repository...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="224"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="239"/> <source>Export a project from the repository</source> <translation>Exportiert ein Projekt aus dem Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="227"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="242"/> <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/vcsPySvn/ProjectHelper.py" line="234"/> - <source>Command options</source> - <translation>Befehlsoptionen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> - <source>Command &options...</source> - <translation>Befehls&optionen...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="237"/> - <source>Show the VCS command options</source> - <translation>Zeigt die VCS Befehlsoptionen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="238"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> - <translation><b>Befehlsoptionen...</b><p>Dies öffnet einen Dialog zur Eingabe der VCS Befehlsoptionen.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> - <source>Revert changes</source> - <translation>Änderungen rückgängig</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> - <source>Re&vert changes</source> - <translation>Änderungen &rückgängig</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> - <source>Revert all changes made to the local project</source> - <translation>Alle Änderungen am lokalen Projekt werden rückgängig gemacht</translation> + <source>Command options</source> + <translation>Befehlsoptionen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> + <source>Command &options...</source> + <translation>Befehls&optionen...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="252"/> + <source>Show the VCS command options</source> + <translation>Zeigt die VCS Befehlsoptionen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="253"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation><b>Befehlsoptionen...</b><p>Dies öffnet einen Dialog zur Eingabe der VCS Befehlsoptionen.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <source>Revert changes</source> + <translation>Änderungen rückgängig</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <source>Re&vert changes</source> + <translation>Änderungen &rückgängig</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="264"/> + <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/vcsPySvn/ProjectHelper.py" line="267"/> <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 werden rückgängig.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> <source>Merge</source> <translation>Änderungen einpflegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> <source>Mer&ge changes...</source> <translation>Änderungen ein&pflegen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="263"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="278"/> <source>Merge changes of a tag/revision into the local project</source> <translation>Pflege Änderungen eines Tags/Zweiges in das lokale Projekt ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="266"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="281"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation><b>Änderungen einpflegen</b><p>Dies pfleget Änderungen eines Tags/Zweiges in das lokale Projekt ein.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="288"/> <source>Switch</source> <translation>Umschalten</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="288"/> <source>S&witch...</source> <translation>Umschal&ten...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="292"/> <source>Switch the local copy to another tag/branch</source> <translation>Schalte die lokale Kopie auf ein anderes Tag/anderen Zweig um</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="295"/> <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> <translation><b>Umschalten</b><p>Dies schaltet die lokale Kopie auf ein anderes Tag/anderen Zweig um.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> <source>Cleanup</source> <translation>Aufräumen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> <source>Cleanu&p</source> <translation>Au&fräumen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="318"/> <source>Cleanup the local project</source> <translation>Räume das lokale Projekt auf</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="321"/> <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/vcsPySvn/ProjectHelper.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="328"/> <source>Execute command</source> <translation>Befehl ausführen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="328"/> <source>E&xecute command...</source> <translation>Befehl ausf&ühren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="331"/> <source>Execute an arbitrary VCS command</source> <translation>Führe einen beliebigen VCS Befehl aus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="334"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation><b>Befehl ausführen</b><p>Dies öffnet einen Dialog zur Eingabe eines beliebeigen VCS Befehls.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="341"/> <source>List tags</source> <translation>Marken listen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="341"/> <source>List tags...</source> <translation>Marken listen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> <source>List tags of the project</source> <translation>Listet Marken des Projektes</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="332"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="347"/> <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/vcsPySvn/ProjectHelper.py" line="339"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="354"/> <source>List branches</source> <translation>Zweige listen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="354"/> <source>List branches...</source> <translation>Zweige listen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="342"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches of the project</source> <translation>Listet Zweige des Projektes</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="345"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="360"/> <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/vcsPySvn/ProjectHelper.py" line="352"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="367"/> <source>List repository contents</source> <translation>Repository Inhalt listen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="367"/> <source>List repository contents...</source> <translation>Repository Inhalt listen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="355"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="370"/> <source>Lists the contents of the repository</source> <translation>Listet den Inhalt des Repositories</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="373"/> <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation><b>Repository Inhalt listen</b><p>Dies listet den Inhalt des Repositories.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="380"/> <source>Set Property</source> <translation>Eigenschaft definieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="380"/> <source>Set Property...</source> <translation>Eigenschaft definieren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="383"/> <source>Set a property for the project files</source> <translation>Definiert eine Eigenschaft für alle Projektdateien</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation><b>Eigenschaft definieren</b><p>Dies definiert eine Eigenschaft für alle Projektdateien.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> <source>List Properties</source> <translation>Eigenschaften listen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> <source>List Properties...</source> <translation>Eigenschaften listen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="381"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="396"/> <source>List properties of the project files</source> <translation>Listet Eigenschaften der Projektdateien</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation><b>Eigenschaften listen</b<p>Dies listet die Eigenschaften der Projektdateien.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source>Delete Property</source> <translation>Eigenschaft löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source>Delete Property...</source> <translation>Eigenschaft löschen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="409"/> <source>Delete a property for the project files</source> <translation>Eine Eigenschaft für alle Projektdateien löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="397"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="412"/> <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> <translation><b>Eigenschaft löschen</b><p>Dies löscht eine Eigenschaft für alle Projektdateien.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="191"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> <source>Show repository info</source> <translation>Zeige Repository Informationen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> <source>Show some repository related information for the local project</source> <translation>Zeige Repository bezogene Informationen des lokalen Projektes an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> <source>Relocate</source> <translation>Relozieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> <source>Relocate...</source> <translation>Relozieren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="408"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="423"/> <source>Relocate the working copy to a new repository URL</source> <translation>Reloziere die Arbeitskopie zu einer neuen Repository URL</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="411"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="426"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation><b>Relozieren</b><p>Dies reloziert die Arbeitskopie zu einer neuen Repository URL.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="198"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/> <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> <translation><b>Zeige Repository Informationen</b><p>Dies zeigt Repository bezogene Informationen des lokalen Projektes an.</p></translation> </message> @@ -40667,22 +40759,22 @@ <translation><b>Unterschiede anzeigen (URLs)</b><p>Dies zeigt den Unterschied des Projektes zwischen zwei Repository URLs.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="433"/> <source>Repository Browser</source> <translation>Repository Browser</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="433"/> <source>Repository Browser...</source> <translation>Repository Browser...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="437"/> <source>Show the Repository Browser dialog</source> <translation>Zeigt den Repository Browser Dialog</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="440"/> <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> <translation><b>Repository Browser...</b><p>Dies zeigt den Repository Browser Dialog.</p></translation> </message> @@ -40702,45 +40794,60 @@ <translation><b>Zeige Log Browser</b><p>Dies zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen. Zunächst wird nur eine begrenzte Anzahl an Einträgen angezeigt. Weitere können später geholt werden.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> <source>Configure</source> <translation>Einstellungen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> <source>Configure...</source> <translation>Einstellungen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="450"/> <source>Show the configuration dialog with the Subversion page selected</source> <translation>Zeigt den Konfigurationsdialog mit ausgewählter Subversion Seite</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="438"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="453"/> <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> <translation><b>Einstellungen</b><p>Zeigt den Konfigurationsdialog mit ausgewählter Subversion Seite.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="302"/> <source>Conflicts resolved</source> <translation>Konflikte gelöst</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="302"/> <source>Con&flicts resolved</source> <translation>&Konflikte gelöst</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="305"/> <source>Mark all conflicts of the local project as resolved</source> <translation>Markiert alle Konflikte des lokalen Projektes als gelöst</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="308"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation><b>Konflikte gelöst</b><p>Dies markiert alle Konflikte des lokalen Projektes als gelöst.</p></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="191"/> + <source>Show change lists</source> + <translation>Änderungslisten anzeigen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> + <source>Show the change lists and associated files of the local project</source> + <translation>Zeige die Änderungslisten des lokalen Projektes und die zugehörigen Dateien an</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="198"/> + <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> + <translation><b>Änderungslisten anzeigen</b><p>Dies zeigt die Änderungslisten des lokalen Projektes und die zugehörigen Dateien an</p></translation> + </message> </context> <context> <name>SvnPropDelDialog</name> @@ -41239,22 +41346,22 @@ <translation>Änderungen einpflegen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="584"/> <source>Commit</source> <translation>Einpflegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="682"/> <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/vcsPySvn/SvnStatusDialog.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="701"/> <source>Lock</source> <translation>Sperren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="716"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="717"/> <source>Unlock</source> <translation>Entsperren</translation> </message> @@ -41299,22 +41406,22 @@ <translation>ersetzt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="701"/> <source>There are no unlocked files available/selected.</source> <translation>Es sind keine ungesperrten Dateien vorhanden/ausgewählt.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="750"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="751"/> <source>There are no locked files available/selected.</source> <translation>Es sind keine gesperrten Dateien vorhanden/ausgewählt.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="733"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="734"/> <source>Break Lock</source> <translation>Sperre brechen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="750"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="751"/> <source>Steal Lock</source> <translation>Sperre stehlen</translation> </message> @@ -41456,17 +41563,17 @@ <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="622"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="623"/> <source>Add</source> <translation>Hinzufügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="622"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="623"/> <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/vcsPySvn/SvnStatusDialog.py" line="664"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="665"/> <source>Revert</source> <translation>Rückgängig machen</translation> </message> @@ -41486,17 +41593,17 @@ <translation>Zu Änderungsliste hinzufügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="784"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="785"/> <source>Remove from Changelist</source> <translation>Von Änderungsliste entfernen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="766"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="767"/> <source>There are no files available/selected not belonging to a changelist.</source> <translation>Es sind keine Dateien vorhanden/ausgewählt, die nicht zu einer Änderungsliste gehören.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="784"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="785"/> <source>There are no files available/selected belonging to a changelist.</source> <translation>Es sind keine Dateien vorhanden/ausgewählt, die zu einer Änderungsliste gehören.</translation> </message> @@ -41571,22 +41678,22 @@ <translation>Fehlende wiederherstellen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="503"/> <source>all</source> <translation>alle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="682"/> <source>Differences</source> <translation>Unterschiede</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="584"/> <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/vcsPySvn/SvnStatusDialog.py" line="664"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="665"/> <source>There are no missing entries available/selected.</source> <translation>Es sind keine fehlenden Einträge vorhanden/ausgewählt.</translation> </message> @@ -53282,17 +53389,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1474"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Repository Informationen</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Aktuelle Revision</b></td><td>{2}</td></tr><tr><td><b>Eingepflegte Revision</b></td><td>{3}</td></tr><tr><td><b>Einpflegedatum</b></td><td>{4}</td></tr><tr><td><b>Einpflegezeit</b></td><td>{5}</td></tr><tr><td><b>Letzter Autor</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1604"/> - <source>unknown</source> - <translation>Unbekannt</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1605"/> + <source>unknown</source> + <translation>Unbekannt</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1606"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Repository Informationen</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Aktuelle Revision</b></td><td>{4}</td></tr><tr><td><b>Eingepflegte Revision</b></td><td>{5}</td></tr><tr><td><b>Einpflegedatum</b></td><td>{6}</td></tr><tr><td><b>Einpflegezeit</b></td><td>{7}</td></tr><tr><td><b>Letzter Autor</b></td><td>{8}</td></tr></table></translation> </message>
--- a/i18n/eric5_en.ts Sat Jun 02 17:41:24 2012 +0200 +++ b/i18n/eric5_en.ts Sun Jun 03 12:51:15 2012 +0200 @@ -37746,269 +37746,269 @@ <context> <name>Subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="193"/> <source>The svn process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="196"/> <source>The svn process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="197"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="198"/> <source>Could not start the svn executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="223"/> <source>Create project in repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="223"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="245"/> <source>New project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="245"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="314"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="315"/> <source>Importing project into Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="364"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="365"/> <source>Subversion Checkout</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="427"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="385"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="386"/> <source>Checking project out of Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="427"/> <source>Subversion Export</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="446"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="447"/> <source>Exporting project from Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="530"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="531"/> <source>Commiting changes to Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="586"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="587"/> <source>Synchronizing with the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="687"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="688"/> <source>Adding files/directories to the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="786"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="787"/> <source>Adding directory trees to the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="822"/> <source>Removing files/directories from the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="883"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="884"/> <source>Moving {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1127"/> <source>Subversion Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="987"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="988"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1011"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1012"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1047"/> <source>Tagging {0} in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1075"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1076"/> <source>Reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1103"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1127"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1148"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1149"/> <source>Switching to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1250"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1251"/> <source>Merging {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1527"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1528"/> <source>Cleaning up {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1564"/> <source>Subversion command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1670"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1671"/> <source>Resolving conficts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1709"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1710"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1776"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1777"/> <source>Subversion Set Property</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1809"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1810"/> <source>You have to supply a property name. Aborting.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1827"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1828"/> <source>Subversion Delete Property</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1647"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1648"/> <source>Enter property name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="924"/> <source>Subversion Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="924"/> <source>Select number of entries to show.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1993"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1994"/> <source>Locking in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2031"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2032"/> <source>Unlocking in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2076"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2077"/> <source>Relocating</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2103"/> <source>Repository Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2103"/> <source>Enter the repository URL.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2127"/> <source>Remove from changelist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2162"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2164"/> <source>Add to changelist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2152"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2153"/> <source>Enter name of the changelist:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="330"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="331"/> <source>Imported revision {0}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="555"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="556"/> <source>Committed revision {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1155"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1156"/> <source>Revision {0}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1792"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1793"/> <source>Property set.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1842"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1843"/> <source>Property deleted.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1974"/> <source>Subversion Lock</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1974"/> <source>Enter lock comment</source> <translation type="unfinished"></translation> </message> @@ -38373,6 +38373,96 @@ </message> </context> <context> + <name>SvnChangeListsDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="14"/> + <source>Subversion Change Lists</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="23"/> + <source>Change Lists:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="36"/> + <source><b>Change Lists</b> +<p>Select a change list here to see the associated files in the list below.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="63"/> + <source><b>Files</b> +<p>This shows a list of files associated with the change list selected above.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="80"/> + <source>Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="99"/> + <source>Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="121"/> + <source>Press to send the input to the subversion process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="124"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="127"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="134"/> + <source>Enter data to be sent to the subversion process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="141"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="144"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="147"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="75"/> + <source>Files (relative to {0}):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="138"/> + <source>No changelists found</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="109"/> + <source>Process Generation Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="109"/> + <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>SvnCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.ui" line="14"/> @@ -38456,56 +38546,56 @@ <context> <name>SvnCommitDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="13"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="14"/> <source>Subversion</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="19"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="20"/> <source>Commit Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="25"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="26"/> <source>Enter the log message.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="28"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.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/vcsPySvn/SvnCommitDialog.ui" line="42"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="43"/> <source>Recent commit messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="49"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="50"/> <source>Select a recent commit message to use</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="59"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="60"/> <source>Changelists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="65"/> - <source>Enter the list of changelists separated by ';'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="72"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="73"/> <source>Select to keep the changelists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="75"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="76"/> <source>Keep changelists</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="66"/> + <source>Select the change lists to limit the commit</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnCopyDialog</name> @@ -39968,378 +40058,393 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="221"/> <source>Tag in repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="221"/> <source>&Tag in repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="225"/> <source>Tag the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="228"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="235"/> <source>Export from repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="235"/> <source>&Export from repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="224"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="239"/> <source>Export a project from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="227"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="242"/> <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/vcsPySvn/ProjectHelper.py" line="234"/> - <source>Command options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> - <source>Command &options...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="237"/> - <source>Show the VCS command options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="238"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> - <source>Revert changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> - <source>Re&vert changes</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> - <source>Revert all changes made to the local project</source> + <source>Command options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> + <source>Command &options...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="252"/> + <source>Show the VCS command options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="253"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <source>Revert changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <source>Re&vert changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="264"/> + <source>Revert all changes made to the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="267"/> <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/vcsPySvn/ProjectHelper.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> <source>Mer&ge changes...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="263"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="278"/> <source>Merge changes of a tag/revision into the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="266"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="281"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="288"/> <source>Switch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="288"/> <source>S&witch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="292"/> <source>Switch the local copy to another tag/branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="295"/> <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> <source>Cleanup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> <source>Cleanu&p</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="318"/> <source>Cleanup the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="321"/> <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/vcsPySvn/ProjectHelper.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="328"/> <source>Execute command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="328"/> <source>E&xecute command...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="331"/> <source>Execute an arbitrary VCS command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="334"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="341"/> <source>List tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="341"/> <source>List tags...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> <source>List tags of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="332"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="347"/> <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/vcsPySvn/ProjectHelper.py" line="339"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="354"/> <source>List branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="354"/> <source>List branches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="342"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="345"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="360"/> <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/vcsPySvn/ProjectHelper.py" line="352"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="367"/> <source>List repository contents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="367"/> <source>List repository contents...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="355"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="370"/> <source>Lists the contents of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="373"/> <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="380"/> <source>Set Property</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="380"/> <source>Set Property...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="383"/> <source>Set a property for the project files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> <source>List Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> <source>List Properties...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="381"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="396"/> <source>List properties of the project files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source>Delete Property</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source>Delete Property...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="409"/> <source>Delete a property for the project files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="397"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="412"/> <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> <source>Relocate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> <source>Relocate...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="408"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="423"/> <source>Relocate the working copy to a new repository URL</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="411"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="426"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="433"/> <source>Repository Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="433"/> <source>Repository Browser...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="437"/> <source>Show the Repository Browser dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="440"/> <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> <source>Configure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> <source>Configure...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="450"/> <source>Show the configuration dialog with the Subversion page selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="438"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="453"/> <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> + <source>Show repository info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> + <source>Show some repository related information for the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/> + <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="302"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="302"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="305"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="308"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="191"/> - <source>Show repository info</source> + <source>Show change lists</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> - <source>Show some repository related information for the local project</source> + <source>Show the change lists and associated files of the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="198"/> - <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> - <source>Conflicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> - <source>Con&flicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> <translation type="unfinished"></translation> </message> </context> @@ -40913,17 +41018,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="784"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="785"/> <source>Remove from Changelist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="701"/> <source>Lock</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="716"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="717"/> <source>Unlock</source> <translation type="unfinished"></translation> </message> @@ -41043,57 +41148,57 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="584"/> <source>Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="682"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="622"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="623"/> <source>Add</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="622"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="623"/> <source>There are no unversioned entries available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="664"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="665"/> <source>Revert</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="701"/> <source>There are no unlocked files available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="750"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="751"/> <source>There are no locked files available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="733"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="734"/> <source>Break Lock</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="750"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="751"/> <source>Steal Lock</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="766"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="767"/> <source>There are no files available/selected not belonging to a changelist.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="784"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="785"/> <source>There are no files available/selected belonging to a changelist.</source> <translation type="unfinished"></translation> </message> @@ -41168,22 +41273,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="503"/> <source>all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="682"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="584"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="664"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="665"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> @@ -52797,17 +52902,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1474"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1604"/> - <source>unknown</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1605"/> + <source>unknown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1606"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_es.ts Sat Jun 02 17:41:24 2012 +0200 +++ b/i18n/eric5_es.ts Sun Jun 03 12:51:15 2012 +0200 @@ -38160,202 +38160,202 @@ <context> <name>Subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="196"/> <source>The svn process did not finish within 30s.</source> <translation>El proceso svn no terminó en un plazo de 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="197"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="198"/> <source>Could not start the svn executable.</source> <translation>No se ha podido ejecutar svn.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="223"/> <source>Create project in repository</source> <translation>Crear proyecto en el repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="223"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation>El proyecto no se ha podido crear en el repositorio. Quizá el repositorio proporcionado no existe o el servidor está caído.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="245"/> <source>New project</source> <translation>Proyecto nuevo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="245"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation>No se ha podido hacer un checkout del proyecto en el repositorio.<br/>Restaurando los contenidos originales.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="314"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="315"/> <source>Importing project into Subversion repository</source> <translation>Importando proyecto al repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="364"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="365"/> <source>Subversion Checkout</source> <translation>Checkout de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="427"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation>El tag debe ser una tag (tags) normal o branch (branches). Por favor, seleccione de la lista.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="385"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="386"/> <source>Checking project out of Subversion repository</source> <translation>Haciendo checkout del proyecto desde el repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="427"/> <source>Subversion Export</source> <translation>Export de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="446"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="447"/> <source>Exporting project from Subversion repository</source> <translation>Exportando proyecto desde el repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="530"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="531"/> <source>Commiting changes to Subversion repository</source> <translation>Haciendo commit de los cambios al repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="586"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="587"/> <source>Synchronizing with the Subversion repository</source> <translation>Sincronizando con el repositorio de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="687"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="688"/> <source>Adding files/directories to the Subversion repository</source> <translation>Añadiendo archivos/directorios al repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="786"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="787"/> <source>Adding directory trees to the Subversion repository</source> <translation>Añadiendo árboles de directorios al repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="822"/> <source>Removing files/directories from the Subversion repository</source> <translation>Eliminando archivos/directorios del repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1127"/> <source>Subversion Error</source> <translation>Error de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="987"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="988"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>La URL del repositorio del proyecto no ha podido recuperarse de la copia de trabajo. La operación tag se abortará</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1011"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1012"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>La URL del repositorio del proyecto tiene un formato no válido. La operación tag se abortará</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1075"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1076"/> <source>Reverting changes</source> <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1103"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>La URL del repositorio del proyecto no ha podido recuperarse de la copia de trabajo. La operación switch se abortará</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1127"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>La URL del repositorio del proyecto tiene un formato no válido. La operación switch se abortará</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1564"/> <source>Subversion command</source> <translation>Comando de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1670"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1671"/> <source>Resolving conficts</source> <translation>Resolviendo conflictos</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1776"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1777"/> <source>Subversion Set Property</source> <translation>Asignar Propiedad de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1809"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1810"/> <source>You have to supply a property name. Aborting.</source> <translation>Tiene que proporcionar un nombre de propiedad. Abortando.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1827"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1828"/> <source>Subversion Delete Property</source> <translation>Borrar Propiedad de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1647"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1648"/> <source>Enter property name</source> <translation>Introducir nombre de la propiedad</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="924"/> <source>Subversion Log</source> <translation>Log de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="924"/> <source>Select number of entries to show.</source> <translation>Seleccionar número de entradas a mostrar.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1993"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1994"/> <source>Locking in the Subversion repository</source> <translation>Bloqueando en el repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2031"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2032"/> <source>Unlocking in the Subversion repository</source> <translation>Desbloqueando en el repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1792"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1793"/> <source>Property set.</source> <translation>Propiedad establecida.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1842"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1843"/> <source>Property deleted.</source> <translation>Propiedad borrada.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1974"/> <source>Subversion Lock</source> <translation>Bloqueo de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1974"/> <source>Enter lock comment</source> <translation>Introducir comentario para el bloqueo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2076"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2077"/> <source>Relocating</source> <translation>Realojando</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2103"/> <source>Repository Browser</source> <translation>Navegador de Repositorios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2103"/> <source>Enter the repository URL.</source> <translation>Introducir la URL del repositorio.</translation> </message> @@ -38510,17 +38510,17 @@ <translation>Sin versionar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2127"/> <source>Remove from changelist</source> <translation>Quitar de la lista de cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2162"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2164"/> <source>Add to changelist</source> <translation>Añadir a la lista de cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2152"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2153"/> <source>Enter name of the changelist:</source> <translation>Introduzca el nombre de la lista de cambios:</translation> </message> @@ -38540,53 +38540,53 @@ <translation>Lista de cambios movida</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="193"/> <source>The svn process finished with the exit code {0}</source> <translation>El proceso svn ha terminado con código de salida {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="883"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="884"/> <source>Moving {0}</source> <translation>Moviendo {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1047"/> <source>Tagging {0} in the Subversion repository</source> <translation>Haciendo un tag {0} en el repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1148"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1149"/> <source>Switching to {0}</source> <translation>Haciendo un switch a {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1250"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1251"/> <source>Merging {0}</source> <translation>Haciendo un merge de {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1527"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1528"/> <source>Cleaning up {0}</source> <translation>Limpiando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1709"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1710"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="330"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="331"/> <source>Imported revision {0}. </source> <translation>Importada revisión {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="555"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="556"/> <source>Committed revision {0}.</source> <translation>Commit realizado para revisión {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1155"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1156"/> <source>Revision {0}. </source> <translation>Revisión {0}.</translation> @@ -38787,6 +38787,96 @@ </message> </context> <context> + <name>SvnChangeListsDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="14"/> + <source>Subversion Change Lists</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="23"/> + <source>Change Lists:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="36"/> + <source><b>Change Lists</b> +<p>Select a change list here to see the associated files in the list below.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="63"/> + <source><b>Files</b> +<p>This shows a list of files associated with the change list selected above.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="80"/> + <source>Errors</source> + <translation type="unfinished">Errores</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="99"/> + <source>Input</source> + <translation type="unfinished">Input</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="121"/> + <source>Press to send the input to the subversion process</source> + <translation type="unfinished">Pulsar para enviar el input al proceso de subversion</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="124"/> + <source>&Send</source> + <translation type="unfinished">&Enviar</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="127"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="134"/> + <source>Enter data to be sent to the subversion process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="141"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished">Seleccionar para cambiar el campo de input a modo contraseña</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="144"/> + <source>&Password Mode</source> + <translation type="unfinished">&Modo de contraseña</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="147"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="75"/> + <source>Files (relative to {0}):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="138"/> + <source>No changelists found</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="109"/> + <source>Process Generation Error</source> + <translation type="unfinished">Error de Generación de Proceso</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="109"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished">El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> + </message> +</context> +<context> <name>SvnCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.ui" line="14"/> @@ -38877,56 +38967,61 @@ <context> <name>SvnCommitDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="25"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="26"/> <source>Enter the log message.</source> <translation>Introduzca el mensaje de log.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="28"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.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/vcsPySvn/SvnCommitDialog.ui" line="13"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="14"/> <source>Subversion</source> <translation>Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="42"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="43"/> <source>Recent commit messages</source> <translation>Mensajes recientes de commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="49"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="50"/> <source>Select a recent commit message to use</source> <translation>Seleccione un mensaje de commit reciente para reutilizar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="19"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="20"/> <source>Commit Message</source> <translation>Mensaje de Commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="59"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="60"/> <source>Changelists</source> <translation>Listas de cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="72"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="73"/> <source>Select to keep the changelists</source> <translation>Seleccionar para conservar las listas de cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="75"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="76"/> <source>Keep changelists</source> <translation>Conservar listas de cambios</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="65"/> <source>Enter the list of changelists separated by ';'</source> - <translation>Introduzca la lista de listas de cambios separadas por ';'</translation> + <translation type="obsolete">Introduzca la lista de listas de cambios separadas por ';'</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="66"/> + <source>Select the change lists to limit the commit</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -40431,122 +40526,122 @@ <translation><b>Mostrar estado</b><p>Muestra el estado del proyecto local.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="221"/> <source>Tag in repository</source> <translation>Crear un Tag en el repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="221"/> <source>&Tag in repository...</source> <translation>Crear un &Tag en el repositorio...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="225"/> <source>Tag the local project in the repository</source> <translation>Crea un tag del proyecto local en el repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="228"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Crear un Tag en el repositorio</b><p>Crea un tag del proyecto local en el repositorio.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="235"/> <source>Export from repository</source> <translation>Exportar desde repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="235"/> <source>&Export from repository...</source> <translation>&Exportar desde repositorio...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="224"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="239"/> <source>Export a project from the repository</source> <translation>Exportar un proyecto desde el repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="227"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="242"/> <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/vcsPySvn/ProjectHelper.py" line="234"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> <source>Command options</source> <translation>Opciones de comando</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> - <source>Command &options...</source> - <translation>&Opciones de comando...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="237"/> - <source>Show the VCS command options</source> - <translation>Mostrar opciones de comando VCS</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="238"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> - <translation><b>Opciones de comando...</b><p>Muestra un diálogo para editar las opciones de comando VCS.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> - <source>Revert changes</source> - <translation>Revertir cambios</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> - <source>Re&vert changes</source> - <translation>Re&vertir cambios</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> - <source>Revert all changes made to the local project</source> - <translation>Revertir todos los cambios hechos al proyecto local</translation> + <source>Command &options...</source> + <translation>&Opciones de comando...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="252"/> + <source>Show the VCS command options</source> + <translation>Mostrar opciones de comando VCS</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="253"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation><b>Opciones de comando...</b><p>Muestra un diálogo para editar las opciones de comando VCS.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <source>Revert changes</source> + <translation>Revertir cambios</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <source>Re&vert changes</source> + <translation>Re&vertir cambios</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="264"/> + <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/vcsPySvn/ProjectHelper.py" line="267"/> <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/vcsPySvn/ProjectHelper.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> <source>Merge</source> <translation>Hacer merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> <source>Mer&ge changes...</source> <translation>Hacer mer&ge de los cambios...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="263"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="278"/> <source>Merge changes of a tag/revision into the local project</source> <translation>Hacer merge de los cambios de una tag/revision en el proyecto local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="266"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="281"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation><b>Merge</b><p>Hace un merge de los cambios de una tag/revision al proyecto local.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="288"/> <source>Switch</source> <translation>Hacer switch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="288"/> <source>S&witch...</source> <translation>Hacer s&witch...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="292"/> <source>Switch the local copy to another tag/branch</source> <translation>Hace un switch de la copia local a otra tag/branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="295"/> <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> <translation><b>Hacer switch</b><p>Hace un switch de la copia local a otra tag/branch.</p></translation> </message> @@ -40571,217 +40666,217 @@ <translation type="obsolete"><b>Resolver conflictos</b><p>Resuelve todos los conflictos del proyecto local.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> <source>Cleanup</source> <translation>Limpiar (cleanup)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> <source>Cleanu&p</source> <translation>Lim&piar (cleanup)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="318"/> <source>Cleanup the local project</source> <translation>Hacer limpieza (cleanup) del proyecto local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="321"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Limpieza (cleanup)</b><p>Ejecuta un cleanup del proyecto local.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="328"/> <source>Execute command</source> <translation>Ejecutar comando</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="328"/> <source>E&xecute command...</source> <translation>E&jecutar comando...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="331"/> <source>Execute an arbitrary VCS command</source> <translation>Ejecuta un comando VCS arbitrario</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="334"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation><b>Ejecutar comando</b><p>Abre un diálogo para introducir un comando VCS arbitrario.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="341"/> <source>List tags</source> <translation>Listar tags</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="341"/> <source>List tags...</source> <translation>Listar tags...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> <source>List tags of the project</source> <translation>Lista los tags del proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="332"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="347"/> <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/vcsPySvn/ProjectHelper.py" line="339"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="354"/> <source>List branches</source> <translation>Listar branches</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="354"/> <source>List branches...</source> <translation>Listar branches...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="342"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches of the project</source> <translation>Lista las branches del proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="345"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="360"/> <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/vcsPySvn/ProjectHelper.py" line="352"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="367"/> <source>List repository contents</source> <translation>Listar contenido del repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="367"/> <source>List repository contents...</source> <translation>Listar contenido del repositorio...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="355"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="370"/> <source>Lists the contents of the repository</source> <translation>Lista el contenido del repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="373"/> <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation><b>Listar contenido del repositorio</b><p>Lista el contenido del repositorio.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="380"/> <source>Set Property</source> <translation>Establecer propiedad</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="380"/> <source>Set Property...</source> <translation>Establecer propiedad...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="383"/> <source>Set a property for the project files</source> <translation>Establece una propiedad para los archivos del proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation><b>Establecer Propiedad</b><p>Establece una propiedad para los archivos del proyecto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> <source>List Properties</source> <translation>Listar propiedades</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> <source>List Properties...</source> <translation>Listar propiedades...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="381"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="396"/> <source>List properties of the project files</source> <translation>Listar propiedades de los archivos del proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation><b>Listar Propiedades</b><p>Lista las propiedades de los archivos del proyecto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source>Delete Property</source> <translation>Borrar propiedad</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source>Delete Property...</source> <translation>Borrar propiedad...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="409"/> <source>Delete a property for the project files</source> <translation>Borrar una propiedad de los archivos del proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="397"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="412"/> <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> <translation><b>Borrar Propiedad</b><p>Borra una propiedad de los archivos del proyecto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="191"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> <source>Show repository info</source> <translation>Mostrar informacion del repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> <source>Show some repository related information for the local project</source> <translation>Mostrar información relacionada con el repositorio para el proyecto local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="198"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/> <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> <translation><b>Mostrar información del repositorio</b><p>Muestra información relacionada con el repositorio para el proyecto local.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> <source>Relocate</source> <translation>Trasladar (relocate)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> <source>Relocate...</source> <translation>Trasladar (relocate)...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="408"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="423"/> <source>Relocate the working copy to a new repository URL</source> <translation>Trasladar la copia de trabajo a una nueva URL de repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="411"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="426"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation><b>Trasladar (relocate)</b><p>Traslada la copia de trabajo a una nueva URL de repositorio.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="433"/> <source>Repository Browser</source> <translation>Navegador de Repositorios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="433"/> <source>Repository Browser...</source> <translation>Navegador de Repositorios...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="437"/> <source>Show the Repository Browser dialog</source> <translation>Mostrar diálogo de Navegador de Repositorios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="440"/> <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> <translation><b>Navegador de Repositorios</b><p>Muestra el diálogo de Navegador de Repositorios.</p></translation> </message> @@ -40801,45 +40896,60 @@ <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 despues.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> <source>Configure</source> <translation>Configurar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> <source>Configure...</source> <translation>Configurar...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="450"/> <source>Show the configuration dialog with the Subversion page selected</source> <translation>Mostrar el diálogo de configuración con la página de Subversion seleccionada</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="438"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="453"/> <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> <translation><b>Configurar</b><p>Mostrar el diálogo de configuración con la página de Subversion seleccionada.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="302"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="302"/> <source>Con&flicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="305"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="308"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="191"/> + <source>Show change lists</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> + <source>Show the change lists and associated files of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="198"/> + <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnPropDelDialog</name> @@ -41405,12 +41515,12 @@ <translation>Revertir cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="701"/> <source>Lock</source> <translation>Bloquear</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="716"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="717"/> <source>Unlock</source> <translation>Desbloquear</translation> </message> @@ -41525,47 +41635,47 @@ <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="584"/> <source>Commit</source> <translation>Commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="682"/> <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/vcsPySvn/SvnStatusDialog.py" line="622"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="623"/> <source>Add</source> <translation>Añadir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="622"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="623"/> <source>There are no unversioned entries available/selected.</source> <translation>No hay entradas sin versionar disponibles/seleccionadas.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="664"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="665"/> <source>Revert</source> <translation>Revertir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="701"/> <source>There are no unlocked files available/selected.</source> <translation>No hay archivos desbloqueados disponibles/seleccionados.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="750"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="751"/> <source>There are no locked files available/selected.</source> <translation>No hay archivos bloqueados disponibles/seleccionados.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="733"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="734"/> <source>Break Lock</source> <translation>Romper Bloqueo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="750"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="751"/> <source>Steal Lock</source> <translation>Robar Bloqueo</translation> </message> @@ -41580,17 +41690,17 @@ <translation>Añadir a la lista de cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="784"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="785"/> <source>Remove from Changelist</source> <translation>Quitar de la lista de cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="766"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="767"/> <source>There are no files available/selected not belonging to a changelist.</source> <translation>No hay archivos disponibles/seleccionados que no pertenezcan a una lista de cambios.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="784"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="785"/> <source>There are no files available/selected belonging to a changelist.</source> <translation>No hay archivos disponibles/seleccionados que pertenezcan a una lista de cambios.</translation> </message> @@ -41670,22 +41780,22 @@ <translation>Restaurar perdidas</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="503"/> <source>all</source> <translation>todo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="682"/> <source>Differences</source> <translation>Diferencias</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="584"/> <source>There are no entries selected to be committed.</source> <translation>No hay entradas seleccionads sobre las que hacer commit.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="664"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="665"/> <source>There are no missing entries available/selected.</source> <translation>No hay entradas perdidas disponibles/seleccionadas.</translation> </message> @@ -53454,17 +53564,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1604"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1605"/> <source>unknown</source> <translation>desconocido</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1474"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Información del repositorio</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Revisión actual</b></td><td>{2}</td></tr><tr><td><b>Revisión enviada</b></td><td>{3}</td></tr><tr><td><b>Fecha de envío</b></td><td>{4}</td></tr><tr><td><b>Hora de envío</b></td><td>{5}</td></tr><tr><td><b>Último autor</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1605"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1606"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Information del repositorio</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Revisión enviada</b></td><td>{5}</td></tr><tr><td><b>Fecha de envío</b></td><td>{6}</td></tr><tr><td><b>Hora de envio</b></td><td>{7}</td></tr><tr><td><b>Último autor</b></td><td>{8}</td></tr></table></translation> </message>
--- a/i18n/eric5_fr.ts Sat Jun 02 17:41:24 2012 +0200 +++ b/i18n/eric5_fr.ts Sun Jun 03 12:51:15 2012 +0200 @@ -42110,47 +42110,47 @@ <context> <name>Subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="314"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="315"/> <source>Importing project into Subversion repository</source> <translation>Importer le projet dans le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="364"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="365"/> <source>Subversion Checkout</source> <translation>'Checkout' Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="427"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation>L'étiquette doit être une étiquette normale (tags) ou une étiquette de branche (branches). Prière de faire un choix dans la liste.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="385"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="386"/> <source>Checking project out of Subversion repository</source> <translation>'Checkout' du projet depuis le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="427"/> <source>Subversion Export</source> <translation>'Export' Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="446"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="447"/> <source>Exporting project from Subversion repository</source> <translation>Exporter un projet du référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1127"/> <source>Subversion Error</source> <translation>Erreur Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="987"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="988"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>Impossible d'atteindre l'URL du référentiel à partir de la copie locale. Abandon de l'opération d'étiquetage</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1011"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1012"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>Le format de l'URL du référentiel n'est pas valide. Abandon de l'opération d'étiquetage</translation> </message> @@ -42160,12 +42160,12 @@ <translation type="obsolete">Etiquetage de %1 dans le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1103"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>Impossible d'atteindre l'URL du référentiel du projet depuis la copie locale. Abandon de l'opération</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1127"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>Le format de l'URL du référentiel n'est pas valide. Abandon de l'opération</translation> </message> @@ -42185,7 +42185,7 @@ <translation type="obsolete">Nettoyage de %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1564"/> <source>Subversion command</source> <translation>Commande Subversion</translation> </message> @@ -42200,97 +42200,97 @@ <translation type="obsolete">Déplacement de %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1776"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1777"/> <source>Subversion Set Property</source> <translation>Propriété Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1809"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1810"/> <source>You have to supply a property name. Aborting.</source> <translation>Vous devez donner un nom à la propriété. Abandon.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1827"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1828"/> <source>Subversion Delete Property</source> <translation>Suppression d'une propriété Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1647"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1648"/> <source>Enter property name</source> <translation>Entrer le nom de la propriété</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="530"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="531"/> <source>Commiting changes to Subversion repository</source> <translation>'Commiter' les modifications dans le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="586"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="587"/> <source>Synchronizing with the Subversion repository</source> <translation>Synchronisation avec le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="687"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="688"/> <source>Adding files/directories to the Subversion repository</source> <translation>Ajouter des fichiers/répertoires au référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="786"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="787"/> <source>Adding directory trees to the Subversion repository</source> <translation>Ajouter des arborescences de répertoires dans le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="822"/> <source>Removing files/directories from the Subversion repository</source> <translation>Supprimer des fichiers/répertoires du réferentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1075"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1076"/> <source>Reverting changes</source> <translation>Revenir avant les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1670"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1671"/> <source>Resolving conficts</source> <translation>Résoudre les confits</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="223"/> <source>Create project in repository</source> <translation>Créer un projet dans le référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="223"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation>Impossible de créer le projet dans le référentiel. Peut-être que le référentiel indiqué n'existe pas ou que le serveur ne répond pas.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="245"/> <source>New project</source> <translation>Nouveau projet</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="245"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation>Le projet n'a pu être mis à jour à partir du référentiel.<br />Restauration du contenu initial.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="924"/> <source>Subversion Log</source> <translation>Log Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="924"/> <source>Select number of entries to show.</source> <translation>Sélectionner plusieurs entrées à afficher.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1993"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1994"/> <source>Locking in the Subversion repository</source> <translation>Verrouillage dans le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2031"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2032"/> <source>Unlocking in the Subversion repository</source> <translation>Déverrouillage dans le référentiel Subversion</translation> </message> @@ -42307,27 +42307,27 @@ </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1792"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1793"/> <source>Property set.</source> <translation>Propriété définie.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1842"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1843"/> <source>Property deleted.</source> <translation>Propriété supprimée.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1974"/> <source>Subversion Lock</source> <translation>Verrou Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1974"/> <source>Enter lock comment</source> <translation>Entrer un commentaire pour le verrou</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2076"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2077"/> <source>Relocating</source> <translation>Déplacement</translation> </message> @@ -42493,37 +42493,37 @@ <translation type="obsolete">Le processus SVN s'est terminé avec le code de sortie %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="196"/> <source>The svn process did not finish within 30s.</source> <translation>Le processus SVN ne s'est pas terminé dans les 30 dernières secondes.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="197"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="198"/> <source>Could not start the svn executable.</source> <translation>Impossible de lancer l'executable SVN.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2103"/> <source>Repository Browser</source> <translation>Navigateur de référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2103"/> <source>Enter the repository URL.</source> <translation>Entrer l'URL du référentiel.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2127"/> <source>Remove from changelist</source> <translation>Supprimer de la liste des modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2162"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2164"/> <source>Add to changelist</source> <translation>Ajouter à la liste des modifications:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2152"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2153"/> <source>Enter name of the changelist:</source> <translation>Entrer le nom de la liste des modifications:</translation> </message> @@ -42543,53 +42543,53 @@ <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="193"/> <source>The svn process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="883"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="884"/> <source>Moving {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1047"/> <source>Tagging {0} in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1148"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1149"/> <source>Switching to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1250"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1251"/> <source>Merging {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1527"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1528"/> <source>Cleaning up {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1709"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1710"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="330"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="331"/> <source>Imported revision {0}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="555"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="556"/> <source>Committed revision {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1155"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1156"/> <source>Revision {0}. </source> <translation type="unfinished"></translation> @@ -42800,6 +42800,96 @@ </message> </context> <context> + <name>SvnChangeListsDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="14"/> + <source>Subversion Change Lists</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="23"/> + <source>Change Lists:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="36"/> + <source><b>Change Lists</b> +<p>Select a change list here to see the associated files in the list below.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="63"/> + <source><b>Files</b> +<p>This shows a list of files associated with the change list selected above.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="80"/> + <source>Errors</source> + <translation type="unfinished">Erreurs</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="99"/> + <source>Input</source> + <translation type="unfinished">Entrée</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="121"/> + <source>Press to send the input to the subversion process</source> + <translation type="unfinished">Cliquer pour envoyer l'entrée saisie au processus Subversion</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="124"/> + <source>&Send</source> + <translation type="unfinished">&Envoyer</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="127"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="134"/> + <source>Enter data to be sent to the subversion process</source> + <translation type="unfinished">Entrer les données à envoyer au processus Subversion</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="141"/> + <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/vcsSubversion/SvnChangeListsDialog.ui" line="144"/> + <source>&Password Mode</source> + <translation type="unfinished">Mode Mot de &Passe</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="147"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="75"/> + <source>Files (relative to {0}):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="138"/> + <source>No changelists found</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="109"/> + <source>Process Generation Error</source> + <translation type="unfinished">Erreur du processus</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="109"/> + <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>SvnCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py" line="70"/> @@ -42889,56 +42979,61 @@ <context> <name>SvnCommitDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="25"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="26"/> <source>Enter the log message.</source> <translation>Entrer un message log.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="28"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="29"/> <source><b>Log Message</b> <p>Enter the log message for the commit action.</p></source> <translation><b> Message Log</b> <p>Entrer un message log pour la mise à jour 'commit'.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="13"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="14"/> <source>Subversion</source> <translation>Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="42"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="43"/> <source>Recent commit messages</source> <translation>Messages de commit récents</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="49"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="50"/> <source>Select a recent commit message to use</source> <translation>Sélectionner un message de commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="19"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="20"/> <source>Commit Message</source> <translation>Message de commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="59"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="60"/> <source>Changelists</source> <translation>Listes des modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="72"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="73"/> <source>Select to keep the changelists</source> <translation>Sélectionner pour conserver les listes de modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="75"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="76"/> <source>Keep changelists</source> <translation>Conserver les listes de modifications</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="65"/> <source>Enter the list of changelists separated by ';'</source> - <translation>Entrer la liste des listes de modifs séparées par ';'</translation> + <translation type="obsolete">Entrer la liste des listes de modifs séparées par ';'</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="66"/> + <source>Select the change lists to limit the commit</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -44619,122 +44714,122 @@ <translation><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/vcsPySvn/ProjectHelper.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="221"/> <source>Tag in repository</source> <translation>Etiqueter au niveau du référentiel (tag)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="221"/> <source>&Tag in repository...</source> <translation>&Etiqueter dans le référentiel...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="225"/> <source>Tag the local project in the repository</source> <translation>Etiquette le projet local dans le référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="228"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Etiqueter dans le référentiel</b><p>Etiquette le projet local dans le référentiel (opération "tag").</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="235"/> <source>Export from repository</source> <translation>Exporter du référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="235"/> <source>&Export from repository...</source> <translation>&Exporter du référentiel...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="224"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="239"/> <source>Export a project from the repository</source> <translation>Exporte un projet d'un référentiel VCS</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="227"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="242"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><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/vcsPySvn/ProjectHelper.py" line="234"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> <source>Command options</source> <translation>Options de commande</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> - <source>Command &options...</source> - <translation>&Options de commande...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="237"/> - <source>Show the VCS command options</source> - <translation>Affiche les options de commandes VCS</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="238"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> - <translation><b>Options de commandes...</b><p>Affiche une boite de dialogue pour éditer les options de commandes VCS</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> - <source>Revert changes</source> - <translation>Revenir avant les modifications</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> - <source>Re&vert changes</source> - <translation>&Recharger le projet</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> - <source>Revert all changes made to the local project</source> - <translation>Recharger le projet et écraser toutes les modifications locales</translation> + <source>Command &options...</source> + <translation>&Options de commande...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="252"/> + <source>Show the VCS command options</source> + <translation>Affiche les options de commandes VCS</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="253"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation><b>Options de commandes...</b><p>Affiche une boite de dialogue pour éditer les options de commandes VCS</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <source>Revert changes</source> + <translation>Revenir avant les modifications</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <source>Re&vert changes</source> + <translation>&Recharger le projet</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="264"/> + <source>Revert all changes made to the local project</source> + <translation>Recharger le projet et écraser toutes les modifications locales</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="267"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><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/vcsPySvn/ProjectHelper.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> <source>Merge</source> <translation>Fusionner</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> <source>Mer&ge changes...</source> <translation>&Fusionner les modifications...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="263"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="278"/> <source>Merge changes of a tag/revision into the local project</source> <translation>Fusionner les modifications d'une révision avec le projet local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="266"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="281"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation><b>Fusionner</b><p>Fusionner les modifications d'une révision avec le projet local</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="288"/> <source>Switch</source> <translation>Basculer de version</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="288"/> <source>S&witch...</source> <translation>&Basculer de version...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="292"/> <source>Switch the local copy to another tag/branch</source> <translation>Bascule de la copie locale vers une autre branche/étiquette</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="295"/> <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> <translation><b>Basculer de version</b><p>Bascule de la copie locale vers une autre branche/étiquette.</p></translation> </message> @@ -44759,162 +44854,162 @@ <translation type="obsolete"><b>Résolution des conflits</b><p>Résout tous les conflits VCS du projet local.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> <source>Cleanup</source> <translation>Nettoyer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> <source>Cleanu&p</source> <translation>&Nettoyer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="318"/> <source>Cleanup the local project</source> <translation>Nettoyer le projet local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="321"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Nettoyer</b><p>Permet de nettoyer le projet local.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="328"/> <source>Execute command</source> <translation>Exécuter une commande</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="328"/> <source>E&xecute command...</source> <translation>E&xécuter une commande...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="331"/> <source>Execute an arbitrary VCS command</source> <translation>Exécuter une commande VCS arbitraire</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="334"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation><b>Exécuter une commande</b><p>Ouvre une boite de dialogue pour exécuter une commande VCS arbitraire.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="341"/> <source>List tags</source> <translation>Lister les étiquettes</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="341"/> <source>List tags...</source> <translation>Lister les étiquettes...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> <source>List tags of the project</source> <translation>Liste les étiquettes du projet</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="332"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="347"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Liste des étiquettes</b><p>Liste les étiquettes du projet.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="354"/> <source>List branches</source> <translation>Lister les branches</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="354"/> <source>List branches...</source> <translation>Lister les branches...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="342"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches of the project</source> <translation>Liste les branches du projet</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="345"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="360"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><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/vcsPySvn/ProjectHelper.py" line="352"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="367"/> <source>List repository contents</source> <translation>Listing du référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="367"/> <source>List repository contents...</source> <translation>Listing du référentiel...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="355"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="370"/> <source>Lists the contents of the repository</source> <translation>Liste le contenu du référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="373"/> <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation><b>Listing du référentiel</b><p>Cette liste affiche le contenu du référentiel.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="380"/> <source>Set Property</source> <translation>Définir une propriété</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="380"/> <source>Set Property...</source> <translation>Définir une propriété...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="383"/> <source>Set a property for the project files</source> <translation>Définit une propriété pour les fichiers projets</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation><b>Propriétés</b><p>Définition des propritétés du projet</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> <source>List Properties</source> <translation>Lister les propriétés</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> <source>List Properties...</source> <translation>Lister les propriétés...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="381"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="396"/> <source>List properties of the project files</source> <translation>Liste des propriétés des fichiers projets</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation><b>Liste des proprtiétés</b><p>Liste des propriétés des fichiers projets.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source>Delete Property</source> <translation>Supprimer une propriété</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source>Delete Property...</source> <translation>Supprimer une propriété...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="409"/> <source>Delete a property for the project files</source> <translation>Suppression d'une propriété pour les fichiers projets</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="397"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="412"/> <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> <translation><b>Supprimer une propriété</b><p>Supprime une propriété des fichiers projets.</p></translation> </message> @@ -44934,37 +45029,37 @@ <translation type="obsolete"><b>Afficher un log limité</b><p>Affiche le log du projet limité aux entrées sélectionnées</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="191"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> <source>Show repository info</source> <translation>Affiche les infos du référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> <source>Show some repository related information for the local project</source> <translation>Affiche les informations du référentiel en rapport avec le projet local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> <source>Relocate</source> <translation>Déplacer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> <source>Relocate...</source> <translation>Déplacer...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="408"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="423"/> <source>Relocate the working copy to a new repository URL</source> <translation>Recopie une copie de travail vers une nouvelle URL de référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="411"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="426"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation><b>Relocaliser</b><p>Redéfinit une URL de référentiel pour la copie courante.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="198"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/> <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> <translation><b>Afficher les infos du référentiel</b><p>Affiche les informations du référentiel en rapport avec le projet local.</p></translation> </message> @@ -44999,65 +45094,80 @@ <translation><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/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="433"/> <source>Repository Browser</source> <translation>Navigateur de référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="433"/> <source>Repository Browser...</source> <translation>Navigateur de référentiel...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="437"/> <source>Show the Repository Browser dialog</source> <translation>Affiche la fenêtre de navigation du référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="440"/> <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> <translation><b>Navigateur de référentiel</b><p>Affiche la fenêtre de navigation du référentiel.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> <source>Configure</source> <translation>Configuration</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> <source>Configure...</source> <translation>Configuration...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="450"/> <source>Show the configuration dialog with the Subversion page selected</source> <translation>Afficher la page de configuration avec la page Subversion sélectionnée</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="438"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="453"/> <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> <translation><b>Configuration</b><p>Affiche la page de configuration avec la page Subversion sélectionnée.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="302"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="302"/> <source>Con&flicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="305"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="308"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="191"/> + <source>Show change lists</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> + <source>Show the change lists and associated files of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="198"/> + <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnPropDelDialog</name> @@ -45566,22 +45676,22 @@ <translation>Commit des changements dans le référentiel...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="584"/> <source>Commit</source> <translation>Commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="682"/> <source>There are no uncommitted changes available/selected.</source> <translation>Il n'y a pas de modification non commitée disponible/sélectionnée.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="701"/> <source>Lock</source> <translation>Verrouillage</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="716"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="717"/> <source>Unlock</source> <translation>Déverrouillage</translation> </message> @@ -45626,22 +45736,22 @@ <translation>remplacé</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="701"/> <source>There are no unlocked files available/selected.</source> <translation>Il n'y a aucun fichier déverrouilé disponible/sélectionné.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="750"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="751"/> <source>There are no locked files available/selected.</source> <translation>Il n'y a aucun fichier verrouilé disponible/sélectionné.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="733"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="734"/> <source>Break Lock</source> <translation>Casser le verrouillage d'un autre utilisateur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="750"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="751"/> <source>Steal Lock</source> <translation>Voler le verrou</translation> </message> @@ -45783,17 +45893,17 @@ <translation>Revenir avant les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="622"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="623"/> <source>Add</source> <translation>Ajouter</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="622"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="623"/> <source>There are no unversioned entries available/selected.</source> <translation>Aucune entrée "non-versionnée" disponible/sélectionnée.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="664"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="665"/> <source>Revert</source> <translation>Recouvrir</translation> </message> @@ -45813,17 +45923,17 @@ <translation>Ajouter à la liste des modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="784"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="785"/> <source>Remove from Changelist</source> <translation>Supprimer de la liste des modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="766"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="767"/> <source>There are no files available/selected not belonging to a changelist.</source> <translation>Il n'y a pas de fichiers disponibles ou sélectionnés n'appartenant pas à une liste.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="784"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="785"/> <source>There are no files available/selected belonging to a changelist.</source> <translation>Il n'y a pas de fichiers disponibles ou sélectionnés appartenant à une liste.</translation> </message> @@ -45903,7 +46013,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="503"/> <source>all</source> <translation type="unfinished"></translation> </message> @@ -45913,17 +46023,17 @@ <translation type="obsolete">Différence</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="682"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="584"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="664"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="665"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> @@ -58856,7 +58966,7 @@ en cours</b></td><td>%3</td></tr><tr><td><b>Version "commitée"</b></td><td>%4</td></tr><tr><td><b>Date du commit</b></td><td>%5</td></tr><tr><td><b>Heure du commit</b></td><td>%6</td></tr><tr><td><b>Dernier auteur</b></td><td>%7</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1604"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1605"/> <source>unknown</source> <translation>inconnu</translation> </message> @@ -58866,12 +58976,12 @@ <translation type="obsolete"><h3>Informations sur le référentiel</h3><table><tr><td><b>PySvn V.</b></td><td>%1</td></tr><tr><td><b>Subversion V.</b></td><td>%2</td></tr><tr><td><b>API Subversion V.</b></td><td>%3</td></tr><tr><td><b>URL</b></td><td>%4</td></tr><tr><td><b>Révision actuelle</b></td><td>%5</td></tr><tr><td><b>Révision validée</b></td><td>%6</td></tr><tr><td><b>Date de validation</b></td><td>%7</td></tr><tr><td><b>Heure de validation</b></td><td>%8</td></tr><tr><td><b>Dernier auteur</b></td><td>%9</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1474"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1605"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1606"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_it.ts Sat Jun 02 17:41:24 2012 +0200 +++ b/i18n/eric5_it.ts Sun Jun 03 12:51:15 2012 +0200 @@ -38974,182 +38974,182 @@ <context> <name>Subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="314"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="315"/> <source>Importing project into Subversion repository</source> <translation>Importazione del progetto nel repository Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="364"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="365"/> <source>Subversion Checkout</source> <translation>Subversion Checkout</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="427"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation>Il tag deve essere un tag normale (tags) o un tag branch (branch). Selezionarlo dalla lista.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="385"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="386"/> <source>Checking project out of Subversion repository</source> <translation>Checking del progetto dal repository subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="427"/> <source>Subversion Export</source> <translation>Subversion Export</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="446"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="447"/> <source>Exporting project from Subversion repository</source> <translation>Esportazione del progetto dal repository Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1127"/> <source>Subversion Error</source> <translation>Subversion Error</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="987"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="988"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>L'URL del repository del progetto non può essere recuperato dalla copia di lavoro. L'operazione di tag verrà interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1011"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1012"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>L'URL del repository del progetto a un formato non valido. L'operazione di tag verrà interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1103"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>L'URL del repository del progetto non può essere recuperato dalla copia di lavoro. L'operazione di switch verrà interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1127"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>L'URL del repository del progetto ha un formato non valido. L'operazione di switch verrà interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1564"/> <source>Subversion command</source> <translation>comando Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1776"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1777"/> <source>Subversion Set Property</source> <translation>Subversion Set Property</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1809"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1810"/> <source>You have to supply a property name. Aborting.</source> <translation>Devi fornire un nome per la proprietà. Interrompo.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1827"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1828"/> <source>Subversion Delete Property</source> <translation>Subversion Delete Property</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1647"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1648"/> <source>Enter property name</source> <translation>Inserisci nome proprietà</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="530"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="531"/> <source>Commiting changes to Subversion repository</source> <translation>Commit delle modifiche nel repository Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="586"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="587"/> <source>Synchronizing with the Subversion repository</source> <translation>Sincronizzazione con il repository Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="687"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="688"/> <source>Adding files/directories to the Subversion repository</source> <translation>Aggiunta di file/directory al repository subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="786"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="787"/> <source>Adding directory trees to the Subversion repository</source> <translation>Aggiunta di alberi di directory al repository subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="822"/> <source>Removing files/directories from the Subversion repository</source> <translation>Rimozione di file/directory al repository subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1075"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1076"/> <source>Reverting changes</source> <translation>Annullamento modifiche</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1670"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1671"/> <source>Resolving conficts</source> <translation>Risoluzione conflitti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="223"/> <source>Create project in repository</source> <translation>Crea progetto nel repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="223"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation>Il progetto non può essere creato nel repository. Probabilmente il repository non esiste o il server non è disponibile.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="245"/> <source>New project</source> <translation>Nuovo progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="245"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation>Il progetto non può essere checked out dal repository.<br />Ripristisno dei contenuti originali.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="924"/> <source>Subversion Log</source> <translation>Log Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="924"/> <source>Select number of entries to show.</source> <translation>Mostra il numero di elementi da mostrare.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1993"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1994"/> <source>Locking in the Subversion repository</source> <translation>Blocco nel repository Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2031"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2032"/> <source>Unlocking in the Subversion repository</source> <translation>Sblocco del repository Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1792"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1793"/> <source>Property set.</source> <translation>Proprietà impostata.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1842"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1843"/> <source>Property deleted.</source> <translation>Proprietà cancellata.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1974"/> <source>Subversion Lock</source> <translation>Lock Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1974"/> <source>Enter lock comment</source> <translation>Inserico commento del lock</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2076"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2077"/> <source>Relocating</source> <translation>Movimentazione</translation> </message> @@ -39304,37 +39304,37 @@ <translation>non versionato</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="196"/> <source>The svn process did not finish within 30s.</source> <translation>Il processo svn non è finito entro i 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="197"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="198"/> <source>Could not start the svn executable.</source> <translation>Non posso avviare l'eseguibile svn.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2103"/> <source>Repository Browser</source> <translation>Browser Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2103"/> <source>Enter the repository URL.</source> <translation>Inserisci l'URL del repository.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2127"/> <source>Remove from changelist</source> <translation>Rimuovi dalla changelist</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2162"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2164"/> <source>Add to changelist</source> <translation>Aggiungi alla changelist</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2152"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2153"/> <source>Enter name of the changelist:</source> <translation>Inserisci il nome della changelist:</translation> </message> @@ -39354,53 +39354,53 @@ <translation>Changelist spostata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="193"/> <source>The svn process finished with the exit code {0}</source> <translation>Il processo svn è terminato con codice di uscita {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="883"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="884"/> <source>Moving {0}</source> <translation>Spostamento di {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1047"/> <source>Tagging {0} in the Subversion repository</source> <translation>Tag di{0} nel repository subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1148"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1149"/> <source>Switching to {0}</source> <translation>Switch a {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1250"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1251"/> <source>Merging {0}</source> <translation>Merge di {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1527"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1528"/> <source>Cleaning up {0}</source> <translation>Pulizia di {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1709"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1710"/> <source>Copying {0}</source> <translation>copia di {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="330"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="331"/> <source>Imported revision {0}. </source> <translation>importata revisione {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="555"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="556"/> <source>Committed revision {0}.</source> <translation>Committata la revisione {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1155"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1156"/> <source>Revision {0}. </source> <translation>Revisione {0}. @@ -39602,6 +39602,96 @@ </message> </context> <context> + <name>SvnChangeListsDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="14"/> + <source>Subversion Change Lists</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="23"/> + <source>Change Lists:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="36"/> + <source><b>Change Lists</b> +<p>Select a change list here to see the associated files in the list below.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="63"/> + <source><b>Files</b> +<p>This shows a list of files associated with the change list selected above.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="80"/> + <source>Errors</source> + <translation type="unfinished">Errori</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="99"/> + <source>Input</source> + <translation type="unfinished">Input</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="121"/> + <source>Press to send the input to the subversion process</source> + <translation type="unfinished">Premi per mandare l'input al processo subversion</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="124"/> + <source>&Send</source> + <translation type="unfinished">&Spedisci</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="127"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="134"/> + <source>Enter data to be sent to the subversion process</source> + <translation type="unfinished">Inserisci i dati da mandare al processo subversion</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="141"/> + <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/vcsSubversion/SvnChangeListsDialog.ui" line="144"/> + <source>&Password Mode</source> + <translation type="unfinished">Modo &Password</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="147"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="75"/> + <source>Files (relative to {0}):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="138"/> + <source>No changelists found</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="109"/> + <source>Process Generation Error</source> + <translation type="unfinished">Errore Generazione Processo</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="109"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished">Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> + </message> +</context> +<context> <name>SvnCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py" line="70"/> @@ -39693,56 +39783,61 @@ <context> <name>SvnCommitDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="25"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="26"/> <source>Enter the log message.</source> <translation>Inserisci messaggio di log.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="28"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="29"/> <source><b>Log Message</b> <p>Enter the log message for the commit action.</p></source> <translation><b>Messaggio di log</b> <p>Inserisci il messaggio di log per la commit.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="13"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="14"/> <source>Subversion</source> <translation>Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="42"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="43"/> <source>Recent commit messages</source> <translation>Messagi di commit recenti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="49"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="50"/> <source>Select a recent commit message to use</source> <translation>Seleziona un messaggio di commit recete da usare</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="19"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="20"/> <source>Commit Message</source> <translation>Messaggio di commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="59"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="60"/> <source>Changelists</source> <translation>Changelists</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="72"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="73"/> <source>Select to keep the changelists</source> <translation>Seleziona per mantenere la changelists</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="75"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="76"/> <source>Keep changelists</source> <translation>Tieni changelists</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="65"/> <source>Enter the list of changelists separated by ';'</source> - <translation>Inserisci la lista della variazioni separate da ';'</translation> + <translation type="obsolete">Inserisci la lista della variazioni separate da ';'</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="66"/> + <source>Select the change lists to limit the commit</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -41244,122 +41339,122 @@ <translation><b>Mostra stato</b><p>Mostra lo stato del progetto locale.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="221"/> <source>Tag in repository</source> <translation>Tag nel repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="221"/> <source>&Tag in repository...</source> <translation>&Tag nel repository...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="225"/> <source>Tag the local project in the repository</source> <translation>Tag del progetto locale nel repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="228"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Tag nel repository</b><p>Tag del progetto locale nel repository.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="235"/> <source>Export from repository</source> <translation>Esporta dal repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="235"/> <source>&Export from repository...</source> <translation>&Esporta dal repository...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="224"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="239"/> <source>Export a project from the repository</source> <translation>Esporta un progetto dal repositoty</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="227"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="242"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Esporta dal repository</b><p>Esporta un progetto dal repository.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> <source>Command options</source> <translation>Opzione comando</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> - <source>Command &options...</source> - <translation>&Opzioni comando...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="237"/> - <source>Show the VCS command options</source> - <translation>Mostra le opzioni del comando VCS</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="238"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> - <translation><b>Opzioni comando...</b><p>Mostra un dialogo per modificare le opzioni del comando VCS.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> - <source>Revert changes</source> - <translation>Inverti modifiche</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> - <source>Re&vert changes</source> - <translation>In&verti modifiche</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> - <source>Revert all changes made to the local project</source> - <translation>Inverti tutte le modifiche fatte al progetto locale</translation> + <source>Command &options...</source> + <translation>&Opzioni comando...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="252"/> + <source>Show the VCS command options</source> + <translation>Mostra le opzioni del comando VCS</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="253"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation><b>Opzioni comando...</b><p>Mostra un dialogo per modificare le opzioni del comando VCS.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <source>Revert changes</source> + <translation>Inverti modifiche</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <source>Re&vert changes</source> + <translation>In&verti modifiche</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="264"/> + <source>Revert all changes made to the local project</source> + <translation>Inverti tutte le modifiche fatte al progetto locale</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="267"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Inverti modifiche</b><p>Inverte tutte le modifiche fatte al progetto locale.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> <source>Merge</source> <translation>Fondi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> <source>Mer&ge changes...</source> <translation>Fon&di modifiche...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="263"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="278"/> <source>Merge changes of a tag/revision into the local project</source> <translation>Fondi le modifiche del tag/revision nel progetto locale</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="266"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="281"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation><b>Fondi</b><p>Fonde le modifiche del tag/revisione nel progetto locale.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="288"/> <source>Switch</source> <translation>Scambia</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="288"/> <source>S&witch...</source> <translation>&Scambia...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="292"/> <source>Switch the local copy to another tag/branch</source> <translation>Cambia la copia locale ad un altro tag/branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="295"/> <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> <translation><b>Cambia</b><p>Cambia la copia locale ad un altro tag/branch.</p></translation> </message> @@ -41384,162 +41479,162 @@ <translation type="obsolete"><b>Risolve conflitti</b><p>Risolve tutti i conflitti del progetto locale.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> <source>Cleanup</source> <translation>Pulisci</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> <source>Cleanu&p</source> <translation>&Pulisci</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="318"/> <source>Cleanup the local project</source> <translation>Pulisci il progetto locale</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="321"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Pulizia</b><p>Esegue la pulizia del progetto locale.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="328"/> <source>Execute command</source> <translation>Esegui comando</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="328"/> <source>E&xecute command...</source> <translation>&Esegui comando...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="331"/> <source>Execute an arbitrary VCS command</source> <translation>Esegui un comando VCS arbitrario</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="334"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation><b>Esegui comando</b><p>Apre un dialogo per inserire un comando VCS arbitraio.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="341"/> <source>List tags</source> <translation>Elenca tag</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="341"/> <source>List tags...</source> <translation>Elenca tag...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> <source>List tags of the project</source> <translation>Elenca i tag del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="332"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="347"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Elenca tag</b><p>Elenca i tag del progetto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="354"/> <source>List branches</source> <translation>Elenca branches</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="354"/> <source>List branches...</source> <translation>Elenca branches...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="342"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches of the project</source> <translation>Elenca i branches del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="345"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="360"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Elenca branches</b><p>Elenca i branch del progetto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="367"/> <source>List repository contents</source> <translation>Elenca contenuti repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="367"/> <source>List repository contents...</source> <translation>Elenca contenuti repository...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="355"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="370"/> <source>Lists the contents of the repository</source> <translation>Elenca i contenuti del repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="373"/> <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation><b>Elanca contenuti del repository</b><p>Elenca i contenuti del repository.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="380"/> <source>Set Property</source> <translation>Imposta proprietà</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="380"/> <source>Set Property...</source> <translation>Imposta proprietà...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="383"/> <source>Set a property for the project files</source> <translation>Imposta una proprietà per i file del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation><b>Imposta proprietà</b><p>Imposta una proprietà per i file del progetto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> <source>List Properties</source> <translation>Elenca proprietà</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> <source>List Properties...</source> <translation>Elenca proprietà...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="381"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="396"/> <source>List properties of the project files</source> <translation>Elenca le proprietà dei file del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation><b>Elenca proprietà</b><p>Elenca le proprietàd ei file del progetto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source>Delete Property</source> <translation>Cancella proprietà</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source>Delete Property...</source> <translation>Cancella proprietà...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="409"/> <source>Delete a property for the project files</source> <translation>Cancella una proprietà per i file del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="397"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="412"/> <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> <translation><b>Cancella proprietà</b><p>Cancella una proprietà per i file del progetto.</p></translation> </message> @@ -41559,37 +41654,37 @@ <translation type="obsolete"><b>Mostra log ridotto</b><p>Mostra il log del progetto locale limitato ad un numero selezionabile di elementi.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="191"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> <source>Show repository info</source> <translation>Mostra informazioni del repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> <source>Show some repository related information for the local project</source> <translation>Mostra alcune informazioni relative al repository del progetto locale</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> <source>Relocate</source> <translation>Rialloca</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> <source>Relocate...</source> <translation>Rialloca...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="408"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="423"/> <source>Relocate the working copy to a new repository URL</source> <translation>Rialloca la copia di lavoro ad una nuovo URL del repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="411"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="426"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation><b>Rialloca</b><p>Rialloca la copia di lavoro ad una nuovo URL del repository.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="198"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/> <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> <translation><b>Mostra informazioni Repository</b><p>Mostra alcune informazioni relative al repository del progetto locale.</p></translation> </message> @@ -41624,65 +41719,80 @@ <translation><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/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="433"/> <source>Repository Browser</source> <translation>Browser Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="433"/> <source>Repository Browser...</source> <translation>Browser Repository...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="437"/> <source>Show the Repository Browser dialog</source> <translation>Mostra il dialogo del Browser di repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="440"/> <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> <translation><b>Browser Repository</b><p>Mostra il dialogo del Browser del repository.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> <source>Configure</source> <translation>Configura</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> <source>Configure...</source> <translation>Configura...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="450"/> <source>Show the configuration dialog with the Subversion page selected</source> <translation>Mostra il dialogo di configurazione con la pagina di Subversion selezionata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="438"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="453"/> <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> <translation><b>Configura</b><p>Mostra il dialogo di configurazione con la pagina di Subversion selezionata.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="302"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="302"/> <source>Con&flicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="305"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="308"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="191"/> + <source>Show change lists</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> + <source>Show the change lists and associated files of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="198"/> + <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnPropDelDialog</name> @@ -42181,22 +42291,22 @@ <translation>Committa modifiche nel repository...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="584"/> <source>Commit</source> <translation>Commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="682"/> <source>There are no uncommitted changes available/selected.</source> <translation>Non ci sono modifiche disponibili/selezionate da committare.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="701"/> <source>Lock</source> <translation>Lock</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="716"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="717"/> <source>Unlock</source> <translation>Unlock</translation> </message> @@ -42241,22 +42351,22 @@ <translation>sostituito</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="701"/> <source>There are no unlocked files available/selected.</source> <translation>Non ci sono file sbloccati disponibili/selezionati.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="750"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="751"/> <source>There are no locked files available/selected.</source> <translation>Non ci sono file bloccati disponibili/selezionati.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="733"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="734"/> <source>Break Lock</source> <translation>Spezza lock</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="750"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="751"/> <source>Steal Lock</source> <translation>Ruba lock</translation> </message> @@ -42398,17 +42508,17 @@ <translation>Inverti modifiche</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="622"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="623"/> <source>Add</source> <translation>Aggiungi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="622"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="623"/> <source>There are no unversioned entries available/selected.</source> <translation>Non ci sono elementi non sotto controllo disponibili/selezionati.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="664"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="665"/> <source>Revert</source> <translation>Inverti</translation> </message> @@ -42423,17 +42533,17 @@ <translation>Aggiungi alla Changelist</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="784"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="785"/> <source>Remove from Changelist</source> <translation>Rimuovi dalla Changelist</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="766"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="767"/> <source>There are no files available/selected not belonging to a changelist.</source> <translation>Non ci sono file disponibili/selezionati che non appartengono ad una changelist.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="784"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="785"/> <source>There are no files available/selected belonging to a changelist.</source> <translation>Non ci sono file disponibili/selezionati che appartengono ad una changelist.</translation> </message> @@ -42513,22 +42623,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="503"/> <source>all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="584"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="664"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="665"/> <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/vcsPySvn/SvnStatusDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="682"/> <source>Differences</source> <translation type="unfinished"></translation> </message> @@ -54610,17 +54720,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1604"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1605"/> <source>unknown</source> <translation>sconosciuto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1474"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Informazioni Repository</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Revisione corrente </b></td><td>{2}</td></tr><tr><td><b>Revisione committata</b></td><td>{3}</td></tr><tr><td><b>Data della commit</b></td><td>{4}</td></tr><tr><td><b>Ora della commit</b></td><td>{5}</td></tr><tr><td><b>Ultimo autore</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1605"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1606"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Informazioni Repository</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Revisione corrente</b></td><td>{4}</td></tr><tr><td><b>Revisione Committata</b></td><td>{5}</td></tr><tr><td><b>Data della commit</b></td><td>{6}</td></tr><tr><td><b>Ora della commit</b></td><td>{7}</td></tr><tr><td><b>Ultimo autore</b></td><td>{8}</td></tr></table></translation> </message>
--- a/i18n/eric5_ru.ts Sat Jun 02 17:41:24 2012 +0200 +++ b/i18n/eric5_ru.ts Sun Jun 03 12:51:15 2012 +0200 @@ -39093,223 +39093,223 @@ <context> <name>Subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="314"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="315"/> <source>Importing project into Subversion repository</source> <translation>Импорт проекта в репозиторий Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="364"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="365"/> <source>Subversion Checkout</source> <translation>Закрузка из Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="427"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation>Тег должен быть обычным тегом (tag) или ветвью (branch). Пожалуйста, выберите из списка.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="385"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="386"/> <source>Checking project out of Subversion repository</source> <translation>Загрузка проекта из репозитория Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="427"/> <source>Subversion Export</source> <translation>Экспорт из Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="446"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="447"/> <source>Exporting project from Subversion repository</source> <translation>Экспорт файлов из репозитория Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1127"/> <source>Subversion Error</source> <translation>Ошибка Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="987"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="988"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>URL репозитория проекта недоступен из рабочей копии. Операция кстановки тега будет отменена</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1011"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1012"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>Неверный формат URL репозитория. Операция установки тега будет отменена</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1047"/> <source>Tagging {0} in the Subversion repository</source> <translation>Изменение тегов '{0}' в репозитории Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1103"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>URL репозитория проекта недоступен из рабочей копии. Операция переключения будет отменена</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1127"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>Неверный формат URL репозитория. Операция переключения будет отменена</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1148"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1149"/> <source>Switching to {0}</source> <translation>Преключение на '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1250"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1251"/> <source>Merging {0}</source> <translation>Слияние с '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1527"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1528"/> <source>Cleaning up {0}</source> <translation>Очистка {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1564"/> <source>Subversion command</source> <translation>Команда Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1709"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1710"/> <source>Copying {0}</source> <translation>Копирование '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="883"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="884"/> <source>Moving {0}</source> <translation>Перемещение {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1776"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1777"/> <source>Subversion Set Property</source> <translation>Установить свойство Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1809"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1810"/> <source>You have to supply a property name. Aborting.</source> <translation>Необходимо задать имя свойства. Прервано.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1827"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1828"/> <source>Subversion Delete Property</source> <translation>Удалить свойство Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1647"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1648"/> <source>Enter property name</source> <translation>Задайте имя свойства</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="530"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="531"/> <source>Commiting changes to Subversion repository</source> <translation>Фиксация изменений в репозитории Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="586"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="587"/> <source>Synchronizing with the Subversion repository</source> <translation>Синхронизация с репозиторием Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="687"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="688"/> <source>Adding files/directories to the Subversion repository</source> <translation>Добавляю файлы/каталоги в репозиторий Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="786"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="787"/> <source>Adding directory trees to the Subversion repository</source> <translation>Добавляю деревья каталогов в репозиторий Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="822"/> <source>Removing files/directories from the Subversion repository</source> <translation>Удаляю файлы/каталоги из репозитория Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1075"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1076"/> <source>Reverting changes</source> <translation>Отменяю изменения</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1670"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1671"/> <source>Resolving conficts</source> <translation>Разрешаю конфликт</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="223"/> <source>Create project in repository</source> <translation>Создать проект в репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="223"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation>Невозможно создать проект в репозитории. Возможно данный репозиторий не существует или сервер не функционирует.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="245"/> <source>New project</source> <translation>Новый проект</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="245"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation>Невозможно загрузить проект из репозитория. <br />Восстанавливаю предыдущее содержимое.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="924"/> <source>Subversion Log</source> <translation>Журнал Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="924"/> <source>Select number of entries to show.</source> <translation>Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1993"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1994"/> <source>Locking in the Subversion repository</source> <translation>Захватываю файл/каталог в репозитории Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2031"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2032"/> <source>Unlocking in the Subversion repository</source> <translation>Освобождаю файл/каталог в репозитории Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="555"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="556"/> <source>Committed revision {0}.</source> <translation>Сохранена ревизия {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1155"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1156"/> <source>Revision {0}. </source> <translation>Ревизия {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1792"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1793"/> <source>Property set.</source> <translation>Свойство установлено.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1842"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1843"/> <source>Property deleted.</source> <translation>Свойство удалено.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1974"/> <source>Subversion Lock</source> <translation>Запереть</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1974"/> <source>Enter lock comment</source> <translation>Задайте комментарий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2076"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2077"/> <source>Relocating</source> <translation>Перемещаю</translation> </message> @@ -39464,48 +39464,48 @@ <translation>нет версий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="330"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="331"/> <source>Imported revision {0}. </source> <translation>Импортирована ревизия {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="193"/> <source>The svn process finished with the exit code {0}</source> <translation>Процесс svn завершился с кодом {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="196"/> <source>The svn process did not finish within 30s.</source> <translation>Процесс svn не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="197"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="198"/> <source>Could not start the svn executable.</source> <translation>Невозможно запустить исполняемый файл svn.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2103"/> <source>Repository Browser</source> <translation>Проводник репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2103"/> <source>Enter the repository URL.</source> <translation>Задайте URL репозитория.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2127"/> <source>Remove from changelist</source> <translation>Удалить из списка изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2162"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2164"/> <source>Add to changelist</source> <translation>Добавить к списку изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2152"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2153"/> <source>Enter name of the changelist:</source> <translation>Введите имя списка изменений:</translation> </message> @@ -39720,6 +39720,96 @@ </message> </context> <context> + <name>SvnChangeListsDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="14"/> + <source>Subversion Change Lists</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="23"/> + <source>Change Lists:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="36"/> + <source><b>Change Lists</b> +<p>Select a change list here to see the associated files in the list below.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="63"/> + <source><b>Files</b> +<p>This shows a list of files associated with the change list selected above.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="80"/> + <source>Errors</source> + <translation type="unfinished">Ошибки</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="99"/> + <source>Input</source> + <translation type="unfinished">Ввод</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="121"/> + <source>Press to send the input to the subversion process</source> + <translation type="unfinished">Отправить данные процессу subversion</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="124"/> + <source>&Send</source> + <translation type="unfinished">&Отправить</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="127"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="134"/> + <source>Enter data to be sent to the subversion process</source> + <translation type="unfinished">Задайте данные, которые будут посланы процессу subversion</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="141"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished">Задать режим ввода пароля для поля ввода пароля</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="144"/> + <source>&Password Mode</source> + <translation type="unfinished">&Парольный режим</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="147"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="75"/> + <source>Files (relative to {0}):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="138"/> + <source>No changelists found</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="109"/> + <source>Process Generation Error</source> + <translation type="unfinished">Ошибка процесса генерации</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="109"/> + <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>SvnCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py" line="70"/> @@ -39810,56 +39900,61 @@ <context> <name>SvnCommitDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="25"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="26"/> <source>Enter the log message.</source> <translation>Задайте сообщение для журнала.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="28"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.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/vcsPySvn/SvnCommitDialog.ui" line="13"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="14"/> <source>Subversion</source> <translation>Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="42"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="43"/> <source>Recent commit messages</source> <translation>Недавние комментарии к фиксациям</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="49"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="50"/> <source>Select a recent commit message to use</source> <translation>Выберите недавнее сообщение</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="19"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="20"/> <source>Commit Message</source> <translation>Commit сообщение</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="59"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="60"/> <source>Changelists</source> <translation>Список изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="72"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="73"/> <source>Select to keep the changelists</source> <translation>Сохранить список изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="75"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="76"/> <source>Keep changelists</source> <translation>Сохранить список изменений</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="65"/> <source>Enter the list of changelists separated by ';'</source> - <translation>Введите список списков изменений</translation> + <translation type="obsolete">Введите список списков изменений</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="66"/> + <source>Select the change lists to limit the commit</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -41364,122 +41459,122 @@ <translation><b>Показать статус</b><p>Показать статус локального проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="221"/> <source>Tag in repository</source> <translation>Создать тег в репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="221"/> <source>&Tag in repository...</source> <translation>&Создать тег в репозитории...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="225"/> <source>Tag the local project in the repository</source> <translation>Создать в репозитории тег для проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="228"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Создать тег</b><p>Создаёт тег для локального проекта в репозитории.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="235"/> <source>Export from repository</source> <translation>Экспорт из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="235"/> <source>&Export from repository...</source> <translation>&Экспорт из репозитория...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="224"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="239"/> <source>Export a project from the repository</source> <translation>Экспортировать проект из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="227"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="242"/> <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/vcsPySvn/ProjectHelper.py" line="234"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> <source>Command options</source> <translation>Опции командной строки</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> - <source>Command &options...</source> - <translation>&Опции командной строки...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="237"/> - <source>Show the VCS command options</source> - <translation>Показать опции командной строки VCS</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="238"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> - <translation><b>Опции командной строки...</b><p>Показать диалог для редактирования опций командной строки VCS.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> - <source>Revert changes</source> - <translation>Отмена изменений</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> - <source>Re&vert changes</source> - <translation>От&мена изменений</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> - <source>Revert all changes made to the local project</source> - <translation>Отменить все изменения в локальном проекте</translation> + <source>Command &options...</source> + <translation>&Опции командной строки...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="252"/> + <source>Show the VCS command options</source> + <translation>Показать опции командной строки VCS</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="253"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation><b>Опции командной строки...</b><p>Показать диалог для редактирования опций командной строки VCS.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <source>Revert changes</source> + <translation>Отмена изменений</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <source>Re&vert changes</source> + <translation>От&мена изменений</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="264"/> + <source>Revert all changes made to the local project</source> + <translation>Отменить все изменения в локальном проекте</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="267"/> <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/vcsPySvn/ProjectHelper.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> <source>Merge</source> <translation>Слить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> <source>Mer&ge changes...</source> <translation>С&лить изменения...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="263"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="278"/> <source>Merge changes of a tag/revision into the local project</source> <translation>Слить изменения тега/ревизии с локальным проектом</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="266"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="281"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation><b>Слить</b><p>Слить изменения тега/ревизии с локальным проектом.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="288"/> <source>Switch</source> <translation>Переключиться</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="288"/> <source>S&witch...</source> <translation>Пе&реключиться...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="292"/> <source>Switch the local copy to another tag/branch</source> <translation>Переключить локальную копию на другой тег/ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="295"/> <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> <translation><b>Переключиться</b><p>Переключить локальную копию на другой тег/ветвь.</p></translation> </message> @@ -41504,163 +41599,163 @@ <translation type="obsolete"><b>Разрешение конфликтов</b><p>Разрешает конфликты, возникшие при обновлении локальной копии с репозитория.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> <source>Cleanup</source> <translation>Очистка</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> <source>Cleanu&p</source> <translation>О&чистка</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="318"/> <source>Cleanup the local project</source> <translation>Очистить локальный проект</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="321"/> <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/vcsPySvn/ProjectHelper.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="328"/> <source>Execute command</source> <translation>Выполнить команду</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="328"/> <source>E&xecute command...</source> <translation>В&ыполнить команду...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="331"/> <source>Execute an arbitrary VCS command</source> <translation>Выполнить произвольную команду VCS</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="334"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation><b>Выполнить команду</b><p>Открыть диалог для ввода произвольной команды VCS.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="341"/> <source>List tags</source> <translation>Список тегов</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="341"/> <source>List tags...</source> <translation>Список тегов...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> <source>List tags of the project</source> <translation>Список тегов текущего проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="332"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="347"/> <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/vcsPySvn/ProjectHelper.py" line="339"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="354"/> <source>List branches</source> <translation>Список ветвей</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="354"/> <source>List branches...</source> <translation>Список ветвей...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="342"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches of the project</source> <translation>Список ветвей текущего проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="345"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="360"/> <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/vcsPySvn/ProjectHelper.py" line="352"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="367"/> <source>List repository contents</source> <translation>Просмотреть содержимое репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="367"/> <source>List repository contents...</source> <translation>Просмотреть содержимое репозитория...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="355"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="370"/> <source>Lists the contents of the repository</source> <translation>Просмотреть содержимое репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="373"/> <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation><b>Просмотреть содержимое репозитория<b><p>Просмотреть содержимое репозитория системы контроля версий.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="380"/> <source>Set Property</source> <translation>Установить свойство</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="380"/> <source>Set Property...</source> <translation>Установить свойство...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="383"/> <source>Set a property for the project files</source> <translation>Установить свойство файлов проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation><b>Установить свойство</b><p>Устанавливает свойство файлов проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> <source>List Properties</source> <translation>Список свойств</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> <source>List Properties...</source> <translation>Список свойств...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="381"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="396"/> <source>List properties of the project files</source> <translation>Список свойств файлов проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation><b>Список свойств</b><p>Отображает список свойств файлов проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source>Delete Property</source> <translation>Удалить свойство</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source>Delete Property...</source> <translation>Удалить свойство...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="409"/> <source>Delete a property for the project files</source> <translation>Удалить свойство для файлов проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="397"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="412"/> <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> <translation><b>Удалить свойство</b> <p>Удаляет свойство для файлов проекта.</p></translation> @@ -41681,37 +41776,37 @@ <translation type="obsolete"><b>Показать ограниченный журнал</b><p>Отображает журнал с заданным количеством элементов.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="191"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> <source>Show repository info</source> <translation>Показать информацию о репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> <source>Show some repository related information for the local project</source> <translation>Отобразить информацию о репозизтории локального проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> <source>Relocate</source> <translation>Переместить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> <source>Relocate...</source> <translation>Переместить...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="408"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="423"/> <source>Relocate the working copy to a new repository URL</source> <translation>Переместить рабочую копию в репозиторий с новым URL</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="411"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="426"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation><b>Переместить</b><p>Переместить рабочую копию в репозиторий с новым URL.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="198"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/> <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> <translation><b>Информация о репозитории</b><p>Отобразить информацию о репозитории локального проекта.</p></translation> </message> @@ -41731,22 +41826,22 @@ <translation><b>Показать разницу (URL)</b><p>Показывает разницу между репозиториями, заданными двумя URL.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="433"/> <source>Repository Browser</source> <translation>Проводник репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="433"/> <source>Repository Browser...</source> <translation>Проводник репозитория...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="437"/> <source>Show the Repository Browser dialog</source> <translation>Показать диалог проводника репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="440"/> <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> <translation><b>Проводник репозитория</b><p>Показывает проводник репозитория.</p></translation> </message> @@ -41766,45 +41861,60 @@ <translation><b>Показать проводник журнала</b><p>Показывает диалог для навигации по файлу журнала локального проекта. Изначально показывается ограниченное количество записей. Дальнейшие записи могут быть получены позже.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> <source>Configure</source> <translation>Настроить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> <source>Configure...</source> <translation>Настроить...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="450"/> <source>Show the configuration dialog with the Subversion page selected</source> <translation>Показать диалог настроек с выбранной страницей настроек Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="438"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="453"/> <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> <translation><b>Настроить</b><p>Показать диалог настроек с выбранной страницей настроек Subversion.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="302"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="302"/> <source>Con&flicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="305"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="308"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="191"/> + <source>Show change lists</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> + <source>Show the change lists and associated files of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="198"/> + <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnPropDelDialog</name> @@ -42315,22 +42425,22 @@ <translation>Зафиксировать изменения в репозитории...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="584"/> <source>Commit</source> <translation>Зафиксировать</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="682"/> <source>There are no uncommitted changes available/selected.</source> <translation>Нет доступных/выбранных неотправленных изменений.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="701"/> <source>Lock</source> <translation>Захватить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="716"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="717"/> <source>Unlock</source> <translation>Освободить</translation> </message> @@ -42375,22 +42485,22 @@ <translation>заменено</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="701"/> <source>There are no unlocked files available/selected.</source> <translation>Нет доступных/выбранных незахваченных файлов.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="750"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="751"/> <source>There are no locked files available/selected.</source> <translation>Нет доступных/выбранных захваченных файлов.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="733"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="734"/> <source>Break Lock</source> <translation>Нарушить захват</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="750"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="751"/> <source>Steal Lock</source> <translation>Украсть захват</translation> </message> @@ -42532,17 +42642,17 @@ <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="622"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="623"/> <source>Add</source> <translation>Добавить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="622"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="623"/> <source>There are no unversioned entries available/selected.</source> <translation>Нет/не выбраны неверсионные элементы.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="664"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="665"/> <source>Revert</source> <translation>Откатить</translation> </message> @@ -42562,17 +42672,17 @@ <translation>Добавить к списку изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="784"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="785"/> <source>Remove from Changelist</source> <translation>Удалить из списка изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="766"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="767"/> <source>There are no files available/selected not belonging to a changelist.</source> <translation>Среди выбранных нет файлов не включенных в список изменений.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="784"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="785"/> <source>There are no files available/selected belonging to a changelist.</source> <translation>Среди выбранных нет файлов включенных в список изменений.</translation> </message> @@ -42647,7 +42757,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="503"/> <source>all</source> <translation type="unfinished"></translation> </message> @@ -42657,17 +42767,17 @@ <translation type="obsolete">Различие</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="682"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="584"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="664"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="665"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished">Нет/не выбраны пропущенных элементы.</translation> </message> @@ -54789,17 +54899,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1604"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1605"/> <source>unknown</source> <translation>неизвестный</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1474"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Информация о репозитории</h3><table><tr><td><b>Версия Subversion:</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Текущая ревизия</b></td><td>{2}</td></tr><tr><td><b>Зафиксированная ревизия (committed)</b></td><td>{3}</td></tr><tr><td><b>Дата сохранения</b></td><td>{4}</td></tr><tr><td><b>Время сохранения</b></td><td>{5}</td></tr><tr><td><b>Последний автор</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1605"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1606"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Информация о репозитории</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Текущая ревизия</b></td><td>{4}</td></tr><tr><td><b>Зафиксированная ревизия</b></td><td>{5}</td></tr><tr><td><b>Дата сохранения</b></td><td>{6}</td></tr><tr><td><b>Время сохранения</b></td><td>{7}</td></tr><tr><td><b>Автор последней ревизии</b></td><td>{8}</td></tr></table></translation> </message>
--- a/i18n/eric5_tr.ts Sat Jun 02 17:41:24 2012 +0200 +++ b/i18n/eric5_tr.ts Sun Jun 03 12:51:15 2012 +0200 @@ -38966,270 +38966,270 @@ <context> <name>Subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="193"/> <source>The svn process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="196"/> <source>The svn process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="197"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="198"/> <source>Could not start the svn executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="223"/> <source>Create project in repository</source> <translation>Bilgi havuzunda proje oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="223"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation>Proje bilgi havuzunda oluşturulamadı. Belki verilen bilgi havuzu yoktur yada bilgi havuzunun serveri bozuktur.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="245"/> <source>New project</source> <translation>Yeni Proje</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="245"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation>Proje bilgi havuzundan kontrol edilemiyor.<br />Orjinal içerik eski haline getiriliyor.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="314"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="315"/> <source>Importing project into Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="364"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="365"/> <source>Subversion Checkout</source> <translation>Altsürüm Kontrolü</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="427"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="385"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="386"/> <source>Checking project out of Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="427"/> <source>Subversion Export</source> <translation>Altsürüm Dışaaktarma</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="446"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="447"/> <source>Exporting project from Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="530"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="531"/> <source>Commiting changes to Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="586"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="587"/> <source>Synchronizing with the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="687"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="688"/> <source>Adding files/directories to the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="786"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="787"/> <source>Adding directory trees to the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="822"/> <source>Removing files/directories from the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="883"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="884"/> <source>Moving {0}</source> <translation>Taşınıyor {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1127"/> <source>Subversion Error</source> <translation>Altsürüm Hatası</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="987"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="988"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1011"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1012"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1047"/> <source>Tagging {0} in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1075"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1076"/> <source>Reverting changes</source> <translation>Değişiklikler eski haline alınıyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1103"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1127"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1148"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1149"/> <source>Switching to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1250"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1251"/> <source>Merging {0}</source> <translation>Birleştiriliyor {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1527"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1528"/> <source>Cleaning up {0}</source> <translation>Temizle {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1564"/> <source>Subversion command</source> <translation>Altsürüm komutu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1670"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1671"/> <source>Resolving conficts</source> <translation>Çelişki çözümleniyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1709"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1710"/> <source>Copying {0}</source> <translation>Kopyalanıyor {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1776"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1777"/> <source>Subversion Set Property</source> <translation>Altsürüm Özelliklerini Ayarla</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1809"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1810"/> <source>You have to supply a property name. Aborting.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1827"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1828"/> <source>Subversion Delete Property</source> <translation>Altsürüm Silme Önceliği</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1647"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1648"/> <source>Enter property name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="924"/> <source>Subversion Log</source> <translation>Altsürüm Kayıtı</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="924"/> <source>Select number of entries to show.</source> <translation>Gösterilecek giriş sayısını seçiniz.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1993"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1994"/> <source>Locking in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2031"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2032"/> <source>Unlocking in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2076"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2077"/> <source>Relocating</source> <translation>Yeniden konumlandırılıyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2103"/> <source>Repository Browser</source> <translation>Kaynak Havuzu Gözatıcısı</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2103"/> <source>Enter the repository URL.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2127"/> <source>Remove from changelist</source> <translation>Değişiklik listesinden çıkar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2162"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2164"/> <source>Add to changelist</source> <translation>Değişiklik listesine ekle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2152"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2153"/> <source>Enter name of the changelist:</source> <translation>Değişiklik listesi adını giriniz:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="330"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="331"/> <source>Imported revision {0}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="555"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="556"/> <source>Committed revision {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1155"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1156"/> <source>Revision {0}. </source> <translation>Gözden geçirme {0}. </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1792"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1793"/> <source>Property set.</source> <translation>Özellikleri Ayarla.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1842"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1843"/> <source>Property deleted.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1974"/> <source>Subversion Lock</source> <translation>Altsürüm Kilidi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1974"/> <source>Enter lock comment</source> <translation type="unfinished"></translation> </message> @@ -39594,6 +39594,96 @@ </message> </context> <context> + <name>SvnChangeListsDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="14"/> + <source>Subversion Change Lists</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="23"/> + <source>Change Lists:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="36"/> + <source><b>Change Lists</b> +<p>Select a change list here to see the associated files in the list below.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="63"/> + <source><b>Files</b> +<p>This shows a list of files associated with the change list selected above.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="80"/> + <source>Errors</source> + <translation type="unfinished">Hatalar</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="99"/> + <source>Input</source> + <translation type="unfinished">Girdi</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="121"/> + <source>Press to send the input to the subversion process</source> + <translation type="unfinished">Girdiyi altsürüm sürecine göndermek için basınız</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="124"/> + <source>&Send</source> + <translation type="unfinished">&Gönder</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="127"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="134"/> + <source>Enter data to be sent to the subversion process</source> + <translation type="unfinished">Altsürüm işlemleri için gönderilecek verileri gir</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="141"/> + <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/vcsSubversion/SvnChangeListsDialog.ui" line="144"/> + <source>&Password Mode</source> + <translation type="unfinished">&Parola Modu</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="147"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="75"/> + <source>Files (relative to {0}):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="138"/> + <source>No changelists found</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="109"/> + <source>Process Generation Error</source> + <translation type="unfinished">İşlem Üretecinde Hata</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="109"/> + <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>SvnCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.ui" line="14"/> @@ -39677,57 +39767,57 @@ <context> <name>SvnCommitDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="13"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="14"/> <source>Subversion</source> <translation>Altsürüm</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="19"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="20"/> <source>Commit Message</source> <translation>Teslimat mesajı</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="25"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="26"/> <source>Enter the log message.</source> <translation>Kayıt mesajı gir.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="28"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="29"/> <source><b>Log Message</b> <p>Enter the log message for the commit action.</p></source> <translation><b>Kayıt Mesajı</b> <p>Teslim işlemi için kayıt mesajı gir.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="42"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="43"/> <source>Recent commit messages</source> <translation>Geçmiş teslimet mesajları</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="49"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="50"/> <source>Select a recent commit message to use</source> <translation>Geçmiş kayıt mesajlarından seç</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="59"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="60"/> <source>Changelists</source> <translation>Değişiklik Listesi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="65"/> - <source>Enter the list of changelists separated by ';'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="72"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="73"/> <source>Select to keep the changelists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="75"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="76"/> <source>Keep changelists</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="66"/> + <source>Select the change lists to limit the commit</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnCopyDialog</name> @@ -41255,122 +41345,122 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="221"/> <source>Tag in repository</source> <translation>Kaynak havuzu etiketi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="221"/> <source>&Tag in repository...</source> <translation>Kaynak havuzu e&tiketi...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="225"/> <source>Tag the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="228"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="235"/> <source>Export from repository</source> <translation>Kaynak havuzundan ihraç et</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="235"/> <source>&Export from repository...</source> <translation>Dışarı kaynak havuzundan ihraç &et...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="224"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="239"/> <source>Export a project from the repository</source> <translation>Dışa Kaynak havuzundan proje aktar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="227"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="242"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><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/vcsPySvn/ProjectHelper.py" line="234"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> <source>Command options</source> <translation>Komut seçenekleri</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> - <source>Command &options...</source> - <translation>K&omut seçenekleri...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="237"/> - <source>Show the VCS command options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="238"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> - <source>Revert changes</source> - <translation>Değişiklikleri başa döndür</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> - <source>Re&vert changes</source> - <translation>Değişiklikleri ba&şa döndür</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> - <source>Revert all changes made to the local project</source> - <translation type="unfinished"></translation> + <source>Command &options...</source> + <translation>K&omut seçenekleri...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="252"/> + <source>Show the VCS command options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="253"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <source>Revert changes</source> + <translation>Değişiklikleri başa döndür</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <source>Re&vert changes</source> + <translation>Değişiklikleri ba&şa döndür</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="264"/> + <source>Revert all changes made to the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="267"/> <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/vcsPySvn/ProjectHelper.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> <source>Merge</source> <translation>Birleştir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> <source>Mer&ge changes...</source> <translation>De&ğişiklikleri birleştir...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="263"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="278"/> <source>Merge changes of a tag/revision into the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="266"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="281"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="288"/> <source>Switch</source> <translation>Değiştirmek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="288"/> <source>S&witch...</source> <translation>Deği&ştirmek...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="292"/> <source>Switch the local copy to another tag/branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="295"/> <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> <translation type="unfinished"></translation> </message> @@ -41385,258 +41475,273 @@ <translation type="obsolete">Çelişkileri çö&zümle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> <source>Cleanup</source> <translation>Temizle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> <source>Cleanu&p</source> <translation>Temi&zle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="318"/> <source>Cleanup the local project</source> <translation>Yerel projeyi temizle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="321"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Temizle</b><p>Bu yerel projeyi sıfırlar.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="328"/> <source>Execute command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="328"/> <source>E&xecute command...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="331"/> <source>Execute an arbitrary VCS command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="334"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="341"/> <source>List tags</source> <translation>Etiketleri listele</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="341"/> <source>List tags...</source> <translation>Etiketleri listele...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> <source>List tags of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="332"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="347"/> <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/vcsPySvn/ProjectHelper.py" line="339"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="354"/> <source>List branches</source> <translation>Branşlar listesi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="354"/> <source>List branches...</source> <translation>Branşlar listesi...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="342"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches of the project</source> <translation>Prosenin branşlar listesi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="345"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="360"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Branş listesi</b><p>Bu listeler prosenin branş listeleridir.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="367"/> <source>List repository contents</source> <translation>Kaynak Havuzu içeriğini listele</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="367"/> <source>List repository contents...</source> <translation>Kaynak Havuzu içeriğini listele...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="355"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="370"/> <source>Lists the contents of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="373"/> <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="380"/> <source>Set Property</source> <translation>Özellikleri Ayarla</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="380"/> <source>Set Property...</source> <translation>Özellikleri Ayarla...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="383"/> <source>Set a property for the project files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> <source>List Properties</source> <translation>Özellikleri Listele</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> <source>List Properties...</source> <translation>Özellikler Listeleniyor...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="381"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="396"/> <source>List properties of the project files</source> <translation>Proje dosyalarının özelliklerin listele</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source>Delete Property</source> <translation>Özellikleri Sil</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source>Delete Property...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="409"/> <source>Delete a property for the project files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="397"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="412"/> <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> <source>Relocate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> <source>Relocate...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="408"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="423"/> <source>Relocate the working copy to a new repository URL</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="411"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="426"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="433"/> <source>Repository Browser</source> <translation>Kaynak Havuzu Gözatıcısı</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="433"/> <source>Repository Browser...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="437"/> <source>Show the Repository Browser dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="440"/> <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> <source>Configure</source> <translation>Yapılandırma</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> <source>Configure...</source> <translation>Ayarlanıyor...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="450"/> <source>Show the configuration dialog with the Subversion page selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="438"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="453"/> <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> + <source>Show repository info</source> + <translation>Kaynak havuzu bilgisini göster</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> + <source>Show some repository related information for the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/> + <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="302"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="302"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="305"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="308"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="191"/> - <source>Show repository info</source> - <translation>Kaynak havuzu bilgisini göster</translation> + <source>Show change lists</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> - <source>Show some repository related information for the local project</source> + <source>Show the change lists and associated files of the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="198"/> - <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> - <source>Conflicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> - <source>Con&flicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> <translation type="unfinished"></translation> </message> </context> @@ -42214,17 +42319,17 @@ <translation>Değişiklik Listesine Ekle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="784"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="785"/> <source>Remove from Changelist</source> <translation>DEğişiklik listesinden çıkar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="701"/> <source>Lock</source> <translation>Kilitli</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="716"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="717"/> <source>Unlock</source> <translation>Kilitsiz</translation> </message> @@ -42344,57 +42449,57 @@ <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="584"/> <source>Commit</source> <translation>Teslimat</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="682"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="622"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="623"/> <source>Add</source> <translation>Ekle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="622"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="623"/> <source>There are no unversioned entries available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="664"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="665"/> <source>Revert</source> <translation>Başa Dönme</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="701"/> <source>There are no unlocked files available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="750"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="751"/> <source>There are no locked files available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="733"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="734"/> <source>Break Lock</source> <translation>Kırma Kilidi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="750"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="751"/> <source>Steal Lock</source> <translation>Hırsızlık Kilidi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="766"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="767"/> <source>There are no files available/selected not belonging to a changelist.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="784"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="785"/> <source>There are no files available/selected belonging to a changelist.</source> <translation type="unfinished"></translation> </message> @@ -42469,7 +42574,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="503"/> <source>all</source> <translation type="unfinished"></translation> </message> @@ -42479,17 +42584,17 @@ <translation type="obsolete">Farklılık</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="682"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="584"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="664"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="665"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> @@ -54561,17 +54666,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1474"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Kaynak Havuzu Bilgisi</h3><table><tr><td><b>Altsürüm V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Geçerli Gözden Geçirme</b></td><td>{2}</td></tr><tr><td><b>Teslim edilen gözden geçirme</b></td><td>{3}</td></tr><tr><td><b>Teslim Tarihi</b></td><td>{4}</td></tr><tr><td><b>Teslim Zamanı</b></td><td>{5}</td></tr><tr><td><b>Son yazar</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1604"/> - <source>unknown</source> - <translation>bilinmeyen</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1605"/> + <source>unknown</source> + <translation>bilinmeyen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1606"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>KAynak Havuzu Bilgisi</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Altsürümn V.</b></td><td>{1}</td></tr><tr><td><b>Altsürüm API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Geçerli Gözden Geçirme</b></td><td>{4}</td></tr><tr><td><b>Teslim edilen gözden geçirme</b></td><td>{5}</td></tr><tr><td><b>Teslim tarihi</b></td><td>{6}</td></tr><tr><td><b>Teslim zamanı</b></td><td>{7}</td></tr><tr><td><b>Son yazar</b></td><td>{8}</td></tr></table></translation> </message>
--- a/i18n/eric5_zh_CN.GB2312.ts Sat Jun 02 17:41:24 2012 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Sun Jun 03 12:51:15 2012 +0200 @@ -42090,87 +42090,87 @@ <translation type="obsolete">svn 进程已由退出代码 %1 结束</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="196"/> <source>The svn process did not finish within 30s.</source> <translation>svn 进程在 30 秒内不结束。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="197"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="198"/> <source>Could not start the svn executable.</source> <translation>无法开始 svn 执行。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="223"/> <source>Create project in repository</source> <translation>在储存库中创建项目</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="223"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation>无法在储存库中创建项目。已给储存库可能不存在或储存库服务已关闭。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="245"/> <source>New project</source> <translation>新建项目</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="245"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation>无法从储存库中校验项目。<br />恢复原始内容。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="314"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="315"/> <source>Importing project into Subversion repository</source> <translation>将项目导入到版本控制储存库中</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="364"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="365"/> <source>Subversion Checkout</source> <translation>版本控制校验</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="427"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation>标签必须是标准标签或分支标签。请从列表中选择。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="385"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="386"/> <source>Checking project out of Subversion repository</source> <translation>正在从版本控制储存库中检查项目</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="427"/> <source>Subversion Export</source> <translation>版本控制导出</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="446"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="447"/> <source>Exporting project from Subversion repository</source> <translation>正在从版本控制储存库中导出项目</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="530"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="531"/> <source>Commiting changes to Subversion repository</source> <translation>正在将改变提交到版本控制储存库中</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="586"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="587"/> <source>Synchronizing with the Subversion repository</source> <translation>正在与版本控制储存库同步</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="687"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="688"/> <source>Adding files/directories to the Subversion repository</source> <translation>将文件或文件夹添加到版本控制储存库</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="786"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="787"/> <source>Adding directory trees to the Subversion repository</source> <translation>将目录树添加到版本控制储存库</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="822"/> <source>Removing files/directories from the Subversion repository</source> <translation>从版本控制储存库移除文件或文件夹</translation> </message> @@ -42180,17 +42180,17 @@ <translation type="obsolete">正在移动 %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1127"/> <source>Subversion Error</source> <translation>版本控制错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="987"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="988"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>项目储存库的 URL 无法从工作拷贝中检索。标签操作将被终止</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1011"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1012"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>项目储存库的 URL 包含无效格式。标签操作将被终止</translation> </message> @@ -42200,17 +42200,17 @@ <translation type="obsolete">在版本控制储存库中标记 %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1075"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1076"/> <source>Reverting changes</source> <translation>还原改变</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1103"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>项目储存库的 URL 无法从工作拷贝中检索。转换操作将被终止</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1127"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>项目储存库的 URL 包含无效格式。转换操作将被终止</translation> </message> @@ -42230,12 +42230,12 @@ <translation type="obsolete">清除 %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1564"/> <source>Subversion command</source> <translation>版本控制命令</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1670"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1671"/> <source>Resolving conficts</source> <translation>解析冲突</translation> </message> @@ -42245,72 +42245,72 @@ <translation type="obsolete">复制 %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1776"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1777"/> <source>Subversion Set Property</source> <translation>版本控制设置属性</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1809"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1810"/> <source>You have to supply a property name. Aborting.</source> <translation>必须提供一个属性名。终止。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1827"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1828"/> <source>Subversion Delete Property</source> <translation>版本控制删除属性</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1647"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1648"/> <source>Enter property name</source> <translation>输入属性名</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="924"/> <source>Subversion Log</source> <translation>版本控制日志</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="924"/> <source>Select number of entries to show.</source> <translation>选择要显示的条目数。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1993"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1994"/> <source>Locking in the Subversion repository</source> <translation>在版本控制储存库中锁定</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2031"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2032"/> <source>Unlocking in the Subversion repository</source> <translation>在版本控制储存库中解锁</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2076"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2077"/> <source>Relocating</source> <translation>重新定位</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2103"/> <source>Repository Browser</source> <translation>储存库浏览器</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2103"/> <source>Enter the repository URL.</source> <translation>输入储存库 URL。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2127"/> <source>Remove from changelist</source> <translation>从更改列表中移除</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2162"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2164"/> <source>Add to changelist</source> <translation>添加更改列表</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2152"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2153"/> <source>Enter name of the changelist:</source> <translation>输入更改列表名称：</translation> </message> @@ -42334,22 +42334,22 @@ </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1792"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1793"/> <source>Property set.</source> <translation>属性设置。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1842"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1843"/> <source>Property deleted.</source> <translation>属性已删除。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1974"/> <source>Subversion Lock</source> <translation>版本控制锁定</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1974"/> <source>Enter lock comment</source> <translation>输入锁定注释</translation> </message> @@ -42519,53 +42519,53 @@ <translation>unversioned</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="193"/> <source>The svn process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="883"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="884"/> <source>Moving {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1047"/> <source>Tagging {0} in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1148"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1149"/> <source>Switching to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1250"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1251"/> <source>Merging {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1527"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1528"/> <source>Cleaning up {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1709"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1710"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="330"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="331"/> <source>Imported revision {0}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="555"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="556"/> <source>Committed revision {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1155"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1156"/> <source>Revision {0}. </source> <translation type="unfinished"></translation> @@ -42776,6 +42776,96 @@ </message> </context> <context> + <name>SvnChangeListsDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="14"/> + <source>Subversion Change Lists</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="23"/> + <source>Change Lists:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="36"/> + <source><b>Change Lists</b> +<p>Select a change list here to see the associated files in the list below.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="63"/> + <source><b>Files</b> +<p>This shows a list of files associated with the change list selected above.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="80"/> + <source>Errors</source> + <translation type="unfinished">错误</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="99"/> + <source>Input</source> + <translation type="unfinished">输入</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="121"/> + <source>Press to send the input to the subversion process</source> + <translation type="unfinished">点击将输入发送到版本控制进程</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="124"/> + <source>&Send</source> + <translation type="unfinished">发送(&S)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="127"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="134"/> + <source>Enter data to be sent to the subversion process</source> + <translation type="unfinished">输入要发送到版本控制进程的数据</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="141"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished">选择将输入区域转换成密码模式</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="144"/> + <source>&Password Mode</source> + <translation type="unfinished">密码模式(&P)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="147"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="75"/> + <source>Files (relative to {0}):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="138"/> + <source>No changelists found</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="109"/> + <source>Process Generation Error</source> + <translation type="unfinished">进程生成错误</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="109"/> + <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>SvnCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.ui" line="14"/> @@ -42866,57 +42956,62 @@ <context> <name>SvnCommitDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="13"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="14"/> <source>Subversion</source> <translation>版本控制</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="19"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="20"/> <source>Commit Message</source> <translation>提交消息</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="25"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="26"/> <source>Enter the log message.</source> <translation>输入日志消息。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="28"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.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/vcsPySvn/SvnCommitDialog.ui" line="42"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="43"/> <source>Recent commit messages</source> <translation>最近提交消息</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="49"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="50"/> <source>Select a recent commit message to use</source> <translation>选择使用一个最近提交消息</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="59"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="60"/> <source>Changelists</source> <translation>更改列表</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="65"/> <source>Enter the list of changelists separated by ';'</source> - <translation>输入更改列表的列表，用“;”分隔</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="72"/> + <translation type="obsolete">输入更改列表的列表，用“;”分隔</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="73"/> <source>Select to keep the changelists</source> <translation>选择保留更改列表</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="75"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="76"/> <source>Keep changelists</source> <translation>保留更改列表</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="66"/> + <source>Select the change lists to limit the commit</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnCopyDialog</name> @@ -44640,122 +44735,122 @@ <translation><b>显示状态</b><p>显示本地项目的状态。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="221"/> <source>Tag in repository</source> <translation>在储存库中标记</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="221"/> <source>&Tag in repository...</source> <translation>在储存库中标记(&T)……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="225"/> <source>Tag the local project in the repository</source> <translation>在储存库中标记本地项目</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="228"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>在储存库中标记</b><p>在储存库中标记本地项目。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="235"/> <source>Export from repository</source> <translation>从储存库导出</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="235"/> <source>&Export from repository...</source> <translation>从储存库导出(&E)……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="224"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="239"/> <source>Export a project from the repository</source> <translation>从储存库中导出一个项目</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="227"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="242"/> <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/vcsPySvn/ProjectHelper.py" line="234"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> <source>Command options</source> <translation>命令选项</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> - <source>Command &options...</source> - <translation>命令选项(&o)……</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="237"/> - <source>Show the VCS command options</source> - <translation>显示版本控制系统命令选项</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="238"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> - <translation><b>命令选项……</b><p>显示一个对话框以编辑版本控制系统命令选项。</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> - <source>Revert changes</source> - <translation>还原改变</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> - <source>Re&vert changes</source> - <translation>还原改变(&v)</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> - <source>Revert all changes made to the local project</source> - <translation>还原所有改变到本地项目中</translation> + <source>Command &options...</source> + <translation>命令选项(&o)……</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="252"/> + <source>Show the VCS command options</source> + <translation>显示版本控制系统命令选项</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="253"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation><b>命令选项……</b><p>显示一个对话框以编辑版本控制系统命令选项。</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <source>Revert changes</source> + <translation>还原改变</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <source>Re&vert changes</source> + <translation>还原改变(&v)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="264"/> + <source>Revert all changes made to the local project</source> + <translation>还原所有改变到本地项目中</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="267"/> <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/vcsPySvn/ProjectHelper.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> <source>Merge</source> <translation>合并</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> <source>Mer&ge changes...</source> <translation>合并更改(&g)……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="263"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="278"/> <source>Merge changes of a tag/revision into the local project</source> <translation>将标签或修订本的改变合并到当前项目</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="266"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="281"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation><b>合并</b><p>将标签或修订本的改变合并到当前项目。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="288"/> <source>Switch</source> <translation>转换</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="288"/> <source>S&witch...</source> <translation>转换(&w)……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="292"/> <source>Switch the local copy to another tag/branch</source> <translation>转换本地副本到另一个标签或分支</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="295"/> <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> <translation><b>转换</b><p>转换本地副本到另一个标签或分支。</p></translation> </message> @@ -44780,258 +44875,273 @@ <translation type="obsolete"><b>解析冲突</b><p>解析本地项目的所有冲突。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> <source>Cleanup</source> <translation>清除</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> <source>Cleanu&p</source> <translation>清除(&p)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="318"/> <source>Cleanup the local project</source> <translation>清除本地项目</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="321"/> <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/vcsPySvn/ProjectHelper.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="328"/> <source>Execute command</source> <translation>执行命令</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="328"/> <source>E&xecute command...</source> <translation>执行命令(&x)……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="331"/> <source>Execute an arbitrary VCS command</source> <translation>执行任意的版本控制系统命令</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="334"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation><b>执行命令</b><p>打开一个对话框以输入任意一个版本控制系统命令。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="341"/> <source>List tags</source> <translation>列出标签</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="341"/> <source>List tags...</source> <translation>列出标签……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> <source>List tags of the project</source> <translation>列出项目的标签</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="332"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="347"/> <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/vcsPySvn/ProjectHelper.py" line="339"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="354"/> <source>List branches</source> <translation>列出分支</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="354"/> <source>List branches...</source> <translation>列出分支……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="342"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches of the project</source> <translation>列出项目的分支</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="345"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="360"/> <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/vcsPySvn/ProjectHelper.py" line="352"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="367"/> <source>List repository contents</source> <translation>列出储存库内容</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="367"/> <source>List repository contents...</source> <translation>列出储存库内容……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="355"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="370"/> <source>Lists the contents of the repository</source> <translation>列出储存库的内容</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="373"/> <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation><b>列出储存库内容</b><p>列出储存库的内容。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="380"/> <source>Set Property</source> <translation>设置属性</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="380"/> <source>Set Property...</source> <translation>设置属性……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="383"/> <source>Set a property for the project files</source> <translation>为项目文件设置一个属性</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation><b>设置属性</b><p>为项目文件设置一个属性。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> <source>List Properties</source> <translation>列出属性</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> <source>List Properties...</source> <translation>列出属性……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="381"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="396"/> <source>List properties of the project files</source> <translation>列出项目文件的属性</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation><b>列出属性</b><p>列出项目文件的属性。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source>Delete Property</source> <translation>删除属性</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source>Delete Property...</source> <translation>删除属性……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="409"/> <source>Delete a property for the project files</source> <translation>从项目文件中删除一个属性</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="397"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="412"/> <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> <translation><b>删除属性</b><p>从项目文件中删除一个属性。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> <source>Relocate</source> <translation>重定位</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> <source>Relocate...</source> <translation>重定位……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="408"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="423"/> <source>Relocate the working copy to a new repository URL</source> <translation>将工作副本重定位到一个新的储存库 URL</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="411"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="426"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation><b>重定位</b><p>将工作副本重定位到一个新的储存库 URL 。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="433"/> <source>Repository Browser</source> <translation>储存库浏览器</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="433"/> <source>Repository Browser...</source> <translation>储存库浏览器……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="437"/> <source>Show the Repository Browser dialog</source> <translation>显示储存库浏览器对话框</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="440"/> <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> <translation><b>储存库浏览器</b><p>显示储存库浏览器对话框。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> <source>Configure</source> <translation>配置</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> <source>Configure...</source> <translation>配置……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="450"/> <source>Show the configuration dialog with the Subversion page selected</source> <translation>显示配置对话框并自动选择版本控制页面</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="438"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="453"/> <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> <translation><b>配置</b><p>显示配置对话框并自动选择版本控制页面。</p></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> + <source>Show repository info</source> + <translation>显示储存库信息</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> + <source>Show some repository related information for the local project</source> + <translation>显示本地项目的一些储存库相关信息</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/> + <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> + <translation><b>显示储存库信息</b><p>显示本地项目的一些储存库相关信息。</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="302"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="302"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="305"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="308"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="191"/> - <source>Show repository info</source> - <translation>显示储存库信息</translation> + <source>Show change lists</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> - <source>Show some repository related information for the local project</source> - <translation>显示本地项目的一些储存库相关信息</translation> + <source>Show the change lists and associated files of the local project</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="198"/> - <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> - <translation><b>显示储存库信息</b><p>显示本地项目的一些储存库相关信息。</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> - <source>Conflicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> - <source>Con&flicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> <translation type="unfinished"></translation> </message> </context> @@ -45619,17 +45729,17 @@ <translation>添加更改列表</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="784"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="785"/> <source>Remove from Changelist</source> <translation>从更改列表中移除</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="701"/> <source>Lock</source> <translation>闭锁</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="716"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="717"/> <source>Unlock</source> <translation>解锁</translation> </message> @@ -45749,57 +45859,57 @@ <translation type="obsolete">无法启动进程 %1，在搜索路径中。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="584"/> <source>Commit</source> <translation>提交</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="682"/> <source>There are no uncommitted changes available/selected.</source> <translation>没有未提交的更改可用或被选择。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="622"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="623"/> <source>Add</source> <translation>添加</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="622"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="623"/> <source>There are no unversioned entries available/selected.</source> <translation>没有未版本化的条目可用或被选择。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="664"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="665"/> <source>Revert</source> <translation>还原</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="701"/> <source>There are no unlocked files available/selected.</source> <translation>没有未解锁的文件可用或被选择。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="750"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="751"/> <source>There are no locked files available/selected.</source> <translation>没有闭锁的文件可用或被选择。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="733"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="734"/> <source>Break Lock</source> <translation>Break Lock</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="750"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="751"/> <source>Steal Lock</source> <translation>Steal Lock</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="766"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="767"/> <source>There are no files available/selected not belonging to a changelist.</source> <translation>没有不属于更改列表的文件可用或被选择。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="784"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="785"/> <source>There are no files available/selected belonging to a changelist.</source> <translation>没有属于更改列表的文件可用或被选择。</translation> </message> @@ -45879,7 +45989,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="503"/> <source>all</source> <translation type="unfinished"></translation> </message> @@ -45889,17 +45999,17 @@ <translation type="obsolete">差异</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="682"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="584"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="664"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="665"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> @@ -58821,7 +58931,7 @@ <translation type="obsolete"><h3>储存库信息</h3><table><tr><td><b>版本控制版本</b></td><td>%1</td></tr><tr><td><b>URL</b></td><td>%2</td></tr><tr><td><b>当前修订</b></td><td>%3</td></tr><tr><td><b>已提交的修订</b></td><td>%4</td></tr><tr><td><b>提交日期</b></td><td>%5</td></tr><tr><td><b>提交时间</b></td><td>%6</td></tr><tr><td><b>最终作者</b></td><td>%7</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1604"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1605"/> <source>unknown</source> <translation>未知</translation> </message> @@ -58831,12 +58941,12 @@ <translation type="obsolete"><h3>储存库信息</h3><table><tr><td><b>PySvn 版本</b></td><td>%1</td></tr><tr><td><b>版本控制版本</b></td><td>%2</td></tr><tr><td><b>版本控制 API 版本</b></td><td>%3</td></tr><tr><td><b>URL</b></td><td>%4</td></tr><tr><td><b>当前修订</b></td><td>%5</td></tr><tr><td><b>已提交的修订</b></td><td>%6</td></tr><tr><td><b>提交日期</b></td><td>%7</td></tr><tr><td><b>提交时间</b></td><td>%8</td></tr><tr><td><b>最终作者</b></td><td>%9</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1474"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1605"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1606"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation type="unfinished"></translation> </message>
