Mercurial Repositories > eric / changeset
changeset
Improved the VCS copy/move operations a bit.
Sat, 02 Jun 2012 16:36:16 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 02 Jun 2012 16:36:16 +0200
- changeset 1885
- e51a12f1f404
- parent 1884
- 0a7ef7f4d09e
- child 1886
- 732f94385668
Improved the VCS copy/move operations a bit.
--- a/APIs/Python3/eric5.api Sat Jun 02 15:27:03 2012 +0200 +++ b/APIs/Python3/eric5.api Sat Jun 02 16:36:16 2012 +0200 @@ -3706,6 +3706,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.HgCopyDialog.getData?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.HgCopyDialog.on_dirButton_clicked?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.HgCopyDialog.on_targetEdit_textChanged?4(txt) eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.HgCopyDialog?1(source, parent=None, move=False, force=False) eric5.Plugins.VcsPlugins.vcsMercurial.HgDialog.HgDialog.hasAddOrDelete?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgDialog.HgDialog.keyPressEvent?4(evt) @@ -4175,6 +4176,7 @@ eric5.Plugins.VcsPlugins.vcsPySvn.SvnConst.svnStatusMap?7 eric5.Plugins.VcsPlugins.vcsPySvn.SvnCopyDialog.SvnCopyDialog.getData?4() eric5.Plugins.VcsPlugins.vcsPySvn.SvnCopyDialog.SvnCopyDialog.on_dirButton_clicked?4() +eric5.Plugins.VcsPlugins.vcsPySvn.SvnCopyDialog.SvnCopyDialog.on_targetEdit_textChanged?4(txt) eric5.Plugins.VcsPlugins.vcsPySvn.SvnCopyDialog.SvnCopyDialog?1(source, parent=None, move=False, force=False) eric5.Plugins.VcsPlugins.vcsPySvn.SvnDialog.SvnDialog._clientNotifyCallback?5(eventDict) eric5.Plugins.VcsPlugins.vcsPySvn.SvnDialog.SvnDialog.finish?4() @@ -4387,6 +4389,7 @@ eric5.Plugins.VcsPlugins.vcsSubversion.SvnCommitDialog.SvnCommitDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsSubversion.SvnCopyDialog.SvnCopyDialog.getData?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnCopyDialog.SvnCopyDialog.on_dirButton_clicked?4() +eric5.Plugins.VcsPlugins.vcsSubversion.SvnCopyDialog.SvnCopyDialog.on_targetEdit_textChanged?4(txt) eric5.Plugins.VcsPlugins.vcsSubversion.SvnCopyDialog.SvnCopyDialog?1(source, parent=None, move=False, force=False) eric5.Plugins.VcsPlugins.vcsSubversion.SvnDialog.SvnDialog.hasAddOrDelete?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnDialog.SvnDialog.keyPressEvent?4(evt)
--- a/Documentation/Help/source.qhp Sat Jun 02 15:27:03 2012 +0200 +++ b/Documentation/Help/source.qhp Sat Jun 02 16:36:16 2012 +0200 @@ -5090,6 +5090,7 @@ <keyword name="HgCopyDialog (Module)" id="HgCopyDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.html" /> <keyword name="HgCopyDialog.getData" id="HgCopyDialog.getData" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.html#HgCopyDialog.getData" /> <keyword name="HgCopyDialog.on_dirButton_clicked" id="HgCopyDialog.on_dirButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.html#HgCopyDialog.on_dirButton_clicked" /> + <keyword name="HgCopyDialog.on_targetEdit_textChanged" id="HgCopyDialog.on_targetEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.html#HgCopyDialog.on_targetEdit_textChanged" /> <keyword name="HgDialog" id="HgDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgDialog.html#HgDialog" /> <keyword name="HgDialog (Constructor)" id="HgDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgDialog.html#HgDialog.__init__" /> <keyword name="HgDialog (Module)" id="HgDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgDialog.html" /> @@ -9075,6 +9076,8 @@ <keyword name="SvnCopyDialog.getData" id="SvnCopyDialog.getData" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnCopyDialog.html#SvnCopyDialog.getData" /> <keyword name="SvnCopyDialog.on_dirButton_clicked" id="SvnCopyDialog.on_dirButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnCopyDialog.html#SvnCopyDialog.on_dirButton_clicked" /> <keyword name="SvnCopyDialog.on_dirButton_clicked" id="SvnCopyDialog.on_dirButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnCopyDialog.html#SvnCopyDialog.on_dirButton_clicked" /> + <keyword name="SvnCopyDialog.on_targetEdit_textChanged" id="SvnCopyDialog.on_targetEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnCopyDialog.html#SvnCopyDialog.on_targetEdit_textChanged" /> + <keyword name="SvnCopyDialog.on_targetEdit_textChanged" id="SvnCopyDialog.on_targetEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnCopyDialog.html#SvnCopyDialog.on_targetEdit_textChanged" /> <keyword name="SvnDialog" id="SvnDialog" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnDialog.html#SvnDialog" /> <keyword name="SvnDialog" id="SvnDialog" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnDialog.html#SvnDialog" /> <keyword name="SvnDialog (Constructor)" id="SvnDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnDialog.html#SvnDialog.__init__" />
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.html Sat Jun 02 15:27:03 2012 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.html Sat Jun 02 16:36:16 2012 +0200 @@ -66,6 +66,9 @@ </tr><tr> <td><a href="#HgCopyDialog.on_dirButton_clicked">on_dirButton_clicked</a></td> <td>Private slot to handle the button press for selecting the target via a selection dialog.</td> +</tr><tr> +<td><a href="#HgCopyDialog.on_targetEdit_textChanged">on_targetEdit_textChanged</a></td> +<td>Private slot to handle changes of the target.</td> </tr> </table> <h3>Static Methods</h3> @@ -86,7 +89,7 @@ parent widget (QWidget) </dd><dt><i>move</i></dt> <dd> -flag indicating a move operation +flag indicating a move operation (boolean) </dd><dt><i>force</i></dt> <dd> flag indicating a forced operation (boolean) @@ -108,7 +111,17 @@ <p> Private slot to handle the button press for selecting the target via a selection dialog. -</p> +</p><a NAME="HgCopyDialog.on_targetEdit_textChanged" ID="HgCopyDialog.on_targetEdit_textChanged"></a> +<h4>HgCopyDialog.on_targetEdit_textChanged</h4> +<b>on_targetEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the target. +</p><dl> +<dt><i>txt</i></dt> +<dd> +contents of the target edit (string) +</dd> +</dl> <div align="right"><a href="#top">Up</a></div> <hr /> </body></html> \ No newline at end of file
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnCopyDialog.html Sat Jun 02 15:27:03 2012 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnCopyDialog.html Sat Jun 02 16:36:16 2012 +0200 @@ -32,7 +32,7 @@ <table> <tr> <td><a href="#SvnCopyDialog">SvnCopyDialog</a></td> -<td>Class implementing a dialog to enter the data for a copy operation.</td> +<td>Class implementing a dialog to enter the data for a copy or rename operation.</td> </tr> </table> <h3>Functions</h3> @@ -43,7 +43,7 @@ <a NAME="SvnCopyDialog" ID="SvnCopyDialog"></a> <h2>SvnCopyDialog</h2> <p> - Class implementing a dialog to enter the data for a copy operation. + Class implementing a dialog to enter the data for a copy or rename operation. </p> <h3>Derived from</h3> QDialog, Ui_SvnCopyDialog @@ -66,6 +66,9 @@ </tr><tr> <td><a href="#SvnCopyDialog.on_dirButton_clicked">on_dirButton_clicked</a></td> <td>Private slot to handle the button press for selecting the target via a selection dialog.</td> +</tr><tr> +<td><a href="#SvnCopyDialog.on_targetEdit_textChanged">on_targetEdit_textChanged</a></td> +<td>Private slot to handle changes of the target.</td> </tr> </table> <h3>Static Methods</h3> @@ -108,7 +111,17 @@ <p> Private slot to handle the button press for selecting the target via a selection dialog. -</p> +</p><a NAME="SvnCopyDialog.on_targetEdit_textChanged" ID="SvnCopyDialog.on_targetEdit_textChanged"></a> +<h4>SvnCopyDialog.on_targetEdit_textChanged</h4> +<b>on_targetEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the target. +</p><dl> +<dt><i>txt</i></dt> +<dd> +contents of the target edit (string) +</dd> +</dl> <div align="right"><a href="#top">Up</a></div> <hr /> </body></html> \ No newline at end of file
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnCopyDialog.html Sat Jun 02 15:27:03 2012 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnCopyDialog.html Sat Jun 02 16:36:16 2012 +0200 @@ -32,7 +32,7 @@ <table> <tr> <td><a href="#SvnCopyDialog">SvnCopyDialog</a></td> -<td>Class implementing a dialog to enter the data for a copy operation.</td> +<td>Class implementing a dialog to enter the data for a copy or rename operation.</td> </tr> </table> <h3>Functions</h3> @@ -43,7 +43,7 @@ <a NAME="SvnCopyDialog" ID="SvnCopyDialog"></a> <h2>SvnCopyDialog</h2> <p> - Class implementing a dialog to enter the data for a copy operation. + Class implementing a dialog to enter the data for a copy or rename operation. </p> <h3>Derived from</h3> QDialog, Ui_SvnCopyDialog @@ -66,6 +66,9 @@ </tr><tr> <td><a href="#SvnCopyDialog.on_dirButton_clicked">on_dirButton_clicked</a></td> <td>Private slot to handle the button press for selecting the target via a selection dialog.</td> +</tr><tr> +<td><a href="#SvnCopyDialog.on_targetEdit_textChanged">on_targetEdit_textChanged</a></td> +<td>Private slot to handle changes of the target.</td> </tr> </table> <h3>Static Methods</h3> @@ -86,7 +89,7 @@ parent widget (QWidget) </dd><dt><i>move</i></dt> <dd> -flag indicating a move operation +flag indicating a move operation (boolean) </dd><dt><i>force</i></dt> <dd> flag indicating a forced operation (boolean) @@ -108,7 +111,17 @@ <p> Private slot to handle the button press for selecting the target via a selection dialog. -</p> +</p><a NAME="SvnCopyDialog.on_targetEdit_textChanged" ID="SvnCopyDialog.on_targetEdit_textChanged"></a> +<h4>SvnCopyDialog.on_targetEdit_textChanged</h4> +<b>on_targetEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the target. +</p><dl> +<dt><i>txt</i></dt> +<dd> +contents of the target edit (string) +</dd> +</dl> <div align="right"><a href="#top">Up</a></div> <hr /> </body></html> \ No newline at end of file
--- a/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py Sat Jun 02 15:27:03 2012 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py Sat Jun 02 16:36:16 2012 +0200 @@ -10,7 +10,7 @@ import os.path from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog +from PyQt4.QtGui import QDialog, QDialogButtonBox from E5Gui.E5Completers import E5FileCompleter, E5DirCompleter from E5Gui import E5FileDialog @@ -28,7 +28,7 @@ @param source name of the source file/directory (string) @param parent parent widget (QWidget) - @param move flag indicating a move operation + @param move flag indicating a move operation (boolean) @param force flag indicating a forced operation (boolean) """ super().__init__(parent) @@ -47,6 +47,8 @@ self.forceCheckBox.setChecked(force) self.sourceEdit.setText(source) + + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) def getData(self): """ @@ -55,8 +57,11 @@ @return the target name (string) and a flag indicating the operation should be enforced (boolean) """ - # TODO: check if target is an absolute path. If not make it relative to source. - return self.targetEdit.text(), self.forceCheckBox.isChecked() + target = self.targetEdit.text() + if not os.path.isabs(target): + sourceDir = os.path.dirname(self.sourceEdit.text()) + target = os.path.join(sourceDir, target) + return target, self.forceCheckBox.isChecked() @pyqtSlot() def on_dirButton_clicked(self): @@ -80,3 +85,13 @@ if target: self.targetEdit.setText(target) + + @pyqtSlot(str) + def on_targetEdit_textChanged(self, txt): + """ + Private slot to handle changes of the target. + + @param txt contents of the target edit (string) + """ + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled( + os.path.isabs(txt) or os.path.dirname(txt) == "")
--- a/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui Sat Jun 02 15:27:03 2012 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui Sat Jun 02 16:36:16 2012 +0200 @@ -61,7 +61,7 @@ </property> <property name="whatsThis"> <string><b>Target name</b> -<p>Enter the new name in this field.</p></string> +<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></string> </property> </widget> </item>
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Sat Jun 02 15:27:03 2012 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Sat Jun 02 16:36:16 2012 +0200 @@ -211,10 +211,9 @@ self.__HgForget) self.vcsMenuActions.append(act) menu.addSeparator() - # TODO: remove " in repository" because it is somewhat misleading (and later on) - act = menu.addAction(self.trUtf8('Copy in repository'), self.__HgCopy) + act = menu.addAction(self.trUtf8('Copy'), self.__HgCopy) self.vcsMenuActions.append(act) - act = menu.addAction(self.trUtf8('Move in repository'), self.__HgMove) + act = menu.addAction(self.trUtf8('Move'), self.__HgMove) self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction(UI.PixmapCache.getIcon("vcsLog.png"), @@ -396,9 +395,9 @@ self._VCSRemove) self.vcsDirMenuActions.append(act) menu.addSeparator() - act = menu.addAction(self.trUtf8('Copy in repository'), self.__HgCopy) + act = menu.addAction(self.trUtf8('Copy'), self.__HgCopy) self.vcsDirMenuActions.append(act) - act = menu.addAction(self.trUtf8('Move in repository'), self.__HgMove) + act = menu.addAction(self.trUtf8('Move'), self.__HgMove) self.vcsDirMenuActions.append(act) menu.addSeparator() act = menu.addAction(UI.PixmapCache.getIcon("vcsLog.png"),
--- a/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py Sat Jun 02 15:27:03 2012 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py Sat Jun 02 16:36:16 2012 +0200 @@ -227,10 +227,9 @@ self._VCSRemove) self.vcsMenuActions.append(act) menu.addSeparator() - # TODO: remove " in repository" because it is somewhat misleading (and later on) - act = menu.addAction(self.trUtf8('Copy in repository'), self.__SVNCopy) + act = menu.addAction(self.trUtf8('Copy'), self.__SVNCopy) self.vcsMenuActions.append(act) - act = menu.addAction(self.trUtf8('Move in repository'), self.__SVNMove) + act = menu.addAction(self.trUtf8('Move'), self.__SVNMove) self.vcsMenuActions.append(act) if pysvn.svn_version >= (1, 5, 0) and pysvn.version >= (1, 6, 0): menu.addSeparator() @@ -492,9 +491,9 @@ self._VCSRemove) self.vcsDirMenuActions.append(act) menu.addSeparator() - act = menu.addAction(self.trUtf8('Copy in repository'), self.__SVNCopy) + act = menu.addAction(self.trUtf8('Copy'), self.__SVNCopy) self.vcsDirMenuActions.append(act) - act = menu.addAction(self.trUtf8('Move in repository'), self.__SVNMove) + act = menu.addAction(self.trUtf8('Move'), self.__SVNMove) self.vcsDirMenuActions.append(act) if pysvn.svn_version >= (1, 5, 0) and pysvn.version >= (1, 6, 0): menu.addSeparator()
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py Sat Jun 02 15:27:03 2012 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py Sat Jun 02 16:36:16 2012 +0200 @@ -10,7 +10,7 @@ import os.path from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog +from PyQt4.QtGui import QDialog, QDialogButtonBox from E5Gui.E5Completers import E5FileCompleter, E5DirCompleter from E5Gui import E5FileDialog @@ -20,7 +20,7 @@ class SvnCopyDialog(QDialog, Ui_SvnCopyDialog): """ - Class implementing a dialog to enter the data for a copy operation. + Class implementing a dialog to enter the data for a copy or rename operation. """ def __init__(self, source, parent=None, move=False, force=False): """ @@ -48,6 +48,8 @@ self.sourceEdit.setText(source) + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) + def getData(self): """ Public method to retrieve the copy data. @@ -55,8 +57,11 @@ @return the target name (string) and a flag indicating the operation should be enforced (boolean) """ - # TODO: check if target is an absolute path. If not make it relative to source. - return self.targetEdit.text(), self.forceCheckBox.isChecked() + target = self.targetEdit.text() + if not os.path.isabs(target): + sourceDir = os.path.dirname(self.sourceEdit.text()) + target = os.path.join(sourceDir, target) + return target, self.forceCheckBox.isChecked() @pyqtSlot() def on_dirButton_clicked(self): @@ -80,3 +85,13 @@ if target: self.targetEdit.setText(target) + + @pyqtSlot(str) + def on_targetEdit_textChanged(self, txt): + """ + Private slot to handle changes of the target. + + @param txt contents of the target edit (string) + """ + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled( + os.path.isabs(txt) or os.path.dirname(txt) == "")
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui Sat Jun 02 15:27:03 2012 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui Sat Jun 02 16:36:16 2012 +0200 @@ -61,7 +61,7 @@ </property> <property name="whatsThis"> <string><b>Target name</b> -<p>Enter the new name in this field.</p></string> +<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></string> </property> </widget> </item>
--- a/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py Sat Jun 02 15:27:03 2012 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py Sat Jun 02 16:36:16 2012 +0200 @@ -225,10 +225,9 @@ self._VCSRemove) self.vcsMenuActions.append(act) menu.addSeparator() - # TODO: remove " in repository" because it is somewhat misleading (and later on) - act = menu.addAction(self.trUtf8('Copy in repository'), self.__SVNCopy) + act = menu.addAction(self.trUtf8('Copy'), self.__SVNCopy) self.vcsMenuActions.append(act) - act = menu.addAction(self.trUtf8('Move in repository'), self.__SVNMove) + act = menu.addAction(self.trUtf8('Move'), self.__SVNMove) self.vcsMenuActions.append(act) if self.vcs.version >= (1, 5, 0): menu.addSeparator() @@ -489,9 +488,9 @@ self._VCSRemove) self.vcsDirMenuActions.append(act) menu.addSeparator() - act = menu.addAction(self.trUtf8('Copy in repository'), self.__SVNCopy) + act = menu.addAction(self.trUtf8('Copy'), self.__SVNCopy) self.vcsDirMenuActions.append(act) - act = menu.addAction(self.trUtf8('Move in repository'), self.__SVNMove) + act = menu.addAction(self.trUtf8('Move'), self.__SVNMove) self.vcsDirMenuActions.append(act) if self.vcs.version >= (1, 5, 0): menu.addSeparator()
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.py Sat Jun 02 15:27:03 2012 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.py Sat Jun 02 16:36:16 2012 +0200 @@ -10,7 +10,7 @@ import os.path from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog +from PyQt4.QtGui import QDialog, QDialogButtonBox from E5Gui.E5Completers import E5FileCompleter, E5DirCompleter from E5Gui import E5FileDialog @@ -20,7 +20,7 @@ class SvnCopyDialog(QDialog, Ui_SvnCopyDialog): """ - Class implementing a dialog to enter the data for a copy operation. + Class implementing a dialog to enter the data for a copy or rename operation. """ def __init__(self, source, parent=None, move=False, force=False): """ @@ -28,7 +28,7 @@ @param source name of the source file/directory (string) @param parent parent widget (QWidget) - @param move flag indicating a move operation + @param move flag indicating a move operation (boolean) @param force flag indicating a forced operation (boolean) """ super().__init__(parent) @@ -48,6 +48,8 @@ self.sourceEdit.setText(source) + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) + def getData(self): """ Public method to retrieve the copy data. @@ -55,8 +57,11 @@ @return the target name (string) and a flag indicating the operation should be enforced (boolean) """ - # TODO: check if target is an absolute path. If not make it relative to source. - return self.targetEdit.text(), self.forceCheckBox.isChecked() + target = self.targetEdit.text() + if not os.path.isabs(target): + sourceDir = os.path.dirname(self.sourceEdit.text()) + target = os.path.join(sourceDir, target) + return target, self.forceCheckBox.isChecked() @pyqtSlot() def on_dirButton_clicked(self): @@ -80,3 +85,13 @@ if target: self.targetEdit.setText(target) + + @pyqtSlot(str) + def on_targetEdit_textChanged(self, txt): + """ + Private slot to handle changes of the target. + + @param txt contents of the target edit (string) + """ + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled( + os.path.isabs(txt) or os.path.dirname(txt) == "")
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.ui Sat Jun 02 15:27:03 2012 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.ui Sat Jun 02 16:36:16 2012 +0200 @@ -61,7 +61,7 @@ </property> <property name="whatsThis"> <string><b>Target name</b> -<p>Enter the new name in this field.</p></string> +<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></string> </property> </widget> </item>
--- a/changelog Sat Jun 02 15:27:03 2012 +0200 +++ b/changelog Sat Jun 02 16:36:16 2012 +0200 @@ -15,6 +15,7 @@ -- All --- added code to ensure, that some eric specific files and directories get ignored + --- improved the copy/move operation a bit -- Mercurial --- added support for amending commits as of Mercurial 2.2 - Web Browser
--- a/i18n/eric5_cs.ts Sat Jun 02 15:27:03 2012 +0200 +++ b/i18n/eric5_cs.ts Sat Jun 02 16:36:16 2012 +0200 @@ -17042,12 +17042,12 @@ <translation>Merging</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1178"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1366"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1368"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> @@ -17062,112 +17062,112 @@ <translation type="obsolete">Vyberte počet položek, které se mají zobrazit.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1611"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1613"/> <source>Pulling from a remote Mercurial repository</source> <translation>Stažení (pull) z Mercurial repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1666"/> <source>Pushing to a remote Mercurial repository</source> <translation>Odeslání (push) do Mercurial repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1785"/> <source>Resolving files/directories</source> <translation>Vyřešení souborů/složek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> <source>Create Branch</source> <translation>Vytvořit větev</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> <source>Enter branch name</source> <translation>Zadejte název větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817"/> <source>Creating branch in the Mercurial repository</source> <translation>Vytvoření větve v Mercurial repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Ověřit integritu Mercurial repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1923"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> <source>Showing aliases for remote repositories</source> <translation>Zobrazení aliasů pro vzdálené úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1969"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/> <source>Shall the working directory be updated?</source> <translation>Má být pracovní adresář aktualizován?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1839"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1841"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2121"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2241"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2171"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1992"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2028"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2028"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2307"/> <source>Removing files from the Mercurial repository only</source> <translation>Odebrat soubory jen z Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2079"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> @@ -17177,37 +17177,37 @@ <translation type="obsolete"><p>Soubor Mercurial skupiny změn<b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2206"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Soubory Mercurial skupiny změn (*.hg);;Všechny soubory (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2183"/> <source>Identifying changegroup file</source> <translation>Rozpoznat soubor skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2363"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2343"/> <source>No revision given. Aborting...</source> <translation>Nebyla dána žádná revize. Ruším...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2381"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2383"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -17217,42 +17217,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2643"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2453"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2500"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2502"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2548"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2622"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -18167,7 +18167,7 @@ <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> <source><b>Target name</b> <p>Enter the new name in this field.</p></source> - <translation><b>Jméno cíle</b> + <translation type="obsolete"><b>Jméno cíle</b> <p>Zadání jména cíle do tohoto pole.</p></translation> </message> <message> @@ -18191,10 +18191,16 @@ <translation>Mercurial přesun</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py" line="79"/> <source>Select target</source> <translation>Vybrat cíl</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> + <source><b>Target name</b> +<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgDialog</name> @@ -19785,12 +19791,12 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398"/> <source>Copy in repository</source> - <translation>Kopírovat v repozitáři</translation> + <translation type="obsolete">Kopírovat v repozitáři</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> <source>Move in repository</source> - <translation>Přesunout v repozitáři</translation> + <translation type="obsolete">Přesunout v repozitáři</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403"/> @@ -19877,6 +19883,16 @@ <source>Conflict resolved</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398"/> + <source>Copy</source> + <translation type="unfinished">Kopírovat</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> + <source>Move</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -40142,7 +40158,7 @@ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="63"/> <source><b>Target name</b> <p>Enter the new name in this field.</p></source> - <translation><b>Jméno cíle</b> + <translation type="obsolete"><b>Jméno cíle</b> <p>Zadání jména cíle do tohoto pole.</p></translation> </message> <message> @@ -40156,7 +40172,7 @@ <translation>Subversion přesun</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py" line="79"/> <source>Select target</source> <translation>Vybrat cíl</translation> </message> @@ -40177,6 +40193,12 @@ <translation><b>Jméno cíle</b> <p>Výběr jména cíle přes dialogové okno výběru.</p></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="63"/> + <source><b>Target name</b> +<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnDialog</name> @@ -41248,12 +41270,12 @@ <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="494"/> <source>Copy in repository</source> - <translation>Kopírovat v repozitáři</translation> + <translation type="obsolete">Kopírovat v repozitáři</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="496"/> <source>Move in repository</source> - <translation>Přesunout v repozitáři</translation> + <translation type="obsolete">Přesunout v repozitáři</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="507"/> @@ -41390,6 +41412,16 @@ <source>Conflict resolved</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="494"/> + <source>Copy</source> + <translation type="unfinished">Kopírovat</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="496"/> + <source>Move</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnProjectHelper</name> @@ -50707,132 +50739,132 @@ <context> <name>VcsProjectHelper</name> <message> - <location filename="VCS/ProjectHelper.py" line="65"/> + <location filename="VCS/ProjectHelper.py" line="67"/> <source>New from repository</source> <translation>Nový z repozitáře</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="65"/> - <source>&New from repository...</source> - <translation>&Nový z repozitáře...</translation> - </message> - <message> <location filename="VCS/ProjectHelper.py" line="67"/> + <source>&New from repository...</source> + <translation>&Nový z repozitáře...</translation> + </message> + <message> + <location filename="VCS/ProjectHelper.py" line="69"/> <source>Create a new project from the VCS repository</source> <translation>Vytvořit nový projekt z VCS repozitáře</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="70"/> + <location filename="VCS/ProjectHelper.py" line="72"/> <source><b>New from repository</b><p>This creates a new local project from the VCS repository.</p></source> <translation><b>Nový z repozitáře</b><p>Vytvoří nový lokální projekt z VCS repozitáře.</p></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="77"/> - <source>Export from repository</source> - <translation>Exportovat z repozitáře</translation> - </message> - <message> - <location filename="VCS/ProjectHelper.py" line="77"/> - <source>&Export from repository...</source> - <translation>&Exportovat z repozitáře...</translation> - </message> - <message> <location filename="VCS/ProjectHelper.py" line="79"/> + <source>Export from repository</source> + <translation>Exportovat z repozitáře</translation> + </message> + <message> + <location filename="VCS/ProjectHelper.py" line="79"/> + <source>&Export from repository...</source> + <translation>&Exportovat z repozitáře...</translation> + </message> + <message> + <location filename="VCS/ProjectHelper.py" line="81"/> <source>Export a project from the repository</source> <translation>Export projekt z repozitáře</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="82"/> + <location filename="VCS/ProjectHelper.py" line="84"/> <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="VCS/ProjectHelper.py" line="89"/> + <location filename="VCS/ProjectHelper.py" line="91"/> <source>Add to repository</source> <translation>Přidat do repozitáře</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="89"/> - <source>&Add to repository...</source> - <translation>Přid&at do repozitáře...</translation> - </message> - <message> <location filename="VCS/ProjectHelper.py" line="91"/> + <source>&Add to repository...</source> + <translation>Přid&at do repozitáře...</translation> + </message> + <message> + <location filename="VCS/ProjectHelper.py" line="93"/> <source>Add the local project to the VCS repository</source> <translation>Přidat lokální projekt do VCS repozitáře</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="94"/> + <location filename="VCS/ProjectHelper.py" line="96"/> <source><b>Add to repository</b><p>This adds (imports) the local project to the VCS repository.</p></source> <translation><b>Přidat do repozitáře</b><p>Přidá (importuje) lokální projekt do VCS repozitáře.</p></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="163"/> + <location filename="VCS/ProjectHelper.py" line="166"/> <source>New Project</source> <translation>Nový projekt</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="305"/> + <location filename="VCS/ProjectHelper.py" line="308"/> <source>Select version control system for the project</source> <translation>Výběr verzovacího systému projektu</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="324"/> + <location filename="VCS/ProjectHelper.py" line="327"/> <source>Would you like to edit the VCS command options?</source> <translation>Chcete editovat parametry VCS příkazu?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="176"/> + <location filename="VCS/ProjectHelper.py" line="179"/> <source>Create project directory</source> <translation>Vytvořit adresář projektu</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="251"/> + <location filename="VCS/ProjectHelper.py" line="254"/> <source>New project from repository</source> <translation>Nový projekt z repozitáře</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="201"/> + <location filename="VCS/ProjectHelper.py" line="204"/> <source>Select a project file to open.</source> <translation>Výběr souboru s projektem pro otevření.</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="243"/> + <location filename="VCS/ProjectHelper.py" line="246"/> <source>Shall the project file be added to the repository?</source> <translation>Může být soubor projektu přidán do repozitáře?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="251"/> + <location filename="VCS/ProjectHelper.py" line="254"/> <source>The project could not be retrieved from the repository.</source> <translation>Z repozitáře není možné získat soubor s projektem.</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="324"/> + <location filename="VCS/ProjectHelper.py" line="327"/> <source>Import Project</source> <translation>Importovat projekt</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="377"/> + <location filename="VCS/ProjectHelper.py" line="380"/> <source>Remove project from repository</source> <translation>Odebrat projekt z repozitáře</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="377"/> + <location filename="VCS/ProjectHelper.py" line="380"/> <source>Dou you really want to remove this project from the repository (and disk)?</source> <translation>Opravdu chcete odebrat tento projekt z repozitáře (a z disku)?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="353"/> + <location filename="VCS/ProjectHelper.py" line="356"/> <source>Update</source> <translation>Obnovit</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="435"/> + <location filename="VCS/ProjectHelper.py" line="438"/> <source>The project should be reread. Do this now?</source> <translation>Projekt bude znovu načten. Má se provést?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="176"/> + <location filename="VCS/ProjectHelper.py" line="179"/> <source><p>The project directory <b>{0}</b> could not be created.</p></source> <translation><p>Adresář projektu <b>{0}</b> nelze vytvořit.</p></translation> </message> @@ -50842,12 +50874,12 @@ <translation type="obsolete">Projekt vrácený z repozitáře neobsahuje eric projekt soubory (*.e4p *.e4pz *.e3p *.e3pz). Vytvořit je?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="216"/> + <location filename="VCS/ProjectHelper.py" line="219"/> <source>The project retrieved from the repository does not contain an eric project file (*.e4p). Create it?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="435"/> + <location filename="VCS/ProjectHelper.py" line="438"/> <source>Switch</source> <translation type="unfinished">Přepnout</translation> </message> @@ -54665,30 +54697,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1236"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1238"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Rodič #{0}</b></td><td></td></tr><tr><td><b>Množina změn</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1733"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1735"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Tagy</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1741"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Větve</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1252"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1254"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1284"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -54699,23 +54731,23 @@ <translation><h3>Informace o repozitáře</h3><p><table><tr><td><b>Mercurial V.</b></td><td>{0}</td></tr><tr></tr><tr><td><b>URL</b></td><td>{1}</td></tr></table></p>{2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Množina změn</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1745"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1747"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Rodiče</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1748"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -54723,7 +54755,7 @@ <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_de.ts Sat Jun 02 15:27:03 2012 +0200 +++ b/i18n/eric5_de.ts Sat Jun 02 16:36:16 2012 +0200 @@ -16591,157 +16591,157 @@ <translation>Zusammenführen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1178"/> <source>Mercurial command</source> <translation>Mercurial Befehl</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1366"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1368"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1611"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1613"/> <source>Pulling from a remote Mercurial repository</source> <translation>Pull von einem entfernten Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1666"/> <source>Pushing to a remote Mercurial repository</source> <translation>Push in ein entferntes Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1785"/> <source>Resolving files/directories</source> <translation>Löse Dateien/Verzeichnisse auf</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> <source>Create Branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> <source>Enter branch name</source> <translation>Gib den Zweignamen ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817"/> <source>Creating branch in the Mercurial repository</source> <translation>Erzeuge Zweig im Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verifiziere die Integrität des Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1923"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> <source>Showing aliases for remote repositories</source> <translation>Zeige Namen für entfernte Repositories</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1969"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/> <source>Shall the working directory be updated?</source> <translation>Soll das Arbeitsverzeichnis aktualisiert werden?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1839"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1841"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2121"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2241"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2171"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1992"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2028"/> <source>Create .hgignore file</source> <translation>.hgignore Datei erstellen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2028"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2307"/> <source>Removing files from the Mercurial repository only</source> <translation>Lösche Dateien nur aus dem Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2079"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2206"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Änderungsgruppendateien (*.hg);;Alle Dateien (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2183"/> <source>Identifying changegroup file</source> <translation>Identifiziere Änderungsgruppendatei</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2363"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2343"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Mercurial Änderungsgruppendatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2381"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2383"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Wollen sie die letzte Transaktion wirklich zurücksetzen?</translation> </message> @@ -16751,42 +16751,42 @@ <translation>Pflege Änderungen in das Mercurial Repository ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> <source>Mercurial Command Server</source> <translation>Mercurial Befehlsserver</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2643"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>Der Mercurial Befehlsserver konnte nicht wiedergestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>Der Mercurial Befehlsserver konnte nicht gestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2453"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2500"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2502"/> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2548"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2622"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> @@ -17677,13 +17677,6 @@ <translation>Gib den Zielnamen ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> - <source><b>Target name</b> -<p>Enter the new name in this field.</p></source> - <translation><b>Zielname</b> -<p>Gib den Zielnamen in dieses Feld ein.</p></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="71"/> <source>Target:</source> <translation>Ziel:</translation> @@ -17704,10 +17697,17 @@ <translation>Mercurial Move</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py" line="79"/> <source>Select target</source> <translation>Wähle Ziel aus</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> + <source><b>Target name</b> +<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> + <translation><b>Zielname</b> +<p>Gib den Zielnamen in dieses Feld ein. Der Zielname muss der neue Name oder ein absoluter Pfad sein.</p></translation> + </message> </context> <context> <name>HgDialog</name> @@ -19314,16 +19314,6 @@ <translation>Vom Repository (und der Platte) löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398"/> - <source>Copy in repository</source> - <translation>Im Repository kopieren</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> - <source>Move in repository</source> - <translation>Im Repository verschieben</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403"/> <source>Show log</source> <translation>Beschreibungen anzeigen</translation> @@ -19398,6 +19388,16 @@ <source>Conflict resolved</source> <translation>Konflikt gelöst</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398"/> + <source>Copy</source> + <translation>Kopieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> + <source>Move</source> + <translation>Verschieben</translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -38891,7 +38891,7 @@ <translation>Subversion Verschieben</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py" line="79"/> <source>Select target</source> <translation>Wähle Ziel aus</translation> </message> @@ -38940,13 +38940,6 @@ <translation>Gib den Zielnamen ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="63"/> - <source><b>Target name</b> -<p>Enter the new name in this field.</p></source> - <translation><b>Zielname</b> -<p>Gib den Zielnamen in dieses Feld ein.</p></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="71"/> <source>Target:</source> <translation>Ziel:</translation> @@ -38968,6 +38961,13 @@ <translation><b>Zielname</b> <p>Auswahl des Zielnames mit Hilfe eines Auswahldialoges.</p></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="63"/> + <source><b>Target name</b> +<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> + <translation><b>Zielname</b> +<p>Gib den Zielnamen in dieses Feld ein. Der Zielname muss der neue Name oder ein absoluter Pfad sein.</p></translation> + </message> </context> <context> <name>SvnDialog</name> @@ -40039,16 +40039,6 @@ <translation>Vom Repository (und der Platte) löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="494"/> - <source>Copy in repository</source> - <translation>Im Repository kopieren</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="496"/> - <source>Move in repository</source> - <translation>Im Repository verschieben</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="507"/> <source>Show log</source> <translation>Beschreibungen anzeigen</translation> @@ -40178,6 +40168,16 @@ <source>Conflict resolved</source> <translation>Konflikt gelöst</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="494"/> + <source>Copy</source> + <translation>Kopieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="496"/> + <source>Move</source> + <translation>Verschieben</translation> + </message> </context> <context> <name>SvnProjectHelper</name> @@ -49271,142 +49271,142 @@ <context> <name>VcsProjectHelper</name> <message> - <location filename="VCS/ProjectHelper.py" line="65"/> + <location filename="VCS/ProjectHelper.py" line="67"/> <source>New from repository</source> <translation>Neu aus Repository</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="65"/> - <source>&New from repository...</source> - <translation>&Neu aus Repository...</translation> - </message> - <message> <location filename="VCS/ProjectHelper.py" line="67"/> + <source>&New from repository...</source> + <translation>&Neu aus Repository...</translation> + </message> + <message> + <location filename="VCS/ProjectHelper.py" line="69"/> <source>Create a new project from the VCS repository</source> <translation>Erzeuge ein neues Projekt aus dem VCS Repository</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="70"/> + <location filename="VCS/ProjectHelper.py" line="72"/> <source><b>New from repository</b><p>This creates a new local project from the VCS repository.</p></source> <translation><b>Neu aus Repository</b><p>Dies erzeugt ein neues Projekt aus dem VCS Repository.</p></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="77"/> - <source>Export from repository</source> - <translation>Export aus Repository</translation> - </message> - <message> - <location filename="VCS/ProjectHelper.py" line="77"/> - <source>&Export from repository...</source> - <translation>&Export aus Repository...</translation> - </message> - <message> <location filename="VCS/ProjectHelper.py" line="79"/> + <source>Export from repository</source> + <translation>Export aus Repository</translation> + </message> + <message> + <location filename="VCS/ProjectHelper.py" line="79"/> + <source>&Export from repository...</source> + <translation>&Export aus Repository...</translation> + </message> + <message> + <location filename="VCS/ProjectHelper.py" line="81"/> <source>Export a project from the repository</source> <translation>Exportiert ein Projekt aus dem Repository</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="82"/> + <location filename="VCS/ProjectHelper.py" line="84"/> <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="VCS/ProjectHelper.py" line="89"/> + <location filename="VCS/ProjectHelper.py" line="91"/> <source>Add to repository</source> <translation>Zum Repository hinzufügen</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="89"/> - <source>&Add to repository...</source> - <translation>Zum Repository &hinzufügen...</translation> - </message> - <message> <location filename="VCS/ProjectHelper.py" line="91"/> + <source>&Add to repository...</source> + <translation>Zum Repository &hinzufügen...</translation> + </message> + <message> + <location filename="VCS/ProjectHelper.py" line="93"/> <source>Add the local project to the VCS repository</source> <translation>Fügt das lokale Projekt zum VCS Repository hinzu</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="94"/> + <location filename="VCS/ProjectHelper.py" line="96"/> <source><b>Add to repository</b><p>This adds (imports) the local project to the VCS repository.</p></source> <translation><b>Zum Repository hinzufügen</b><p>Dies fügt das lokale Projekt zum VCS Repository hinzu (Import).</p></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="163"/> + <location filename="VCS/ProjectHelper.py" line="166"/> <source>New Project</source> <translation>Neues Projekt</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="305"/> + <location filename="VCS/ProjectHelper.py" line="308"/> <source>Select version control system for the project</source> <translation>Wähle das Versionskontrollsystem für das Projekt</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="324"/> + <location filename="VCS/ProjectHelper.py" line="327"/> <source>Would you like to edit the VCS command options?</source> <translation>Möchten sie die VCS Befehlsoptionen bearbeiten?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="176"/> + <location filename="VCS/ProjectHelper.py" line="179"/> <source>Create project directory</source> <translation>Projektverzeichnis erstellen</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="176"/> + <location filename="VCS/ProjectHelper.py" line="179"/> <source><p>The project directory <b>{0}</b> could not be created.</p></source> <translation><p>Das Projektverzeichnis <b>{0}</b> konnte nicht erstellt werden.</p></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="251"/> + <location filename="VCS/ProjectHelper.py" line="254"/> <source>New project from repository</source> <translation>Neues Projekt aus Repository</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="201"/> + <location filename="VCS/ProjectHelper.py" line="204"/> <source>Select a project file to open.</source> <translation>Wähle eine zu öffnende Projektdatei aus.</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="243"/> + <location filename="VCS/ProjectHelper.py" line="246"/> <source>Shall the project file be added to the repository?</source> <translation>Soll die Projektdatei zum Repository hinzugefügt werden?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="251"/> + <location filename="VCS/ProjectHelper.py" line="254"/> <source>The project could not be retrieved from the repository.</source> <translation>Das Project konnte nicht aus dem Repository geladen werden.</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="324"/> + <location filename="VCS/ProjectHelper.py" line="327"/> <source>Import Project</source> <translation>Projekt importieren</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="377"/> + <location filename="VCS/ProjectHelper.py" line="380"/> <source>Remove project from repository</source> <translation>Projekt aus dem Repository löschen</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="377"/> + <location filename="VCS/ProjectHelper.py" line="380"/> <source>Dou you really want to remove this project from the repository (and disk)?</source> <translation>Wollen Sie wirklich das Projekt vom Repository (und der Platte) löschen?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="353"/> + <location filename="VCS/ProjectHelper.py" line="356"/> <source>Update</source> <translation>Aktualisieren</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="435"/> + <location filename="VCS/ProjectHelper.py" line="438"/> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="216"/> + <location filename="VCS/ProjectHelper.py" line="219"/> <source>The project retrieved from the repository does not contain an eric project file (*.e4p). Create it?</source> <translation>Das aus dem Repository geladene Projekt enthält keine eric Projektdatei (*.e4p). Soll sie erzeugt werden?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="435"/> + <location filename="VCS/ProjectHelper.py" line="438"/> <source>Switch</source> <translation>Umschalten</translation> </message> @@ -52967,24 +52967,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1236"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1238"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Vorgänger #{0}</b></td><td></td></tr> <tr><td><b>Änderungssatz</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1733"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1735"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marken</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1741"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Zweige</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1252"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1254"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -52993,7 +52993,7 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1284"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -53010,24 +53010,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Spitze</b></td><td></td></tr> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Änderungssatz</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1745"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1747"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Vorgänger</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1748"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -53038,7 +53038,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Lesezeichen</b></td><td>{0}</td></tr></translation> </message>
--- a/i18n/eric5_en.ts Sat Jun 02 15:27:03 2012 +0200 +++ b/i18n/eric5_en.ts Sat Jun 02 16:36:16 2012 +0200 @@ -16500,157 +16500,157 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1178"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1366"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1368"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1611"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1613"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1666"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1785"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1839"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1841"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1923"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1969"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1992"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2028"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2028"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2121"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2079"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2171"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2206"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2183"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2241"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2307"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2363"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2343"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2381"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2383"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -16660,42 +16660,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2643"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2453"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2500"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2502"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2548"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2622"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -17576,12 +17576,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> - <source><b>Target name</b> -<p>Enter the new name in this field.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="71"/> <source>Target:</source> <translation type="unfinished"></translation> @@ -17602,10 +17596,16 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py" line="79"/> <source>Select target</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> + <source><b>Target name</b> +<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgDialog</name> @@ -19187,16 +19187,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398"/> - <source>Copy in repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> - <source>Move in repository</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403"/> <source>Show log</source> <translation type="unfinished"></translation> @@ -19266,6 +19256,16 @@ <source>Conflict resolved</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398"/> + <source>Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> + <source>Move</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -38552,12 +38552,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="63"/> - <source><b>Target name</b> -<p>Enter the new name in this field.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="71"/> <source>Target:</source> <translation type="unfinished"></translation> @@ -38584,10 +38578,16 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py" line="79"/> <source>Select target</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="63"/> + <source><b>Target name</b> +<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnDialog</name> @@ -39645,16 +39645,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="494"/> - <source>Copy in repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="496"/> - <source>Move in repository</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="604"/> <source>Add to Changelist</source> <translation type="unfinished"></translation> @@ -39779,6 +39769,16 @@ <source>Conflict resolved</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="494"/> + <source>Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="496"/> + <source>Move</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnProjectHelper</name> @@ -48803,142 +48803,142 @@ <context> <name>VcsProjectHelper</name> <message> - <location filename="VCS/ProjectHelper.py" line="65"/> + <location filename="VCS/ProjectHelper.py" line="67"/> <source>New from repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="65"/> - <source>&New from repository...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="VCS/ProjectHelper.py" line="67"/> + <source>&New from repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="VCS/ProjectHelper.py" line="69"/> <source>Create a new project from the VCS repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="70"/> + <location filename="VCS/ProjectHelper.py" line="72"/> <source><b>New from repository</b><p>This creates a new local project from the VCS repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="77"/> - <source>Export from repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="VCS/ProjectHelper.py" line="77"/> - <source>&Export from repository...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="VCS/ProjectHelper.py" line="79"/> + <source>Export from repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="VCS/ProjectHelper.py" line="79"/> + <source>&Export from repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="VCS/ProjectHelper.py" line="81"/> <source>Export a project from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="82"/> + <location filename="VCS/ProjectHelper.py" line="84"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="89"/> + <location filename="VCS/ProjectHelper.py" line="91"/> <source>Add to repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="89"/> - <source>&Add to repository...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="VCS/ProjectHelper.py" line="91"/> + <source>&Add to repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="VCS/ProjectHelper.py" line="93"/> <source>Add the local project to the VCS repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="94"/> + <location filename="VCS/ProjectHelper.py" line="96"/> <source><b>Add to repository</b><p>This adds (imports) the local project to the VCS repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="163"/> + <location filename="VCS/ProjectHelper.py" line="166"/> <source>New Project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="305"/> + <location filename="VCS/ProjectHelper.py" line="308"/> <source>Select version control system for the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="324"/> + <location filename="VCS/ProjectHelper.py" line="327"/> <source>Would you like to edit the VCS command options?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="176"/> + <location filename="VCS/ProjectHelper.py" line="179"/> <source>Create project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="176"/> + <location filename="VCS/ProjectHelper.py" line="179"/> <source><p>The project directory <b>{0}</b> could not be created.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="251"/> + <location filename="VCS/ProjectHelper.py" line="254"/> <source>New project from repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="201"/> + <location filename="VCS/ProjectHelper.py" line="204"/> <source>Select a project file to open.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="216"/> + <location filename="VCS/ProjectHelper.py" line="219"/> <source>The project retrieved from the repository does not contain an eric project file (*.e4p). Create it?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="243"/> + <location filename="VCS/ProjectHelper.py" line="246"/> <source>Shall the project file be added to the repository?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="251"/> + <location filename="VCS/ProjectHelper.py" line="254"/> <source>The project could not be retrieved from the repository.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="324"/> + <location filename="VCS/ProjectHelper.py" line="327"/> <source>Import Project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="353"/> + <location filename="VCS/ProjectHelper.py" line="356"/> <source>Update</source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="435"/> + <location filename="VCS/ProjectHelper.py" line="438"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="377"/> + <location filename="VCS/ProjectHelper.py" line="380"/> <source>Remove project from repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="377"/> + <location filename="VCS/ProjectHelper.py" line="380"/> <source>Dou you really want to remove this project from the repository (and disk)?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="435"/> + <location filename="VCS/ProjectHelper.py" line="438"/> <source>Switch</source> <translation type="unfinished"></translation> </message> @@ -52495,30 +52495,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1236"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1238"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1733"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1735"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1741"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1252"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1254"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1284"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -52529,23 +52529,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1745"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1747"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1748"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -52553,7 +52553,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_es.ts Sat Jun 02 15:27:03 2012 +0200 +++ b/i18n/eric5_es.ts Sat Jun 02 16:36:16 2012 +0200 @@ -16586,22 +16586,22 @@ <translation>Haciendo un merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1366"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1368"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1611"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1613"/> <source>Pulling from a remote Mercurial repository</source> <translation>Haciendo pull de un repositorio remoto Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1666"/> <source>Pushing to a remote Mercurial repository</source> <translation>Haciendo push a un repositorio remoto Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1785"/> <source>Resolving files/directories</source> <translation>Resolviendo archivos/directorios</translation> </message> @@ -16616,137 +16616,137 @@ <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1178"/> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> <source>Create Branch</source> <translation>Crear Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> <source>Enter branch name</source> <translation>Introducir nombre de branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817"/> <source>Creating branch in the Mercurial repository</source> <translation>Creando branch en el repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verificando la integridad del repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1923"/> <source>Showing the combined configuration settings</source> <translation>Mostrando los ajustes de configuración combinados</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> <source>Showing aliases for remote repositories</source> <translation>Mostrando alias para repositorios remotos</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1969"/> <source>Recovering from interrupted transaction</source> <translation>Recuperando de transacción interrumpida</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/> <source>Shall the working directory be updated?</source> <translation>¿Debe ser actualizado el directorio de trabajo?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1839"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1841"/> <source>Showing current branch</source> <translation>Mostrando la branch actual</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2121"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2241"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2171"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1992"/> <source>Identifying project directory</source> <translation>Identificando directorio de proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2028"/> <source>Create .hgignore file</source> <translation>Crear archivo .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2028"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2307"/> <source>Removing files from the Mercurial repository only</source> <translation>Eliminando archivos unicamente del repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2079"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Archivos Changegroup de Mercurial (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2206"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Archivos Changegroup de Mercurial (*.hg);;Todos los Archivos (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2183"/> <source>Identifying changegroup file</source> <translation>Identificando archivo de changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2363"/> <source>Backing out changeset</source> <translation>Haciendo respaldo de changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2343"/> <source>No revision given. Aborting...</source> <translation>No se ha proporcionado revisión. Abortando...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo changegroup de Mercurial <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388"/> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2381"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2383"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>¿Está seguro de que quiere aplicar un rollback a la última transacción?</translation> </message> @@ -16756,42 +16756,42 @@ <translation>Haciendo commit de cambios al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> <source>Mercurial Command Server</source> <translation>Servidor de Comandos de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2643"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido reiniciarse.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido iniciarse.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2453"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455"/> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2500"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2502"/> <source>Export Patches</source> <translation>Exportar Patches</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2548"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2622"/> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> @@ -17685,7 +17685,7 @@ <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> <source><b>Target name</b> <p>Enter the new name in this field.</p></source> - <translation><b>Nombre de destino</b> + <translation type="obsolete"><b>Nombre de destino</b> <p>Introduzca el nuevo nombre en este campo.</p></translation> </message> <message> @@ -17709,10 +17709,16 @@ <translation>Mercurial Move</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py" line="79"/> <source>Select target</source> <translation>Seleccionar destino</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> + <source><b>Target name</b> +<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgDialog</name> @@ -19323,12 +19329,12 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398"/> <source>Copy in repository</source> - <translation>Copiar en el repositorio</translation> + <translation type="obsolete">Copiar en el repositorio</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> <source>Move in repository</source> - <translation>Mover en el repositorio</translation> + <translation type="obsolete">Mover en el repositorio</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403"/> @@ -19410,6 +19416,16 @@ <source>Conflict resolved</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398"/> + <source>Copy</source> + <translation type="unfinished">Copiar</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> + <source>Move</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -38961,7 +38977,7 @@ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="63"/> <source><b>Target name</b> <p>Enter the new name in this field.</p></source> - <translation><b>Nombre de destino</b><p>Introduzca el nuevo nombre en este campo.</p></translation> + <translation type="obsolete"><b>Nombre de destino</b><p>Introduzca el nuevo nombre en este campo.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="71"/> @@ -38991,10 +39007,16 @@ <translation>Move de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py" line="79"/> <source>Select target</source> <translation>Seleccionar destino</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="63"/> + <source><b>Target name</b> +<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnDialog</name> @@ -40068,12 +40090,12 @@ <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="494"/> <source>Copy in repository</source> - <translation>Copiar en el repositorio</translation> + <translation type="obsolete">Copiar en el repositorio</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="496"/> <source>Move in repository</source> - <translation>Mover en el repositorio</translation> + <translation type="obsolete">Mover en el repositorio</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="507"/> @@ -40205,6 +40227,16 @@ <source>Conflict resolved</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="494"/> + <source>Copy</source> + <translation type="unfinished">Copiar</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="496"/> + <source>Move</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnProjectHelper</name> @@ -49329,142 +49361,142 @@ <context> <name>VcsProjectHelper</name> <message> - <location filename="VCS/ProjectHelper.py" line="65"/> + <location filename="VCS/ProjectHelper.py" line="67"/> <source>New from repository</source> <translation>Nuevo desde repositorio</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="65"/> - <source>&New from repository...</source> - <translation>&Nuevo desde repositorio...</translation> - </message> - <message> <location filename="VCS/ProjectHelper.py" line="67"/> + <source>&New from repository...</source> + <translation>&Nuevo desde repositorio...</translation> + </message> + <message> + <location filename="VCS/ProjectHelper.py" line="69"/> <source>Create a new project from the VCS repository</source> <translation>Crear un nuevo proyecto desde el repositorio VCS</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="70"/> + <location filename="VCS/ProjectHelper.py" line="72"/> <source><b>New from repository</b><p>This creates a new local project from the VCS repository.</p></source> <translation><b>Nuevo desde repositorio</b><p>Crea un nuevo proyecto local desde el repositorio VCS.</p></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="77"/> - <source>Export from repository</source> - <translation>Exportar desde repositorio</translation> - </message> - <message> - <location filename="VCS/ProjectHelper.py" line="77"/> - <source>&Export from repository...</source> - <translation>&Exportar desde repositorio...</translation> - </message> - <message> <location filename="VCS/ProjectHelper.py" line="79"/> + <source>Export from repository</source> + <translation>Exportar desde repositorio</translation> + </message> + <message> + <location filename="VCS/ProjectHelper.py" line="79"/> + <source>&Export from repository...</source> + <translation>&Exportar desde repositorio...</translation> + </message> + <message> + <location filename="VCS/ProjectHelper.py" line="81"/> <source>Export a project from the repository</source> <translation>Exportar un proyecto desde el repositorio</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="82"/> + <location filename="VCS/ProjectHelper.py" line="84"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Exportar desde el repositorio</b><p>Exporta un proyecto desde el repositorio.</p></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="89"/> + <location filename="VCS/ProjectHelper.py" line="91"/> <source>Add to repository</source> <translation>Añadir al repositorio</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="89"/> - <source>&Add to repository...</source> - <translation>&Añadir al repositorio...</translation> - </message> - <message> <location filename="VCS/ProjectHelper.py" line="91"/> + <source>&Add to repository...</source> + <translation>&Añadir al repositorio...</translation> + </message> + <message> + <location filename="VCS/ProjectHelper.py" line="93"/> <source>Add the local project to the VCS repository</source> <translation>Añadir el proyecto local al repositorio VCS</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="94"/> + <location filename="VCS/ProjectHelper.py" line="96"/> <source><b>Add to repository</b><p>This adds (imports) the local project to the VCS repository.</p></source> <translation><b>Añadir al repositorio</b><p>Añade (importa) el proyecto local al repositorio VCS.</p></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="163"/> + <location filename="VCS/ProjectHelper.py" line="166"/> <source>New Project</source> <translation>Nuevo proyecto</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="305"/> + <location filename="VCS/ProjectHelper.py" line="308"/> <source>Select version control system for the project</source> <translation>Seleccione el sistema de control de versiones para el proyecto</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="324"/> + <location filename="VCS/ProjectHelper.py" line="327"/> <source>Would you like to edit the VCS command options?</source> <translation>¿Le gustaría editar las opciones de comando para VCS?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="176"/> + <location filename="VCS/ProjectHelper.py" line="179"/> <source>Create project directory</source> <translation>Crear directorio de proyecto</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="251"/> + <location filename="VCS/ProjectHelper.py" line="254"/> <source>New project from repository</source> <translation>Nuevo proyecto desde repositorio</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="201"/> + <location filename="VCS/ProjectHelper.py" line="204"/> <source>Select a project file to open.</source> <translation>Seleccionar un archivo de proyecto para abrir.</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="243"/> + <location filename="VCS/ProjectHelper.py" line="246"/> <source>Shall the project file be added to the repository?</source> <translation>¿Debe añadirse el archivo de proyecto al repositorio?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="251"/> + <location filename="VCS/ProjectHelper.py" line="254"/> <source>The project could not be retrieved from the repository.</source> <translation>El proyecto no se ha podido recuperar del repositorio.</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="324"/> + <location filename="VCS/ProjectHelper.py" line="327"/> <source>Import Project</source> <translation>Importar Proyecto</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="377"/> + <location filename="VCS/ProjectHelper.py" line="380"/> <source>Remove project from repository</source> <translation>Eliminar proyecto del repositorio</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="377"/> + <location filename="VCS/ProjectHelper.py" line="380"/> <source>Dou you really want to remove this project from the repository (and disk)?</source> <translation>¿Realmente quiere eliminar este proyecto del repositorio (y del disco)?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="353"/> + <location filename="VCS/ProjectHelper.py" line="356"/> <source>Update</source> <translation>Actualizar</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="435"/> + <location filename="VCS/ProjectHelper.py" line="438"/> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="176"/> + <location filename="VCS/ProjectHelper.py" line="179"/> <source><p>The project directory <b>{0}</b> could not be created.</p></source> <translation><p>El directorio de proyecto <b>{0}</b> no pudo ser creado.</p></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="216"/> + <location filename="VCS/ProjectHelper.py" line="219"/> <source>The project retrieved from the repository does not contain an eric project file (*.e4p). Create it?</source> <translation>El proyecto recuperado del repositorio no contiene un archivo de proyecto de eric (*.e4p). ¿Desea crearlo?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="435"/> + <location filename="VCS/ProjectHelper.py" line="438"/> <source>Switch</source> <translation>Hacer switch</translation> </message> @@ -53107,17 +53139,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1733"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1735"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiquetas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1741"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1748"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -53128,31 +53160,31 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Pista</b></td><td></td></tr> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Changeset</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1745"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1747"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Padres</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1236"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1238"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Padre #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1252"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1254"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -53161,7 +53193,7 @@ <tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1284"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -53178,7 +53210,7 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marcadores</b></td><td>{0}</td></tr></translation> </message>
--- a/i18n/eric5_fr.ts Sat Jun 02 15:27:03 2012 +0200 +++ b/i18n/eric5_fr.ts Sat Jun 02 16:36:16 2012 +0200 @@ -18110,12 +18110,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1178"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1366"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1368"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> @@ -18125,147 +18125,147 @@ <translation type="obsolete">Sélectionner plusieurs entrées à afficher.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1611"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1613"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1666"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1785"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1923"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1969"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1839"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1841"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2121"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2241"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2171"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1992"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2028"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2028"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2307"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2079"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2206"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2183"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2363"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2343"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2381"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2383"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -18275,42 +18275,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2643"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2453"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2500"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2502"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2548"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2622"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -19212,7 +19212,7 @@ <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> <source><b>Target name</b> <p>Enter the new name in this field.</p></source> - <translation type="unfinished"><b>Nom de la cible</b> + <translation type="obsolete"><b>Nom de la cible</b> <p>Entrer un nouveau nom dans ce champ.</p></translation> </message> <message> @@ -19236,10 +19236,16 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py" line="79"/> <source>Select target</source> <translation type="unfinished">Sélectionner la cible</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> + <source><b>Target name</b> +<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgDialog</name> @@ -20849,12 +20855,12 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398"/> <source>Copy in repository</source> - <translation type="unfinished">Copier dans le référentiel</translation> + <translation type="obsolete">Copier dans le référentiel</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> <source>Move in repository</source> - <translation type="unfinished">Déplacer dans le référentiel</translation> + <translation type="obsolete">Déplacer dans le référentiel</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403"/> @@ -20941,6 +20947,16 @@ <source>Conflict resolved</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398"/> + <source>Copy</source> + <translation type="unfinished">Copier</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> + <source>Move</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -42933,7 +42949,7 @@ <translation>Déplacement Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py" line="79"/> <source>Select target</source> <translation>Sélectionner la cible</translation> </message> @@ -42985,7 +43001,7 @@ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="63"/> <source><b>Target name</b> <p>Enter the new name in this field.</p></source> - <translation><b>Nom de la cible</b> + <translation type="obsolete"><b>Nom de la cible</b> <p>Entrer un nouveau nom dans ce champ.</p></translation> </message> <message> @@ -43009,6 +43025,12 @@ <p>Select the target name for the operation via a selection dialog.</p></source> <translation><b>Répertoire cible</b><p>Selectionne manuellement le nom de la cible.</p></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="63"/> + <source><b>Target name</b> +<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnDialog</name> @@ -44261,12 +44283,12 @@ <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="494"/> <source>Copy in repository</source> - <translation>Copier dans le référentiel</translation> + <translation type="obsolete">Copier dans le référentiel</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="496"/> <source>Move in repository</source> - <translation>Déplacer dans le référentiel</translation> + <translation type="obsolete">Déplacer dans le référentiel</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="507"/> @@ -44408,6 +44430,16 @@ <source>Conflict resolved</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="494"/> + <source>Copy</source> + <translation type="unfinished">Copier</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="496"/> + <source>Move</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnProjectHelper</name> @@ -54334,82 +54366,82 @@ <context> <name>VcsProjectHelper</name> <message> - <location filename="VCS/ProjectHelper.py" line="65"/> + <location filename="VCS/ProjectHelper.py" line="67"/> <source>New from repository</source> <translation>Nouveau à partir du référentiel</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="65"/> - <source>&New from repository...</source> - <translation>&Nouveau depuis un référentiel...</translation> - </message> - <message> <location filename="VCS/ProjectHelper.py" line="67"/> + <source>&New from repository...</source> + <translation>&Nouveau depuis un référentiel...</translation> + </message> + <message> + <location filename="VCS/ProjectHelper.py" line="69"/> <source>Create a new project from the VCS repository</source> <translation>Créer un nouveau projet à partir du référentiel VCS</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="70"/> + <location filename="VCS/ProjectHelper.py" line="72"/> <source><b>New from repository</b><p>This creates a new local project from the VCS repository.</p></source> <translation><b>Nouveau à partir du référentiel</b><p>Créer un nouveau projet local à partir d'un référentiel VCS.</p></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="77"/> + <location filename="VCS/ProjectHelper.py" line="79"/> <source>Export from repository</source> <translation>Exporter du référentiel</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="77"/> - <source>&Export from repository...</source> - <translation>&Exporter du référentiel...</translation> - </message> - <message> <location filename="VCS/ProjectHelper.py" line="79"/> + <source>&Export from repository...</source> + <translation>&Exporter du référentiel...</translation> + </message> + <message> + <location filename="VCS/ProjectHelper.py" line="81"/> <source>Export a project from the repository</source> <translation>Exporte un projet d'un référentiel VCS</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="82"/> + <location filename="VCS/ProjectHelper.py" line="84"/> <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="VCS/ProjectHelper.py" line="89"/> + <location filename="VCS/ProjectHelper.py" line="91"/> <source>Add to repository</source> <translation>Ajouter au référentiel</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="89"/> - <source>&Add to repository...</source> - <translation>&Ajouter au référentiel...</translation> - </message> - <message> <location filename="VCS/ProjectHelper.py" line="91"/> + <source>&Add to repository...</source> + <translation>&Ajouter au référentiel...</translation> + </message> + <message> + <location filename="VCS/ProjectHelper.py" line="93"/> <source>Add the local project to the VCS repository</source> <translation>Ajoute le projet local au référentiel VCS</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="94"/> + <location filename="VCS/ProjectHelper.py" line="96"/> <source><b>Add to repository</b><p>This adds (imports) the local project to the VCS repository.</p></source> <translation><b>Ajouter au référentiel</b><p>Ajoute (importe) le projet local au référentiel VCS.</p></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="163"/> + <location filename="VCS/ProjectHelper.py" line="166"/> <source>New Project</source> <translation>Nouveau projet</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="305"/> + <location filename="VCS/ProjectHelper.py" line="308"/> <source>Select version control system for the project</source> <translation>Sélectionner un système de contrôle de version (VCS) pour le projet</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="324"/> + <location filename="VCS/ProjectHelper.py" line="327"/> <source>Would you like to edit the VCS command options?</source> <translation>Voulez-vous éditer les options de commande VCS ?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="176"/> + <location filename="VCS/ProjectHelper.py" line="179"/> <source>Create project directory</source> <translation>Création d'un répertoire projet</translation> </message> @@ -54419,37 +54451,37 @@ <translation type="obsolete"><p>Impossible de créer le répertoire projet <b>%1</b>.</p></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="251"/> + <location filename="VCS/ProjectHelper.py" line="254"/> <source>New project from repository</source> <translation>Nouveau projet à partir du référentiel</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="201"/> + <location filename="VCS/ProjectHelper.py" line="204"/> <source>Select a project file to open.</source> <translation>Sélectionner un fichier projet à ouvrir.</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="243"/> + <location filename="VCS/ProjectHelper.py" line="246"/> <source>Shall the project file be added to the repository?</source> <translation>Le fichier projet doit-il être ajouté au référentiel?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="251"/> + <location filename="VCS/ProjectHelper.py" line="254"/> <source>The project could not be retrieved from the repository.</source> <translation>Impossible de rappatrier le projet depuis le référentiel.</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="324"/> + <location filename="VCS/ProjectHelper.py" line="327"/> <source>Import Project</source> <translation>Importation de projet</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="377"/> + <location filename="VCS/ProjectHelper.py" line="380"/> <source>Remove project from repository</source> <translation>Supprimer le projet du référentiel</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="377"/> + <location filename="VCS/ProjectHelper.py" line="380"/> <source>Dou you really want to remove this project from the repository (and disk)?</source> <translation>Voulez-vous vraiment supprimer ce projet du référentiel (et du disque)?</translation> </message> @@ -54459,27 +54491,27 @@ <translation type="obsolete">Le projet rapatrié du référentiel ne contient pas de fichier de projet Eric (*.e4p *.e4pz *.e3p *.e3pz). Voulez-vous en créer un ?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="353"/> + <location filename="VCS/ProjectHelper.py" line="356"/> <source>Update</source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="435"/> + <location filename="VCS/ProjectHelper.py" line="438"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="176"/> + <location filename="VCS/ProjectHelper.py" line="179"/> <source><p>The project directory <b>{0}</b> could not be created.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="216"/> + <location filename="VCS/ProjectHelper.py" line="219"/> <source>The project retrieved from the repository does not contain an eric project file (*.e4p). Create it?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="435"/> + <location filename="VCS/ProjectHelper.py" line="438"/> <source>Switch</source> <translation type="unfinished">Basculer de version</translation> </message> @@ -58516,30 +58548,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1236"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1238"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1733"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1735"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1741"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1252"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1254"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1284"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -58550,23 +58582,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1745"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1747"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1748"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -58574,7 +58606,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_it.ts Sat Jun 02 15:27:03 2012 +0200 +++ b/i18n/eric5_it.ts Sat Jun 02 16:36:16 2012 +0200 @@ -16813,12 +16813,12 @@ <translation>Merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1178"/> <source>Mercurial command</source> <translation>Comando Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1366"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1368"/> <source>Copying {0}</source> <translation>Copia di {0}</translation> </message> @@ -16833,147 +16833,147 @@ <translation type="obsolete">Mostra il numero di elementi da mostrare.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1611"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1613"/> <source>Pulling from a remote Mercurial repository</source> <translation>Pulling da un repository Mercurial remoto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1666"/> <source>Pushing to a remote Mercurial repository</source> <translation>Pushing in un repository Mercurial remoto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1785"/> <source>Resolving files/directories</source> <translation>Risoluzione di file/directory</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> <source>Create Branch</source> <translation>Creazione Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> <source>Enter branch name</source> <translation>Inserisci il nome del Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817"/> <source>Creating branch in the Mercurial repository</source> <translation>Creazione Branch nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verifica dell'integrità del repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1923"/> <source>Showing the combined configuration settings</source> <translation>Visualizzazione combinata della impostazioni di configurazione</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> <source>Showing aliases for remote repositories</source> <translation>Visualizzazione degli alias per i repository remoti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1969"/> <source>Recovering from interrupted transaction</source> <translation>Recupero da una transazione interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/> <source>Shall the working directory be updated?</source> <translation>Le directory di lavoro devono essere aggiornate ?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1839"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1841"/> <source>Showing current branch</source> <translation>Visualizzazione branch corrente</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2121"/> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224"/> <source>Apply changegroups</source> <translation>Applica changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2241"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Sottocomando Bisect ({0}) non valido.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2171"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1992"/> <source>Identifying project directory</source> <translation>Identificazione directory del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2028"/> <source>Create .hgignore file</source> <translation>Crea il file .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2028"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Il file <b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2307"/> <source>Removing files from the Mercurial repository only</source> <translation>Rimozione di file dal solo repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2079"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Changegroup Files (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2206"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Changegroup Files (*.hg);;All Files (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2183"/> <source>Identifying changegroup file</source> <translation>Identifica i file changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2363"/> <source>Backing out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2343"/> <source>No revision given. Aborting...</source> <translation>Nessuna revisione fornita. Termino...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Il file changegroup di Mercurial<b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2381"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2383"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -16983,42 +16983,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2643"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2453"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2500"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2502"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2548"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2622"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -17938,7 +17938,7 @@ <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> <source><b>Target name</b> <p>Enter the new name in this field.</p></source> - <translation><b>Nome target</b> + <translation type="obsolete"><b>Nome target</b> <p>Inserisci il nuovo nome in questo campo.</p></translation> </message> <message> @@ -17962,10 +17962,16 @@ <translation>Mercurial Move</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py" line="79"/> <source>Select target</source> <translation>Seleziona target</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> + <source><b>Target name</b> +<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgDialog</name> @@ -19560,12 +19566,12 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398"/> <source>Copy in repository</source> - <translation>Copia nel repository</translation> + <translation type="obsolete">Copia nel repository</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> <source>Move in repository</source> - <translation>Muovi nel repository</translation> + <translation type="obsolete">Muovi nel repository</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403"/> @@ -19652,6 +19658,16 @@ <source>Conflict resolved</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398"/> + <source>Copy</source> + <translation type="unfinished">Copia</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> + <source>Move</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -39737,7 +39753,7 @@ <translation>Subversion Move</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py" line="79"/> <source>Select target</source> <translation>Seleziona target</translation> </message> @@ -39789,7 +39805,7 @@ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="63"/> <source><b>Target name</b> <p>Enter the new name in this field.</p></source> - <translation><b>Nome target</b> + <translation type="obsolete"><b>Nome target</b> <p>Inserisci il nuovo nome in questo campo.</p></translation> </message> <message> @@ -39814,6 +39830,12 @@ <translation><b>Nome target</b> <p>Seleziona il nome del target per l'operazione con un dialogo.</p></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="63"/> + <source><b>Target name</b> +<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnDialog</name> @@ -40886,12 +40908,12 @@ <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="494"/> <source>Copy in repository</source> - <translation>Copia nel repository</translation> + <translation type="obsolete">Copia nel repository</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="496"/> <source>Move in repository</source> - <translation>Muovi nel repository</translation> + <translation type="obsolete">Muovi nel repository</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="507"/> @@ -41033,6 +41055,16 @@ <source>Conflict resolved</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="494"/> + <source>Copy</source> + <translation type="unfinished">Copia</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="496"/> + <source>Move</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnProjectHelper</name> @@ -50366,142 +50398,142 @@ <context> <name>VcsProjectHelper</name> <message> - <location filename="VCS/ProjectHelper.py" line="65"/> + <location filename="VCS/ProjectHelper.py" line="67"/> <source>New from repository</source> <translation>Nuovo dal repository</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="65"/> - <source>&New from repository...</source> - <translation>&Nuovo dal repository...</translation> - </message> - <message> <location filename="VCS/ProjectHelper.py" line="67"/> + <source>&New from repository...</source> + <translation>&Nuovo dal repository...</translation> + </message> + <message> + <location filename="VCS/ProjectHelper.py" line="69"/> <source>Create a new project from the VCS repository</source> <translation>Crea nuovo progetto dal repository VCS</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="70"/> + <location filename="VCS/ProjectHelper.py" line="72"/> <source><b>New from repository</b><p>This creates a new local project from the VCS repository.</p></source> <translation><b>New from repository</b><p>Crea un nuovo progetto locale dal repository VCS.</p></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="77"/> - <source>Export from repository</source> - <translation>Esporta dal repository</translation> - </message> - <message> - <location filename="VCS/ProjectHelper.py" line="77"/> - <source>&Export from repository...</source> - <translation>&Esporta dal repository...</translation> - </message> - <message> <location filename="VCS/ProjectHelper.py" line="79"/> + <source>Export from repository</source> + <translation>Esporta dal repository</translation> + </message> + <message> + <location filename="VCS/ProjectHelper.py" line="79"/> + <source>&Export from repository...</source> + <translation>&Esporta dal repository...</translation> + </message> + <message> + <location filename="VCS/ProjectHelper.py" line="81"/> <source>Export a project from the repository</source> <translation>Esporta un progetto dal repository</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="82"/> + <location filename="VCS/ProjectHelper.py" line="84"/> <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="VCS/ProjectHelper.py" line="89"/> + <location filename="VCS/ProjectHelper.py" line="91"/> <source>Add to repository</source> <translation>Aggiungi al repository</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="89"/> - <source>&Add to repository...</source> - <translation>&Aggiungi al repository...</translation> - </message> - <message> <location filename="VCS/ProjectHelper.py" line="91"/> + <source>&Add to repository...</source> + <translation>&Aggiungi al repository...</translation> + </message> + <message> + <location filename="VCS/ProjectHelper.py" line="93"/> <source>Add the local project to the VCS repository</source> <translation>Aggiungi il progetto locale al repository VCS</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="94"/> + <location filename="VCS/ProjectHelper.py" line="96"/> <source><b>Add to repository</b><p>This adds (imports) the local project to the VCS repository.</p></source> <translation><b>Aggiungi al repository</b><p>Aggiungi (importa) il progetto locale al repository VCS.</p></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="163"/> + <location filename="VCS/ProjectHelper.py" line="166"/> <source>New Project</source> <translation>Nuovo progetto</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="305"/> + <location filename="VCS/ProjectHelper.py" line="308"/> <source>Select version control system for the project</source> <translation>Seleziona il version control system per il progetto</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="324"/> + <location filename="VCS/ProjectHelper.py" line="327"/> <source>Would you like to edit the VCS command options?</source> <translation>Vuoi modificare le opzioni del comando VCS ?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="176"/> + <location filename="VCS/ProjectHelper.py" line="179"/> <source>Create project directory</source> <translation>Crea la directory del progetto</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="251"/> + <location filename="VCS/ProjectHelper.py" line="254"/> <source>New project from repository</source> <translation>Nuovo progetto dal repository</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="201"/> + <location filename="VCS/ProjectHelper.py" line="204"/> <source>Select a project file to open.</source> <translation>Seleziona un file progetto da aprire.</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="243"/> + <location filename="VCS/ProjectHelper.py" line="246"/> <source>Shall the project file be added to the repository?</source> <translation>Il file progetto deve essere aggiunto al repository ?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="251"/> + <location filename="VCS/ProjectHelper.py" line="254"/> <source>The project could not be retrieved from the repository.</source> <translation>Il progetto non può essere scaricato dal repository.</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="324"/> + <location filename="VCS/ProjectHelper.py" line="327"/> <source>Import Project</source> <translation>Importa progetto</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="377"/> + <location filename="VCS/ProjectHelper.py" line="380"/> <source>Remove project from repository</source> <translation>Rimuovi progetto dal repository</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="377"/> + <location filename="VCS/ProjectHelper.py" line="380"/> <source>Dou you really want to remove this project from the repository (and disk)?</source> <translation>Vuoi veramente rimuovere questo progetto dal repository (e dal disco) ?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="353"/> + <location filename="VCS/ProjectHelper.py" line="356"/> <source>Update</source> <translation>Aggiorna</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="435"/> + <location filename="VCS/ProjectHelper.py" line="438"/> <source>The project should be reread. Do this now?</source> <translation>Il progetto deve essere riletto. Farlo ora ?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="176"/> + <location filename="VCS/ProjectHelper.py" line="179"/> <source><p>The project directory <b>{0}</b> could not be created.</p></source> <translation><p>La directory del progetto <b>{0}</b> non può essere creata.</p></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="216"/> + <location filename="VCS/ProjectHelper.py" line="219"/> <source>The project retrieved from the repository does not contain an eric project file (*.e4p). Create it?</source> <translation>Il progetto scaricato dal repository non contiene un file progetto di eric ((*.e4p). Crearlo ?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="435"/> + <location filename="VCS/ProjectHelper.py" line="438"/> <source>Switch</source> <translation type="unfinished"></translation> </message> @@ -54264,24 +54296,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1236"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1238"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Origine #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1733"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1735"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Tags</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1741"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1252"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1254"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -54290,7 +54322,7 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1284"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -54307,24 +54339,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Changeset</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1745"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1747"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Origini</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1748"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -54334,7 +54366,7 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_ru.ts Sat Jun 02 15:27:03 2012 +0200 +++ b/i18n/eric5_ru.ts Sat Jun 02 16:36:16 2012 +0200 @@ -16905,7 +16905,7 @@ <translation>Слияние</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1366"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1368"/> <source>Copying {0}</source> <translation>Копирование {0}</translation> </message> @@ -16920,17 +16920,17 @@ <translation type="obsolete">Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1611"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1613"/> <source>Pulling from a remote Mercurial repository</source> <translation>Загрузка изменений из удалённого репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1666"/> <source>Pushing to a remote Mercurial repository</source> <translation>Загрузка изменений в удалённый репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1785"/> <source>Resolving files/directories</source> <translation>Разрешение конфликтов</translation> </message> @@ -16945,137 +16945,137 @@ <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1178"/> <source>Mercurial command</source> <translation>Mercurial команда</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> <source>Create Branch</source> <translation>Создать ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> <source>Enter branch name</source> <translation>Введите имя ветви</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817"/> <source>Creating branch in the Mercurial repository</source> <translation>Создание ветвив репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Проверка целостности репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1923"/> <source>Showing the combined configuration settings</source> <translation>Показ комбинированных настроек</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> <source>Showing aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1969"/> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/> <source>Shall the working directory be updated?</source> <translation>Обновить рабочий каталог?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1839"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1841"/> <source>Showing current branch</source> <translation>Текущая ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2121"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2241"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Неправильная подкоманда ({0}) для Bisect.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2171"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> <source>Preview changegroup</source> <translation>Предпросмотр группы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1992"/> <source>Identifying project directory</source> <translation>Каталог проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2028"/> <source>Create .hgignore file</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2028"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Файл <b>{0}</b> уже существует. Перезаписать?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2307"/> <source>Removing files from the Mercurial repository only</source> <translation>Удаление файлов только из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2079"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial файлы изменений (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2206"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2183"/> <source>Identifying changegroup file</source> <translation>Файлы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2363"/> <source>Backing out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2343"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл группы изменений<b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2381"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2383"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -17085,42 +17085,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2643"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2453"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2500"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2502"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2548"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2622"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -18035,7 +18035,7 @@ <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> <source><b>Target name</b> <p>Enter the new name in this field.</p></source> - <translation><b>Куда</b> + <translation type="obsolete"><b>Куда</b> <p>В этом поле задайте новое мия.</p></translation> </message> <message> @@ -18059,10 +18059,16 @@ <translation>Mercurial Move</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py" line="79"/> <source>Select target</source> <translation>Выберите цель</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> + <source><b>Target name</b> +<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgDialog</name> @@ -19662,12 +19668,12 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398"/> <source>Copy in repository</source> - <translation>Копировать в репозитории</translation> + <translation type="obsolete">Копировать в репозитории</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> <source>Move in repository</source> - <translation>Переместить в репозитории</translation> + <translation type="obsolete">Переместить в репозитории</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403"/> @@ -19754,6 +19760,16 @@ <source>Conflict resolved</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398"/> + <source>Copy</source> + <translation type="unfinished">Копировать</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> + <source>Move</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -39854,7 +39870,7 @@ <translation>Перемещение Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py" line="79"/> <source>Select target</source> <translation>Выберите цель</translation> </message> @@ -39906,7 +39922,7 @@ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="63"/> <source><b>Target name</b> <p>Enter the new name in this field.</p></source> - <translation><b>Куда</b> + <translation type="obsolete"><b>Куда</b> <p>В этом поле задайте новое мия.</p></translation> </message> <message> @@ -39930,6 +39946,12 @@ <p>Select the target name for the operation via a selection dialog.</p></source> <translation><b>Назначение</b><p>Выберите имя назначения с помощью диалога выбора.</p></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="63"/> + <source><b>Target name</b> +<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnDialog</name> @@ -41005,12 +41027,12 @@ <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="494"/> <source>Copy in repository</source> - <translation>Копировать в репозиторий</translation> + <translation type="obsolete">Копировать в репозиторий</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="496"/> <source>Move in repository</source> - <translation>Переместить в репозиторий</translation> + <translation type="obsolete">Переместить в репозиторий</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="507"/> @@ -41152,6 +41174,16 @@ <source>Conflict resolved</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="494"/> + <source>Copy</source> + <translation type="unfinished">Копировать</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="496"/> + <source>Move</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnProjectHelper</name> @@ -50506,142 +50538,142 @@ <context> <name>VcsProjectHelper</name> <message> - <location filename="VCS/ProjectHelper.py" line="65"/> + <location filename="VCS/ProjectHelper.py" line="67"/> <source>New from repository</source> <translation>Новый из репозитория</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="65"/> - <source>&New from repository...</source> - <translation>&Новый из репозитория...</translation> - </message> - <message> <location filename="VCS/ProjectHelper.py" line="67"/> + <source>&New from repository...</source> + <translation>&Новый из репозитория...</translation> + </message> + <message> + <location filename="VCS/ProjectHelper.py" line="69"/> <source>Create a new project from the VCS repository</source> <translation>Создать новый проект из репозитория VCS</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="70"/> + <location filename="VCS/ProjectHelper.py" line="72"/> <source><b>New from repository</b><p>This creates a new local project from the VCS repository.</p></source> <translation><b>Новый из репозитория</b><p>Создать новый проект из репозитория VCS.</p></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="77"/> - <source>Export from repository</source> - <translation>Экспорт из репозитория</translation> - </message> - <message> - <location filename="VCS/ProjectHelper.py" line="77"/> - <source>&Export from repository...</source> - <translation>&Экспорт из репозитория...</translation> - </message> - <message> <location filename="VCS/ProjectHelper.py" line="79"/> + <source>Export from repository</source> + <translation>Экспорт из репозитория</translation> + </message> + <message> + <location filename="VCS/ProjectHelper.py" line="79"/> + <source>&Export from repository...</source> + <translation>&Экспорт из репозитория...</translation> + </message> + <message> + <location filename="VCS/ProjectHelper.py" line="81"/> <source>Export a project from the repository</source> <translation>Экспортировать проект из репозитория</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="82"/> + <location filename="VCS/ProjectHelper.py" line="84"/> <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="VCS/ProjectHelper.py" line="89"/> + <location filename="VCS/ProjectHelper.py" line="91"/> <source>Add to repository</source> <translation>Добавить в репозиторий</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="89"/> - <source>&Add to repository...</source> - <translation>&Добавить в репозиторий...</translation> - </message> - <message> <location filename="VCS/ProjectHelper.py" line="91"/> + <source>&Add to repository...</source> + <translation>&Добавить в репозиторий...</translation> + </message> + <message> + <location filename="VCS/ProjectHelper.py" line="93"/> <source>Add the local project to the VCS repository</source> <translation>Добавить локальный проект в репозиторий VCS</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="94"/> + <location filename="VCS/ProjectHelper.py" line="96"/> <source><b>Add to repository</b><p>This adds (imports) the local project to the VCS repository.</p></source> <translation><b>Добавить в репозиторий</b><p>Добавляет (импортирует) локальный проект в репозиторий VCS.</p></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="163"/> + <location filename="VCS/ProjectHelper.py" line="166"/> <source>New Project</source> <translation>Новый проект</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="305"/> + <location filename="VCS/ProjectHelper.py" line="308"/> <source>Select version control system for the project</source> <translation>Выберите систему контроля версий (VCS) для проекта</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="324"/> + <location filename="VCS/ProjectHelper.py" line="327"/> <source>Would you like to edit the VCS command options?</source> <translation>Желаете ли вы редактировать опции команд VCS?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="176"/> + <location filename="VCS/ProjectHelper.py" line="179"/> <source>Create project directory</source> <translation>Создать каталог проекта</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="176"/> + <location filename="VCS/ProjectHelper.py" line="179"/> <source><p>The project directory <b>{0}</b> could not be created.</p></source> <translation><p>Невозможно создать каталог проекта <b>{0}</b>.</p></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="251"/> + <location filename="VCS/ProjectHelper.py" line="254"/> <source>New project from repository</source> <translation>Новый проект из репозитория</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="201"/> + <location filename="VCS/ProjectHelper.py" line="204"/> <source>Select a project file to open.</source> <translation>Выберите файл проекта, который надо открыть.</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="243"/> + <location filename="VCS/ProjectHelper.py" line="246"/> <source>Shall the project file be added to the repository?</source> <translation>Добавить файл проекта в репозиторий?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="251"/> + <location filename="VCS/ProjectHelper.py" line="254"/> <source>The project could not be retrieved from the repository.</source> <translation>Невозможно извлечь проект из репозитория.</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="324"/> + <location filename="VCS/ProjectHelper.py" line="327"/> <source>Import Project</source> <translation>Импортировать проект</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="377"/> + <location filename="VCS/ProjectHelper.py" line="380"/> <source>Remove project from repository</source> <translation>Удалить проект из репозитория</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="377"/> + <location filename="VCS/ProjectHelper.py" line="380"/> <source>Dou you really want to remove this project from the repository (and disk)?</source> <translation>Вы правда хотите удалить этот проект и из репозитория, и с диска?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="353"/> + <location filename="VCS/ProjectHelper.py" line="356"/> <source>Update</source> <translation>Обновить</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="435"/> + <location filename="VCS/ProjectHelper.py" line="438"/> <source>The project should be reread. Do this now?</source> <translation>Необходимо перезагрузить проект. Сделать это?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="216"/> + <location filename="VCS/ProjectHelper.py" line="219"/> <source>The project retrieved from the repository does not contain an eric project file (*.e4p). Create it?</source> <translation>В проекте отсутствует файл описания проекта (*.e4p). Создать?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="435"/> + <location filename="VCS/ProjectHelper.py" line="438"/> <source>Switch</source> <translation type="unfinished">Переключиться</translation> </message> @@ -54442,17 +54474,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1733"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1735"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Метки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1741"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Ветви</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1748"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -54463,30 +54495,30 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Изменения</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1745"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1747"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Предки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1236"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1238"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Предок #{0}</b></td><td></td></tr> <tr><td><b>Изменения</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1252"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1254"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -54496,7 +54528,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1284"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -54513,7 +54545,7 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_tr.ts Sat Jun 02 15:27:03 2012 +0200 +++ b/i18n/eric5_tr.ts Sat Jun 02 16:36:16 2012 +0200 @@ -17038,12 +17038,12 @@ <translation>Birleştiriliyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1178"/> <source>Mercurial command</source> <translation>Mercurial komut</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1366"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1368"/> <source>Copying {0}</source> <translation>Kopyalanıyor {0}</translation> </message> @@ -17058,147 +17058,147 @@ <translation type="obsolete">Gösterilecek giriş sayısını seçiniz.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1611"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1613"/> <source>Pulling from a remote Mercurial repository</source> <translation>Uzak Mercurial kaynak havuzundan çekiliyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1666"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1785"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> <source>Create Branch</source> <translation>Sınıf(Branş) Oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> <source>Enter branch name</source> <translation>Sınıf(Branş) adını gir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1839"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1841"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1923"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1969"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1992"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2028"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2028"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p><b>{0}</b> dosyası halihazırda bulunuyor. Üzerine yazılsın mı?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2121"/> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2079"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Değiştirme grubu Dosyaları (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2171"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2206"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Değişimgrubu Dosyaları (*.hg);;Tüm Dosyalar (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2183"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2241"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2307"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2363"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2343"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2381"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2383"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -17208,42 +17208,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2643"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2453"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2500"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2502"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2548"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2622"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -18155,7 +18155,7 @@ <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> <source><b>Target name</b> <p>Enter the new name in this field.</p></source> - <translation><b>Hedef İsim</b> + <translation type="obsolete"><b>Hedef İsim</b> <p>Bu alanın yeni adını giriniz.</p></translation> </message> <message> @@ -18179,10 +18179,16 @@ <translation>Mercurial Taşıma</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py" line="79"/> <source>Select target</source> <translation>Hedefi seç</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> + <source><b>Target name</b> +<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgDialog</name> @@ -19777,12 +19783,12 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398"/> <source>Copy in repository</source> - <translation>Kaynak havuzuna kopyala</translation> + <translation type="obsolete">Kaynak havuzuna kopyala</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> <source>Move in repository</source> - <translation>Kaynak havuzuna taşı</translation> + <translation type="obsolete">Kaynak havuzuna taşı</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403"/> @@ -19864,6 +19870,16 @@ <source>Conflict resolved</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398"/> + <source>Copy</source> + <translation type="unfinished">Kopyala</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> + <source>Move</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -39763,7 +39779,7 @@ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="63"/> <source><b>Target name</b> <p>Enter the new name in this field.</p></source> - <translation><b>Hedef İsim</b> + <translation type="obsolete"><b>Hedef İsim</b> <p>Bu alanın yeni adını giriniz.</p></translation> </message> <message> @@ -39793,10 +39809,16 @@ <translation>Altsürüm Taşıma</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py" line="79"/> <source>Select target</source> <translation>Hedefi seç</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="63"/> + <source><b>Target name</b> +<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnDialog</name> @@ -40867,12 +40889,12 @@ <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="494"/> <source>Copy in repository</source> - <translation>Kaynak havuzuna kopyala</translation> + <translation type="obsolete">Kaynak havuzuna kopyala</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="496"/> <source>Move in repository</source> - <translation>Kaynak havuzuna taşı</translation> + <translation type="obsolete">Kaynak havuzuna taşı</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="604"/> @@ -41009,6 +41031,16 @@ <source>Conflict resolved</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="494"/> + <source>Copy</source> + <translation type="unfinished">Kopyala</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="496"/> + <source>Move</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnProjectHelper</name> @@ -50264,97 +50296,97 @@ <context> <name>VcsProjectHelper</name> <message> - <location filename="VCS/ProjectHelper.py" line="65"/> + <location filename="VCS/ProjectHelper.py" line="67"/> <source>New from repository</source> <translation>Kaynak havuzundan yeni</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="65"/> - <source>&New from repository...</source> - <translation>Kay&nak havuzundan yeni...</translation> - </message> - <message> <location filename="VCS/ProjectHelper.py" line="67"/> + <source>&New from repository...</source> + <translation>Kay&nak havuzundan yeni...</translation> + </message> + <message> + <location filename="VCS/ProjectHelper.py" line="69"/> <source>Create a new project from the VCS repository</source> <translation>VCS kaynak havuzundan yeni bir proje oluştur</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="70"/> + <location filename="VCS/ProjectHelper.py" line="72"/> <source><b>New from repository</b><p>This creates a new local project from the VCS repository.</p></source> <translation><b>Kaynak havuzundan Yeni</b><p>Bu VCS kaynak havuzundan yeni bir yerel proje oluşturur.</p></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="77"/> + <location filename="VCS/ProjectHelper.py" line="79"/> <source>Export from repository</source> <translation>Kaynak havuzundan ihraç et</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="77"/> - <source>&Export from repository...</source> - <translation>Dışarı kaynak havuzundan ihraç &et...</translation> - </message> - <message> <location filename="VCS/ProjectHelper.py" line="79"/> + <source>&Export from repository...</source> + <translation>Dışarı kaynak havuzundan ihraç &et...</translation> + </message> + <message> + <location filename="VCS/ProjectHelper.py" line="81"/> <source>Export a project from the repository</source> <translation>Dışa Kaynak havuzundan proje aktar</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="82"/> + <location filename="VCS/ProjectHelper.py" line="84"/> <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="VCS/ProjectHelper.py" line="89"/> + <location filename="VCS/ProjectHelper.py" line="91"/> <source>Add to repository</source> <translation>Kaynak havuzuna ekle</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="89"/> - <source>&Add to repository...</source> - <translation>K&aynak havuzuna ekle...</translation> - </message> - <message> <location filename="VCS/ProjectHelper.py" line="91"/> + <source>&Add to repository...</source> + <translation>K&aynak havuzuna ekle...</translation> + </message> + <message> + <location filename="VCS/ProjectHelper.py" line="93"/> <source>Add the local project to the VCS repository</source> <translation>VCS kaynak havuzuna yerel proje ekle</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="94"/> + <location filename="VCS/ProjectHelper.py" line="96"/> <source><b>Add to repository</b><p>This adds (imports) the local project to the VCS repository.</p></source> <translation><b>Kaynak havuzuna ekle</b><p>Bu yerel projeyi kaynak havuzana ekler ( aktarır).</p></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="163"/> + <location filename="VCS/ProjectHelper.py" line="166"/> <source>New Project</source> <translation>Yeni Proje</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="305"/> + <location filename="VCS/ProjectHelper.py" line="308"/> <source>Select version control system for the project</source> <translation>proje için sürüm kontrol sistemini seçin</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="324"/> + <location filename="VCS/ProjectHelper.py" line="327"/> <source>Would you like to edit the VCS command options?</source> <translation>VCS komut seçeneklerini düzenlemek istiyor musunuz?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="176"/> + <location filename="VCS/ProjectHelper.py" line="179"/> <source>Create project directory</source> <translation>Proje dizinin oluştur</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="176"/> + <location filename="VCS/ProjectHelper.py" line="179"/> <source><p>The project directory <b>{0}</b> could not be created.</p></source> <translation><p>Proje dizini <b>{0}</b> oluşturulamıyor.</p></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="251"/> + <location filename="VCS/ProjectHelper.py" line="254"/> <source>New project from repository</source> <translation>Kaynak havuzundan yeni proje</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="201"/> + <location filename="VCS/ProjectHelper.py" line="204"/> <source>Select a project file to open.</source> <translation>Açmak için bir proje seçiniz.</translation> </message> @@ -50364,47 +50396,47 @@ <translation type="obsolete">Kaynak havuzundan geri alınan proje eric projesi değil (*.e4p *.e4pz). Oluşturulsun mu?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="243"/> + <location filename="VCS/ProjectHelper.py" line="246"/> <source>Shall the project file be added to the repository?</source> <translation>Proje dosyaları kaynak havuzuna aktarılacak mı?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="251"/> + <location filename="VCS/ProjectHelper.py" line="254"/> <source>The project could not be retrieved from the repository.</source> <translation>Proje kaynak havuzundan geri alınamıyor.</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="324"/> + <location filename="VCS/ProjectHelper.py" line="327"/> <source>Import Project</source> <translation>Proje İçe Aktar</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="353"/> + <location filename="VCS/ProjectHelper.py" line="356"/> <source>Update</source> <translation>Güncelle</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="435"/> + <location filename="VCS/ProjectHelper.py" line="438"/> <source>The project should be reread. Do this now?</source> <translation>Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="377"/> + <location filename="VCS/ProjectHelper.py" line="380"/> <source>Remove project from repository</source> <translation>Kaynak havuzundan proje kaldır</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="377"/> + <location filename="VCS/ProjectHelper.py" line="380"/> <source>Dou you really want to remove this project from the repository (and disk)?</source> <translation>Bu projeyi gerçekten kaynak havuzundan (ve diskten) silmek istiyor musunuz?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="216"/> + <location filename="VCS/ProjectHelper.py" line="219"/> <source>The project retrieved from the repository does not contain an eric project file (*.e4p). Create it?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="435"/> + <location filename="VCS/ProjectHelper.py" line="438"/> <source>Switch</source> <translation type="unfinished">Değiştirmek</translation> </message> @@ -54215,24 +54247,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1236"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1238"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Esas #{0}</b></td><td></td></tr> <tr><td><b>Değişiklik seti</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1733"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1735"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiketler</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1741"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branşlar</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1252"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1254"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -54241,7 +54273,7 @@ <tr><td><b>Teslim zamnanı</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1284"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -54258,23 +54290,23 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>İp ucu</b></td><td></td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>DEğişiklik seti</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1745"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1747"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Esas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1748"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -54285,7 +54317,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_zh_CN.GB2312.ts Sat Jun 02 15:27:03 2012 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Sat Jun 02 16:36:16 2012 +0200 @@ -18071,12 +18071,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1178"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1366"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1368"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> @@ -18086,147 +18086,147 @@ <translation type="obsolete">选择要显示的条目数。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1611"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1613"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1666"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1785"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1923"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1969"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1839"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1841"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2121"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2241"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2171"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1992"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2028"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2028"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2307"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2079"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2206"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2183"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2363"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2343"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2381"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2383"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -18236,42 +18236,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2643"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2453"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2500"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2502"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2548"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2622"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -19173,7 +19173,7 @@ <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> <source><b>Target name</b> <p>Enter the new name in this field.</p></source> - <translation type="unfinished"><b>目标名</b> + <translation type="obsolete"><b>目标名</b> <p>在该区域输入新名称。</p></translation> </message> <message> @@ -19197,10 +19197,16 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py" line="79"/> <source>Select target</source> <translation type="unfinished">选择目标</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> + <source><b>Target name</b> +<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgDialog</name> @@ -20810,12 +20816,12 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398"/> <source>Copy in repository</source> - <translation type="unfinished">在储存库中复制</translation> + <translation type="obsolete">在储存库中复制</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> <source>Move in repository</source> - <translation type="unfinished">在储存库中移动</translation> + <translation type="obsolete">在储存库中移动</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403"/> @@ -20902,6 +20908,16 @@ <source>Conflict resolved</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398"/> + <source>Copy</source> + <translation type="unfinished">复制</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> + <source>Move</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -42952,7 +42968,7 @@ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="63"/> <source><b>Target name</b> <p>Enter the new name in this field.</p></source> - <translation><b>目标名</b> + <translation type="obsolete"><b>目标名</b> <p>在该区域输入新名称。</p></translation> </message> <message> @@ -42983,10 +42999,16 @@ <translation>版本控制移动</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py" line="79"/> <source>Select target</source> <translation>选择目标</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="63"/> + <source><b>Target name</b> +<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnDialog</name> @@ -44242,12 +44264,12 @@ <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="494"/> <source>Copy in repository</source> - <translation>在储存库中复制</translation> + <translation type="obsolete">在储存库中复制</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="496"/> <source>Move in repository</source> - <translation>在储存库中移动</translation> + <translation type="obsolete">在储存库中移动</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="604"/> @@ -44384,6 +44406,16 @@ <source>Conflict resolved</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="494"/> + <source>Copy</source> + <translation type="unfinished">复制</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="496"/> + <source>Move</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnProjectHelper</name> @@ -54313,82 +54345,82 @@ <context> <name>VcsProjectHelper</name> <message> - <location filename="VCS/ProjectHelper.py" line="65"/> + <location filename="VCS/ProjectHelper.py" line="67"/> <source>New from repository</source> <translation>从储存库新建</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="65"/> - <source>&New from repository...</source> - <translation>从储存库新建(&N)……</translation> - </message> - <message> <location filename="VCS/ProjectHelper.py" line="67"/> + <source>&New from repository...</source> + <translation>从储存库新建(&N)……</translation> + </message> + <message> + <location filename="VCS/ProjectHelper.py" line="69"/> <source>Create a new project from the VCS repository</source> <translation>从版本控制系统储存库创建新项目</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="70"/> + <location filename="VCS/ProjectHelper.py" line="72"/> <source><b>New from repository</b><p>This creates a new local project from the VCS repository.</p></source> <translation><b>从储存库新建</b><p>从版本控制系统储存库中创建新的本地项目。</p></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="77"/> + <location filename="VCS/ProjectHelper.py" line="79"/> <source>Export from repository</source> <translation>从储存库导出</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="77"/> - <source>&Export from repository...</source> - <translation>从储存库导出(&E)……</translation> - </message> - <message> <location filename="VCS/ProjectHelper.py" line="79"/> + <source>&Export from repository...</source> + <translation>从储存库导出(&E)……</translation> + </message> + <message> + <location filename="VCS/ProjectHelper.py" line="81"/> <source>Export a project from the repository</source> <translation>从储存库中导出一个项目</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="82"/> + <location filename="VCS/ProjectHelper.py" line="84"/> <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="VCS/ProjectHelper.py" line="89"/> + <location filename="VCS/ProjectHelper.py" line="91"/> <source>Add to repository</source> <translation>添加到储存库</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="89"/> - <source>&Add to repository...</source> - <translation>添加到储存库（&A）……</translation> - </message> - <message> <location filename="VCS/ProjectHelper.py" line="91"/> + <source>&Add to repository...</source> + <translation>添加到储存库（&A）……</translation> + </message> + <message> + <location filename="VCS/ProjectHelper.py" line="93"/> <source>Add the local project to the VCS repository</source> <translation>将本地项目添加到版本控制系统储存库中</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="94"/> + <location filename="VCS/ProjectHelper.py" line="96"/> <source><b>Add to repository</b><p>This adds (imports) the local project to the VCS repository.</p></source> <translation><b>添加到储存库</b><p>将本地项目添加（导入）到版本控制系统储存库中。</p></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="163"/> + <location filename="VCS/ProjectHelper.py" line="166"/> <source>New Project</source> <translation>新建项目</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="305"/> + <location filename="VCS/ProjectHelper.py" line="308"/> <source>Select version control system for the project</source> <translation>为项目选择版本控制系统</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="324"/> + <location filename="VCS/ProjectHelper.py" line="327"/> <source>Would you like to edit the VCS command options?</source> <translation>是否编辑版本控制系统命令选项？</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="176"/> + <location filename="VCS/ProjectHelper.py" line="179"/> <source>Create project directory</source> <translation>创建项目文件夹</translation> </message> @@ -54398,12 +54430,12 @@ <translation type="obsolete"><p>无法创建项目文件夹 <b>%1</b> 。</p></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="251"/> + <location filename="VCS/ProjectHelper.py" line="254"/> <source>New project from repository</source> <translation>从储存库新建项目</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="201"/> + <location filename="VCS/ProjectHelper.py" line="204"/> <source>Select a project file to open.</source> <translation>选择要打开的项目文件</translation> </message> @@ -54413,52 +54445,52 @@ <translation type="obsolete">从储存库中检索到的项目不包含 Eric 项目文件 (*.e4p *.e4pz *.e3p *.e3pz)。是否创建？</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="243"/> + <location filename="VCS/ProjectHelper.py" line="246"/> <source>Shall the project file be added to the repository?</source> <translation>是否将项目文件添加到储存库？</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="251"/> + <location filename="VCS/ProjectHelper.py" line="254"/> <source>The project could not be retrieved from the repository.</source> <translation>无法从储存库中检索项目。</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="324"/> + <location filename="VCS/ProjectHelper.py" line="327"/> <source>Import Project</source> <translation>导入项目</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="377"/> + <location filename="VCS/ProjectHelper.py" line="380"/> <source>Remove project from repository</source> <translation>从储存库中移除项目</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="377"/> + <location filename="VCS/ProjectHelper.py" line="380"/> <source>Dou you really want to remove this project from the repository (and disk)?</source> <translation>确定要从储存库（磁盘）中移除该项目？</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="353"/> + <location filename="VCS/ProjectHelper.py" line="356"/> <source>Update</source> <translation type="unfinished">更新</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="435"/> + <location filename="VCS/ProjectHelper.py" line="438"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="176"/> + <location filename="VCS/ProjectHelper.py" line="179"/> <source><p>The project directory <b>{0}</b> could not be created.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="216"/> + <location filename="VCS/ProjectHelper.py" line="219"/> <source>The project retrieved from the repository does not contain an eric project file (*.e4p). Create it?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="435"/> + <location filename="VCS/ProjectHelper.py" line="438"/> <source>Switch</source> <translation type="unfinished">转换</translation> </message> @@ -58482,30 +58514,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1236"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1238"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1733"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1735"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1741"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1252"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1254"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1284"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -58516,23 +58548,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1745"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1747"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1748"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -58540,7 +58572,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
