Sun, 02 May 2010 15:11:44 +0000
Added action to back out a changeset and added code to update automatically after a pull (Mercurial Plug-in).
--- a/APIs/Python3/eric5.api Sun May 02 09:55:49 2010 +0000 +++ b/APIs/Python3/eric5.api Sun May 02 15:11:44 2010 +0000 @@ -2809,6 +2809,9 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.HgAnnotateDialog.on_sendButton_clicked?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.HgAnnotateDialog.start?4(fn) eric5.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.HgAnnotateDialog?1(vcs, parent = None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.HgBackoutDialog.getParameters?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.HgBackoutDialog.on_noneButton_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.HgBackoutDialog?1(tagsList, branchesList, parent = None) eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog.getParameters?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog?1(tagsList, branchesList, parent = None) eric5.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog.HgCommandDialog.getData?4() @@ -2936,6 +2939,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.clearStatusCache?4() eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.getPlugin?4() eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgAnnotate?4(name) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBackout?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBisect?4(name, subcommand) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBranch?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBundle?4(name)
--- a/Documentation/Help/source.qhp Sun May 02 09:55:49 2010 +0000 +++ b/Documentation/Help/source.qhp Sun May 02 15:11:44 2010 +0000 @@ -325,6 +325,7 @@ </section> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.Config" ref="eric5.Plugins.VcsPlugins.vcsMercurial.Config.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.html" /> + <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.html" /> @@ -7788,6 +7789,7 @@ <keyword name="Hg.clearStatusCache" id="Hg.clearStatusCache" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.clearStatusCache" /> <keyword name="Hg.getPlugin" id="Hg.getPlugin" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.getPlugin" /> <keyword name="Hg.hgAnnotate" id="Hg.hgAnnotate" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgAnnotate" /> + <keyword name="Hg.hgBackout" id="Hg.hgBackout" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgBackout" /> <keyword name="Hg.hgBisect" id="Hg.hgBisect" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgBisect" /> <keyword name="Hg.hgBranch" id="Hg.hgBranch" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgBranch" /> <keyword name="Hg.hgBundle" id="Hg.hgBundle" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgBundle" /> @@ -7870,6 +7872,7 @@ <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html" /> <keyword name="HgProjectHelper" id="HgProjectHelper" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper" /> <keyword name="HgProjectHelper (Constructor)" id="HgProjectHelper (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__init__" /> + <keyword name="HgProjectHelper.__hgBackout" id="HgProjectHelper.__hgBackout" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgBackout" /> <keyword name="HgProjectHelper.__hgBisectBad" id="HgProjectHelper.__hgBisectBad" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgBisectBad" /> <keyword name="HgProjectHelper.__hgBisectGood" id="HgProjectHelper.__hgBisectGood" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgBisectGood" /> <keyword name="HgProjectHelper.__hgBisectReset" id="HgProjectHelper.__hgBisectReset" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgBisectReset" /> @@ -7996,6 +7999,11 @@ <keyword name="HgDialog.on_passwordCheckBox_toggled" id="HgDialog.on_passwordCheckBox_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgDialog.html#HgDialog.on_passwordCheckBox_toggled" /> <keyword name="HgDialog.on_sendButton_clicked" id="HgDialog.on_sendButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgDialog.html#HgDialog.on_sendButton_clicked" /> <keyword name="HgDialog.startProcess" id="HgDialog.startProcess" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgDialog.html#HgDialog.startProcess" /> + <keyword name="HgBackoutDialog (Module)" id="HgBackoutDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.html" /> + <keyword name="HgBackoutDialog" id="HgBackoutDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.html#HgBackoutDialog" /> + <keyword name="HgBackoutDialog (Constructor)" id="HgBackoutDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.html#HgBackoutDialog.__init__" /> + <keyword name="HgBackoutDialog.getParameters" id="HgBackoutDialog.getParameters" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.html#HgBackoutDialog.getParameters" /> + <keyword name="HgBackoutDialog.on_noneButton_toggled" id="HgBackoutDialog.on_noneButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.html#HgBackoutDialog.on_noneButton_toggled" /> <keyword name="HgLogBrowserDialog (Module)" id="HgLogBrowserDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html" /> <keyword name="HgLogBrowserDialog" id="HgLogBrowserDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog" /> <keyword name="HgLogBrowserDialog (Constructor)" id="HgLogBrowserDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__init__" /> @@ -9805,6 +9813,7 @@ <file>eric5.Plugins.VcsPlugins.vcsMercurial.Config.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.html</file> + <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.html</file>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Sun May 02 09:55:49 2010 +0000 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Sun May 02 15:11:44 2010 +0000 @@ -57,6 +57,9 @@ <td><a href="#HgProjectHelper.__init__">HgProjectHelper</a></td> <td>Constructor</td> </tr><tr> +<td><a href="#HgProjectHelper.__hgBackout">__hgBackout</a></td> +<td>Protected slot used to back out changes of a changeset.</td> +</tr><tr> <td><a href="#HgProjectHelper.__hgBisectBad">__hgBisectBad</a></td> <td>Protected slot used to execute the bisect --bad command.</td> </tr><tr> @@ -182,7 +185,12 @@ <dd> name of this object (string) </dd> -</dl><a NAME="HgProjectHelper.__hgBisectBad" ID="HgProjectHelper.__hgBisectBad"></a> +</dl><a NAME="HgProjectHelper.__hgBackout" ID="HgProjectHelper.__hgBackout"></a> +<h4>HgProjectHelper.__hgBackout</h4> +<b>__hgBackout</b>(<i></i>) +<p> + Protected slot used to back out changes of a changeset. +</p><a NAME="HgProjectHelper.__hgBisectBad" ID="HgProjectHelper.__hgBisectBad"></a> <h4>HgProjectHelper.__hgBisectBad</h4> <b>__hgBisectBad</b>(<i></i>) <p>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Sun May 02 09:55:49 2010 +0000 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Sun May 02 15:11:44 2010 +0000 @@ -81,6 +81,9 @@ <td><a href="#Hg.hgAnnotate">hgAnnotate</a></td> <td>Public method to show the output of the hg annotate command.</td> </tr><tr> +<td><a href="#Hg.hgBackout">hgBackout</a></td> +<td>Public method used to backout an earlier changeset from the Mercurial repository.</td> +</tr><tr> <td><a href="#Hg.hgBisect">hgBisect</a></td> <td>Public method to perform bisect commands.</td> </tr><tr> @@ -335,6 +338,16 @@ <dd> file name to show the annotations for (string) </dd> +</dl><a NAME="Hg.hgBackout" ID="Hg.hgBackout"></a> +<h4>Hg.hgBackout</h4> +<b>hgBackout</b>(<i>name</i>) +<p> + Public method used to backout an earlier changeset from the Mercurial repository. +</p><dl> +<dt><i>name</i></dt> +<dd> +directory name (string or list of strings)) +</dd> </dl><a NAME="Hg.hgBisect" ID="Hg.hgBisect"></a> <h4>Hg.hgBisect</h4> <b>hgBisect</b>(<i>name, subcommand</i>) @@ -639,7 +652,7 @@ </p><dl> <dt><i>name</i></dt> <dd> -file/directory name (string) +directory name (string) </dd> </dl><a NAME="Hg.hgVerify" ID="Hg.hgVerify"></a> <h4>Hg.hgVerify</h4>
--- a/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.html Sun May 02 09:55:49 2010 +0000 +++ b/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.html Sun May 02 15:11:44 2010 +0000 @@ -45,6 +45,9 @@ <td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.html">HgAnnotateDialog</a></td> <td>Module implementing a dialog to show the output of the hg annotate command.</td> </tr><tr> +<td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.html">HgBackoutDialog</a></td> +<td>Module implementing a dialog to enter the data for a backout operation.</td> +</tr><tr> <td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html">HgBundleDialog</a></td> <td>Module implementing a dialog to enter the data for a bundle operation.</td> </tr><tr>
--- a/Plugins/PluginVcsMercurial.py Sun May 02 09:55:49 2010 +0000 +++ b/Plugins/PluginVcsMercurial.py Sun May 02 15:11:44 2010 +0000 @@ -146,6 +146,7 @@ "UseLogBrowser" : True, "LogLimit" : 100, "CommitMessages" : 20, + "PullUpdate" : False, } from VcsPlugins.vcsMercurial.ProjectHelper import HgProjectHelper @@ -189,7 +190,7 @@ @param key the key of the value to get @return the requested setting """ - if key in ["StopLogOnCopy", "UseLogBrowser"]: + if key in ["StopLogOnCopy", "UseLogBrowser", "PullUpdate"]: return Preferences.toBool(Preferences.Prefs.settings.value( "Mercurial/" + key, self.__mercurialDefaults[key])) elif key in ["LogLimit", "CommitMessages"]:
--- a/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Sun May 02 09:55:49 2010 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Sun May 02 15:11:44 2010 +0000 @@ -34,6 +34,7 @@ self.logSpinBox.setValue(self.__plugin.getPreferences("LogLimit")) self.commitSpinBox.setValue(self.__plugin.getPreferences("CommitMessages")) self.logBrowserCheckBox.setChecked(self.__plugin.getPreferences("UseLogBrowser")) + self.pullUpdateCheckBox.setChecked(self.__plugin.getPreferences("PullUpdate")) def save(self): """ @@ -42,6 +43,7 @@ self.__plugin.setPreferences("LogLimit", self.logSpinBox.value()) self.__plugin.setPreferences("CommitMessages", self.commitSpinBox.value()) self.__plugin.setPreferences("UseLogBrowser", self.logBrowserCheckBox.isChecked()) + self.__plugin.setPreferences("PullUpdate", self.pullUpdateCheckBox.isChecked()) @pyqtSlot() def on_configButton_clicked(self):
--- a/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui Sun May 02 09:55:49 2010 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui Sun May 02 15:11:44 2010 +0000 @@ -10,7 +10,7 @@ <height>384</height> </rect> </property> - <layout class="QVBoxLayout" name="verticalLayout_2"> + <layout class="QVBoxLayout" name="verticalLayout_3"> <item> <widget class="QLabel" name="headerLabel"> <property name="text"> @@ -138,6 +138,25 @@ </widget> </item> <item> + <widget class="QGroupBox" name="groupBox_4"> + <property name="title"> + <string>Pull</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QCheckBox" name="pullUpdateCheckBox"> + <property name="toolTip"> + <string>Select to update the working directory to new tip</string> + </property> + <property name="text"> + <string>Update after pulling</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> <widget class="QPushButton" name="configButton"> <property name="toolTip"> <string>Edit the mercurial config file</string> @@ -166,6 +185,7 @@ <tabstop>logSpinBox</tabstop> <tabstop>commitSpinBox</tabstop> <tabstop>logBrowserCheckBox</tabstop> + <tabstop>pullUpdateCheckBox</tabstop> <tabstop>configButton</tabstop> </tabstops> <resources/>
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Sun May 02 09:55:49 2010 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Sun May 02 15:11:44 2010 +0000 @@ -703,6 +703,19 @@ )) self.connect(self.hgBisectResetAct, SIGNAL('triggered()'), self.__hgBisectReset) self.actions.append(self.hgBisectResetAct) + + self.hgBackoutAct = E5Action(self.trUtf8('Back out changeset'), + self.trUtf8('Back out changeset'), + 0, 0, self, 'mercurial_backout') + self.hgBackoutAct.setStatusTip(self.trUtf8( + 'Back out changes of an earlier changeset' + )) + self.hgBackoutAct.setWhatsThis(self.trUtf8( + """<b>Back out changeset</b>""" + """<p>This backs out changes of an earlier changeset.</p>""" + )) + self.connect(self.hgBackoutAct, SIGNAL('triggered()'), self.__hgBackout) + self.actions.append(self.hgBackoutAct) def initMenu(self, menu): """ @@ -728,6 +741,8 @@ adminMenu.addSeparator() adminMenu.addAction(self.hgRecoverAct) adminMenu.addSeparator() + adminMenu.addAction(self.hgBackoutAct) + adminMenu.addSeparator() adminMenu.addAction(self.hgVerifyAct) bundleMenu = QMenu(self.trUtf8("Changegroup Management"), menu) @@ -995,3 +1010,9 @@ Protected slot used to execute the bisect --reset command. """ self.vcs.hgBisect(self.project.ppath, "reset") + + def __hgBackout(self): + """ + Protected slot used to back out changes of a changeset. + """ + self.vcs.hgBackout(self.project.ppath)
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Sun May 02 09:55:49 2010 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Sun May 02 15:11:44 2010 +0000 @@ -39,6 +39,7 @@ from .HgTagBranchListDialog import HgTagBranchListDialog from .HgCommandDialog import HgCommandDialog from .HgBundleDialog import HgBundleDialog +from .HgBackoutDialog import HgBackoutDialog from .ProjectBrowserHelper import HgProjectBrowserHelper @@ -1290,6 +1291,8 @@ args.append('pull') self.addArguments(args, self.options['global']) args.append('-v') + if self.getPlugin().getPreferences("PullUpdate"): + args.append('--update') # find the root of the repo repodir = self.splitPath(name)[0] @@ -1749,6 +1752,15 @@ @param name directory name on which to base the changegroup (string) """ + dname, fname = self.splitPath(name) + + # find the root of the repo + repodir = str(dname) + while not os.path.isdir(os.path.join(repodir, self.adminDir)): + repodir = os.path.dirname(repodir) + if repodir == os.sep: + return + file = QFileDialog.getOpenFileName(\ None, self.trUtf8("Preview changegroup"), @@ -1799,7 +1811,7 @@ """ Public method to apply changegroup files. - @param name file/directory name (string) + @param name directory name (string) """ dname, fname = self.splitPath(name) @@ -1901,7 +1913,7 @@ while not os.path.isdir(os.path.join(repodir, self.adminDir)): repodir = os.path.dirname(repodir) if repodir == os.sep: - return False + return dia = HgDialog(\ self.trUtf8('Removing files from the Mercurial repository only')) @@ -1913,6 +1925,50 @@ else: self.__forgotNames.append(name) + def hgBackout(self, name): + """ + Public method used to backout an earlier changeset from the Mercurial repository. + + @param name directory name (string or list of strings)) + """ + dname, fname = self.splitPath(name) + + # find the root of the repo + repodir = str(dname) + while not os.path.isdir(os.path.join(repodir, self.adminDir)): + repodir = os.path.dirname(repodir) + if repodir == os.sep: + return + + dlg = HgBackoutDialog(self.tagsList, self.branchesList) + if dlg.exec_() == QDialog.Accepted: + rev, merge, date, user, message = dlg.getParameters() + if not rev: + QMessageBox.warning(None, + self.trUtf8("Backing out changeset"), + self.trUtf8("""No revision given. Aborting...""")) + return + + args = [] + args.append('backout') + args.append('-v') + if merge: + args.append('--merge') + if date: + args.append('--date') + args.append(date) + if user: + args.append('--user') + args.append(user) + args.append('--message') + args.append(message) + args.append(rev) + + dia = HgDialog(self.trUtf8('Backing out changeset')) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + ############################################################################ ## Methods to get the helper objects are below. ############################################################################
--- a/eric5.e4p Sun May 02 09:55:49 2010 +0000 +++ b/eric5.e4p Sun May 02 15:11:44 2010 +0000 @@ -797,6 +797,7 @@ <Source>Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py</Source> </Sources> <Forms> <Form>PyUnit/UnittestDialog.ui</Form> @@ -1020,6 +1021,7 @@ <Form>Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui</Form> </Forms> <Translations> <Translation>i18n/eric5_cs.qm</Translation>
--- a/i18n/eric5_cs.ts Sun May 02 09:55:49 2010 +0000 +++ b/i18n/eric5_cs.ts Sun May 02 15:11:44 2010 +0000 @@ -14149,230 +14149,240 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="164"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="165"/> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="167"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="168"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="169"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="170"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="196"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="196"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="223"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="238"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="239"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="280"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="377"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="378"/> <source>Commiting changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="423"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="424"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="532"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="589"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="590"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="698"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="728"/> <source>Reverting changes</source> <translation type="unfinished">Navrácení změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="768"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="769"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="968"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="969"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1138"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1231"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1231"/> <source>Select number of entries to show.</source> <translation type="unfinished">Vyberte počet položek, které se mají zobrazit.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1304"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1326"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1329"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1435"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1438"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1471"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1533"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1536"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1557"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1583"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1606"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1819"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1494"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1740"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1833"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1859"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1886"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1795"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1654"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1654"/> <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="1906"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1701"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> + <source>Backing out changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1947"/> + <source>No revision given. Aborting...</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -14463,6 +14473,139 @@ </message> </context> <context> + <name>HgBackoutDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="14"/> + <source>Mercurial Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Revize</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="29"/> + <source>Select to specify a revision by number</source> + <translation type="unfinished">Vybrat pro zadání revize číslem</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="32"/> + <source>Number</source> + <translation type="unfinished">Číslo</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="42"/> + <source>Enter a revision number</source> + <translation type="unfinished">Zadejte číslo revize</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="71"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="74"/> + <source>Id:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="84"/> + <source>Enter a changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="91"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="94"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="110"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="120"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="123"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="139"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="152"/> + <source>No revision selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="165"/> + <source>Commit data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="171"/> + <source>Commit message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> + <source>Enter the commit message or leave empty to use the default one</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="190"/> + <source>Commit Date:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="197"/> + <source>Enter optional date for the commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="210"/> + <source>Commit User:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="217"/> + <source>Enter optional user for the commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="229"/> + <source>Select to merge with parent of the project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="232"/> + <source>Merge with current parent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py" line="75"/> + <source>Backed out changeset <{0}>.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgBundleDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="14"/> @@ -16312,7 +16455,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> @@ -16362,7 +16505,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> @@ -16452,7 +16595,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> @@ -16526,6 +16669,21 @@ <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> + <source>Back out changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Back out changes of an earlier changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -20364,15 +20522,30 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="143"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> <source>Edit the mercurial config file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> <source>Edit config file</source> <translation type="unfinished">Edit konfig. soubor</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="143"/> + <source>Pull</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="149"/> + <source>Select to update the working directory to new tip</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="152"/> + <source>Update after pulling</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -44107,30 +44280,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1022"/> <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="1388"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1391"/> <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="1392"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1395"/> <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="1033"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1034"/> <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="1054"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1055"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -44141,23 +44314,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1382"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1385"/> <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="1384"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1387"/> <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="1396"/> - <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="1399"/> + <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="1402"/> <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>
--- a/i18n/eric5_de.ts Sun May 02 09:55:49 2010 +0000 +++ b/i18n/eric5_de.ts Sun May 02 15:11:44 2010 +0000 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="de"> +<!DOCTYPE TS><TS version="1.1" language="de"> <context> <name>AboutDialog</name> <message> @@ -1550,7 +1549,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="140"/> - <source>Open in New &Tab Ctrl+LMB</source> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> <translation>In neuem &Register öffnen\tStrg+LMK</translation> </message> <message> @@ -1601,7 +1600,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="72"/> - <source>Open in New &Tab Ctrl+LMB</source> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> <translation>In neuem &Register öffnen\tStrg+LMK</translation> </message> </context> @@ -11042,7 +11041,7 @@ </message> <message> <location filename="Helpviewer/HelpBrowserWV.py" line="568"/> - <source>Open Link in New Tab Ctrl+LMB</source> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> <translation>Link in neuem Fenster öffnen\tStrg+LMK</translation> </message> <message> @@ -13207,245 +13206,240 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="164"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="165"/> <source>The hg process finished with the exit code {0}</source> <translation>Der hg Prozess endete mit dem Code {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="167"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="168"/> <source>The hg process did not finish within 30s.</source> <translation>Der hg Prozess endete nicht innerhalb von 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="169"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="170"/> <source>Could not start the hg executable.</source> <translation>Das hg Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="196"/> <source>Create project repository</source> <translation>Projektrepository anlegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="196"/> <source>The project repository could not be created.</source> <translation>Das Projektrepository konnte nicht erzeugt werden.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="223"/> <source>Creating Mercurial repository</source> <translation>Lege Mercurial Repository an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="238"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="239"/> <source>Initial commit to Mercurial repository</source> <translation>Erstes Commit für das Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="280"/> <source>Cloning project from a Mercurial repository</source> <translation>Klone das Projekt aus dem Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="377"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="378"/> <source>Commiting changes to Mercurial repository</source> <translation>Pflege Änderungen in das Mercurial Repository ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="423"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="424"/> <source>Synchronizing with the Mercurial repository</source> <translation>Gleiche mit dem Mercurial Repository ab</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Füge Dateien/Verzeichnisse dem Mercurial Repository hinzu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="532"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Lösche Dateien/Verzeichnisse aus dem Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="589"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="590"/> <source>Renaming {0}</source> <translation>Benenne {0} um</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="698"/> <source>Taging in the Mercurial repository</source> <translation>Marke im Mercurial Repository setzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="728"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="768"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="769"/> <source>Merging</source> <translation>Zusammenführen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="968"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="969"/> <source>Mercurial command</source> <translation>Mercurial Befehl</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1138"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1231"/> <source>Mercurial Log</source> <translation>Mercurial Log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1231"/> <source>Select number of entries to show.</source> <translation>Wähle Anzahl der anzuzeigenden Einträge.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1304"/> <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="1326"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1329"/> <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="1435"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1438"/> <source>Resolving files/directories</source> <translation>Löse Dateien/Verzeichnisse auf</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> <source>Create Branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> <source>Enter branch name</source> <translation>Gib den Zweignamen ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1471"/> <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="1533"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1536"/> <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="1557"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1583"/> <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="1603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1606"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> - <source><p>The Mercurial bundle file <b>{0}</b> already exists.</p></source> - <translation type="obsolete"><p>Die Mercurial Bundle Datei <b>{0}</b> existiert bereits.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1819"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/> <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="1491"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1494"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1740"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1833"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1859"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1886"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1698"/> - <source>Mercurial Bundle Files (*.hg)</source> - <translation type="obsolete">Mercurial Bundle Dateien (*.hg)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1795"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> - <source>Mercurial Bundle Files (*.hg);;All Files (*)</source> - <translation type="obsolete">Mercurial Bundle Dateien (*.hg);;Alle Dateien (*)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1654"/> <source>Create .hgignore file</source> <translation>.hgignore Datei erstellen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1654"/> <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="1906"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> <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="1698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1701"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists.</p></source> <translation><p>Die Mercurial Änderungsgruppendatei <b>{0}</b> existiert bereits.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <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="1793"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805"/> <source>Identifying changegroup file</source> <translation>Identifiziere Änderungsgruppendatei</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> + <source>Backing out changeset</source> + <translation>Änderungssatz umkehren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1947"/> + <source>No revision given. Aborting...</source> + <translation>Keine Revision angegeben. Abbruch...</translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -13536,6 +13530,139 @@ </message> </context> <context> + <name>HgBackoutDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="14"/> + <source>Mercurial Revision</source> + <translation>Mercurial Revision</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="23"/> + <source>Revision</source> + <translation>Revision</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="29"/> + <source>Select to specify a revision by number</source> + <translation>Auswählen, um eine Revision per Nummer zu wählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="32"/> + <source>Number</source> + <translation>Nummer</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="42"/> + <source>Enter a revision number</source> + <translation>Gib eine Revisionsnummer ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="71"/> + <source>Select to specify a revision by changeset id</source> + <translation>Auswählen, um eine Revision mit ihrer Änderungssatz ID anzugeben</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="74"/> + <source>Id:</source> + <translation>Id:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="84"/> + <source>Enter a changeset id</source> + <translation>Gib die Änderungssatz ID ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="91"/> + <source>Select to specify a revision by a tag</source> + <translation>Auswählen, um eine Revision per Marke zu wählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="94"/> + <source>Tag:</source> + <translation>Marke:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="110"/> + <source>Enter a tag name</source> + <translation>Gib den Namen der Marke ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="120"/> + <source>Select to specify a revision by a branch</source> + <translation>Auswählen, um eine Revision per Zweig zu wählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="123"/> + <source>Branch:</source> + <translation>Zweig:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="139"/> + <source>Enter a branch name</source> + <translation>Gib einen Zweignamen ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/> + <source>Select to not specify a specific revision</source> + <translation>Auswählen, um keine spezifische Revision zu wählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="152"/> + <source>No revision selected</source> + <translation>Keine Revision ausgewählt</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="165"/> + <source>Commit data</source> + <translation>Änderungsdaten</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="171"/> + <source>Commit message:</source> + <translation>Änderungsbeschreibung:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> + <source>Enter the commit message or leave empty to use the default one</source> + <translation>Gib die Änderungsbeschreibung ein oder lasse es leer, um den Standardtext zu verwenden</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="190"/> + <source>Commit Date:</source> + <translation>Datum für Änderung:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="197"/> + <source>Enter optional date for the commit</source> + <translation>Gib das optionale Datum der Änderung ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="210"/> + <source>Commit User:</source> + <translation>Nutzer für Änderung:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="217"/> + <source>Enter optional user for the commit</source> + <translation>Gib den optionalen Nutzer der Änderung ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="229"/> + <source>Select to merge with parent of the project directory</source> + <translation>Auswählen, um mit dem Vorgänger des Projektverzeichnisses zusammenzuführen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="232"/> + <source>Merge with current parent</source> + <translation>Mit aktuellem Vorgänger zusammenführen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py" line="75"/> + <source>Backed out changeset <{0}>.</source> + <translation>Änderungssatz <{0}> umgekehrt.</translation> + </message> +</context> +<context> <name>HgBundleDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="14"/> @@ -15376,7 +15503,7 @@ <translation><b>Transaktion zurücksetzen</b><p>Dies setzt eine abgebrochene Transaktion zurück.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Repository Administration</source> <translation>Repository Administration</translation> </message> @@ -15426,7 +15553,7 @@ <translation>Wende eine oder mehrere Änderungsgruppendateien an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> <source>Changegroup Management</source> <translation>Verwaltung von Änderungsgruppen</translation> </message> @@ -15516,7 +15643,7 @@ <translation><b>Zurücksetzen</b><p>Dies setzt die Bisect Suchdaten zurück.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> <source>Bisect</source> <translation>Bisect</translation> </message> @@ -15541,16 +15668,6 @@ <translation>Änderungsgruppe ansehen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> - <source>Preview a changegroup file containing a collecting of changesets</source> - <translation type="obsolete">Eine Änderungsgruppendatei für Änderungssätze ansehen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> - <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collecting of changesets.</p></source> - <translation type="obsolete"><b>Änderungsgruppe ansehen</b><p>Dies zeigt den Inhalt einer Änderungsgruppendatei für Änderungssätze an.</p></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> <source>Identify</source> <translation>Identifizieren</translation> @@ -15600,6 +15717,21 @@ <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation><b>Änderungsgruppe ansehen</b><p>Dies identifiziert eine Änderungsgruppendatei für Änderungssätze.</p></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> + <source>Back out changeset</source> + <translation>Änderungssatz umkehren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Back out changes of an earlier changeset</source> + <translation>Änderungen eines früheren Änderungssatzes umkehren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> + <translation><b>Änderungssatz umkehren</b><p>Dies kehrt die Änderungen eines früheren Änderungssatzes um.</p></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -19238,15 +19370,30 @@ <translation>Log Browser für eingehendes / ausgehendes Log verwenden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="143"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> <source>Edit the mercurial config file</source> <translation>Editiere die Mercurial config Datei</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> <source>Edit config file</source> <translation>Editiere config Datei</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="143"/> + <source>Pull</source> + <translation>Pull</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="149"/> + <source>Select to update the working directory to new tip</source> + <translation>Auswählen, um das Arbeitsverzeichnis auf die neue Spitze zu aktualisieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="152"/> + <source>Update after pulling</source> + <translation>Nach Pull aktualisieren</translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -41223,24 +41370,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1022"/> <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="1388"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1391"/> <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="1392"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1395"/> <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="1033"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1034"/> <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> @@ -41249,7 +41396,7 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1054"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1055"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -41266,24 +41413,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1382"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1385"/> <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="1384"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1387"/> <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="1396"/> - <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="1399"/> + <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="1402"/> <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>
--- a/i18n/eric5_es.ts Sun May 02 09:55:49 2010 +0000 +++ b/i18n/eric5_es.ts Sun May 02 15:11:44 2010 +0000 @@ -13206,230 +13206,240 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="164"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="165"/> <source>The hg process finished with the exit code {0}</source> <translation>El proceso hg ha terminado con código de salida {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="167"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="168"/> <source>The hg process did not finish within 30s.</source> <translation>El proceso hg no terminó en un plazo de 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="169"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="170"/> <source>Could not start the hg executable.</source> <translation>No se ha podido iniciar el ejecutable de hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="196"/> <source>Create project repository</source> <translation>Crear repositorio del proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="196"/> <source>The project repository could not be created.</source> <translation>No se ha podido crear el repositorio del proyecto.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="223"/> <source>Creating Mercurial repository</source> <translation>Creando repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="238"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="239"/> <source>Initial commit to Mercurial repository</source> <translation>Commit inicial al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="280"/> <source>Cloning project from a Mercurial repository</source> <translation>Clonando proyecto desde un repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="377"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="378"/> <source>Commiting changes to Mercurial repository</source> <translation>Haciendo commit de cambios al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="423"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="424"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizando con el repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Añadiendo archivos/directorios al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="532"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Eliminando archivos/directorios del repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="589"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="590"/> <source>Renaming {0}</source> <translation>Renombrando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="768"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="769"/> <source>Merging</source> <translation>Haciendo un merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1138"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1231"/> <source>Mercurial Log</source> <translation>Registro de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1231"/> <source>Select number of entries to show.</source> <translation>Seleccionar número de entradas a mostrar.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1304"/> <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="1326"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1329"/> <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="1435"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1438"/> <source>Resolving files/directories</source> <translation>Resolviendo archivos/directorios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="698"/> <source>Taging in the Mercurial repository</source> <translation>Haciendo tag en el repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="728"/> <source>Reverting changes</source> <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="968"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="969"/> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> <source>Create Branch</source> <translation>Crear Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> <source>Enter branch name</source> <translation>Introducir nombre de branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1471"/> <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="1533"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1536"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1557"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1583"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1606"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1819"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1494"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1740"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1833"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1859"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1886"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1795"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1654"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1654"/> <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="1906"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1701"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> + <source>Backing out changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1947"/> + <source>No revision given. Aborting...</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -13520,6 +13530,139 @@ </message> </context> <context> + <name>HgBackoutDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="14"/> + <source>Mercurial Revision</source> + <translation type="unfinished">Revisión de Mercurial</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Revisión</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="29"/> + <source>Select to specify a revision by number</source> + <translation type="unfinished">Seleccionar para especificar una revisión por número</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="32"/> + <source>Number</source> + <translation type="unfinished">Número</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="42"/> + <source>Enter a revision number</source> + <translation type="unfinished">Introduzca un número de revisión</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="71"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished">Seleccionar para especificar una revisión por changeset id</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="74"/> + <source>Id:</source> + <translation type="unfinished">Id:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="84"/> + <source>Enter a changeset id</source> + <translation type="unfinished">Introduzca un changeset id</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="91"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished">Seleccionar para especificar una revisión por tag</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="94"/> + <source>Tag:</source> + <translation type="unfinished">Tag:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="110"/> + <source>Enter a tag name</source> + <translation type="unfinished">Introduzca un nombre de tag</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="120"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="123"/> + <source>Branch:</source> + <translation type="unfinished">Branch:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="139"/> + <source>Enter a branch name</source> + <translation type="unfinished">Introducir un nombre de branch</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished">Seleccionar para no especificar una revisión específica</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="152"/> + <source>No revision selected</source> + <translation type="unfinished">No hay seleccionada una revisión</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="165"/> + <source>Commit data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="171"/> + <source>Commit message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> + <source>Enter the commit message or leave empty to use the default one</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="190"/> + <source>Commit Date:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="197"/> + <source>Enter optional date for the commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="210"/> + <source>Commit User:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="217"/> + <source>Enter optional user for the commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="229"/> + <source>Select to merge with parent of the project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="232"/> + <source>Merge with current parent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py" line="75"/> + <source>Backed out changeset <{0}>.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgBundleDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="14"/> @@ -15400,7 +15543,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> @@ -15435,7 +15578,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> @@ -15525,7 +15668,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> @@ -15599,6 +15742,21 @@ <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> + <source>Back out changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Back out changes of an earlier changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -19222,12 +19380,12 @@ <translation>Introduzca el número de mensajes de commit a recordar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="143"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> <source>Edit the mercurial config file</source> <translation>Editar el archivo de configuración de mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> <source>Edit config file</source> <translation>Editar archivo de configuración</translation> </message> @@ -19246,6 +19404,21 @@ <source>Use Log Browser for incoming / outgoing log</source> <translation>Utilizar el Navegador de Registros para mensajes de registro entrantes / salientes</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="143"/> + <source>Pull</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="149"/> + <source>Select to update the working directory to new tip</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="152"/> + <source>Update after pulling</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -41171,17 +41344,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1388"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1391"/> <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="1392"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1395"/> <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="1399"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1402"/> <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> @@ -41192,31 +41365,31 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1382"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1385"/> <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="1384"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1387"/> <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="1396"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1399"/> <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="1021"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1022"/> <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="1033"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1034"/> <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> @@ -41225,7 +41398,7 @@ <tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1054"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1055"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric5_fr.ts Sun May 02 09:55:49 2010 +0000 +++ b/i18n/eric5_fr.ts Sun May 02 15:11:44 2010 +0000 @@ -14523,230 +14523,240 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="164"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="165"/> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="167"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="168"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="169"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="170"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="196"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="196"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="223"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="238"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="239"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="280"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="377"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="378"/> <source>Commiting changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="423"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="424"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="532"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="589"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="590"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="698"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="728"/> <source>Reverting changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="768"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="769"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="968"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="969"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1138"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1231"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1231"/> <source>Select number of entries to show.</source> <translation type="unfinished">Sélectionner plusieurs entrées à afficher.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1304"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1326"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1329"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1435"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1438"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1471"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1533"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1536"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1557"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1583"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1606"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1819"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1494"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1740"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1833"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1859"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1886"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1795"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1654"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1654"/> <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="1906"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1701"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> + <source>Backing out changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1947"/> + <source>No revision given. Aborting...</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -14837,6 +14847,139 @@ </message> </context> <context> + <name>HgBackoutDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="14"/> + <source>Mercurial Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Révision</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="29"/> + <source>Select to specify a revision by number</source> + <translation type="unfinished">Sélectionner pour spécifier une révision par son numéro</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="32"/> + <source>Number</source> + <translation type="unfinished">Numéro</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="42"/> + <source>Enter a revision number</source> + <translation type="unfinished">Entrer un numéro de révision</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="71"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="74"/> + <source>Id:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="84"/> + <source>Enter a changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="91"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="94"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="110"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="120"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="123"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="139"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="152"/> + <source>No revision selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="165"/> + <source>Commit data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="171"/> + <source>Commit message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> + <source>Enter the commit message or leave empty to use the default one</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="190"/> + <source>Commit Date:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="197"/> + <source>Enter optional date for the commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="210"/> + <source>Commit User:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="217"/> + <source>Enter optional user for the commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="229"/> + <source>Select to merge with parent of the project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="232"/> + <source>Merge with current parent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py" line="75"/> + <source>Backed out changeset <{0}>.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgBundleDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="14"/> @@ -16694,7 +16837,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> @@ -16744,7 +16887,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> @@ -16834,7 +16977,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> @@ -16908,6 +17051,21 @@ <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> + <source>Back out changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Back out changes of an earlier changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -20745,15 +20903,30 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="143"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> <source>Edit the mercurial config file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> <source>Edit config file</source> <translation type="unfinished">Edition du fichier de config</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="143"/> + <source>Pull</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="149"/> + <source>Select to update the working directory to new tip</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="152"/> + <source>Update after pulling</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -45363,30 +45536,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1022"/> <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="1388"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1391"/> <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="1392"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1395"/> <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="1033"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1034"/> <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="1054"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1055"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -45397,23 +45570,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1382"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1385"/> <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="1384"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1387"/> <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="1396"/> - <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="1399"/> + <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="1402"/> <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>
--- a/i18n/eric5_it.ts Sun May 02 09:55:49 2010 +0000 +++ b/i18n/eric5_it.ts Sun May 02 15:11:44 2010 +0000 @@ -14188,230 +14188,240 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="164"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="165"/> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="167"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="168"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="169"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="170"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="196"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="196"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="223"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="238"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="239"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="280"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="377"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="378"/> <source>Commiting changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="423"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="424"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="532"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="589"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="590"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="698"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="728"/> <source>Reverting changes</source> <translation type="unfinished">Annullamento modifiche</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="768"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="769"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="968"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="969"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1138"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1231"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1231"/> <source>Select number of entries to show.</source> <translation type="unfinished">Mostra il numero di elementi da mostrare.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1304"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1326"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1329"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1435"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1438"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1471"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1533"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1536"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1557"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1583"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1606"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1819"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1494"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1740"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1833"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1859"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1886"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1795"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1654"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1654"/> <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="1906"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1701"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> + <source>Backing out changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1947"/> + <source>No revision given. Aborting...</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -14502,6 +14512,139 @@ </message> </context> <context> + <name>HgBackoutDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="14"/> + <source>Mercurial Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Revisione</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="29"/> + <source>Select to specify a revision by number</source> + <translation type="unfinished">Seleziona per specificare una revisione con un numero</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="32"/> + <source>Number</source> + <translation type="unfinished">Numero</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="42"/> + <source>Enter a revision number</source> + <translation type="unfinished">Inserisci un numero di revisione</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="71"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="74"/> + <source>Id:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="84"/> + <source>Enter a changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="91"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="94"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="110"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="120"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="123"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="139"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="152"/> + <source>No revision selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="165"/> + <source>Commit data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="171"/> + <source>Commit message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> + <source>Enter the commit message or leave empty to use the default one</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="190"/> + <source>Commit Date:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="197"/> + <source>Enter optional date for the commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="210"/> + <source>Commit User:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="217"/> + <source>Enter optional user for the commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="229"/> + <source>Select to merge with parent of the project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="232"/> + <source>Merge with current parent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py" line="75"/> + <source>Backed out changeset <{0}>.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgBundleDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="14"/> @@ -16360,7 +16503,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> @@ -16410,7 +16553,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> @@ -16500,7 +16643,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> @@ -16574,6 +16717,21 @@ <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> + <source>Back out changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Back out changes of an earlier changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -20415,15 +20573,30 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="143"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> <source>Edit the mercurial config file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> <source>Edit config file</source> <translation type="unfinished">Modifica file di configurazione</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="143"/> + <source>Pull</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="149"/> + <source>Select to update the working directory to new tip</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="152"/> + <source>Update after pulling</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -44254,30 +44427,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1022"/> <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="1388"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1391"/> <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="1392"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1395"/> <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="1033"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1034"/> <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="1054"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1055"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -44288,23 +44461,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1382"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1385"/> <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="1384"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1387"/> <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="1396"/> - <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="1399"/> + <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="1402"/> <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>
--- a/i18n/eric5_ru.ts Sun May 02 09:55:49 2010 +0000 +++ b/i18n/eric5_ru.ts Sun May 02 15:11:44 2010 +0000 @@ -13770,230 +13770,240 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="164"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="165"/> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="167"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="168"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="169"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="170"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="196"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="196"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="223"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="238"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="239"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="280"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="377"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="378"/> <source>Commiting changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="423"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="424"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="532"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="589"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="590"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="768"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="769"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1138"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1231"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1231"/> <source>Select number of entries to show.</source> <translation type="unfinished">Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1304"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1326"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1329"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1435"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1438"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="698"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="728"/> <source>Reverting changes</source> <translation type="unfinished">Отменяю изменения</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="968"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="969"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1471"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1533"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1536"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1557"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1583"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1606"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1819"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1494"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1740"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1833"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1859"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1886"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1795"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1654"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1654"/> <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="1906"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1701"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> + <source>Backing out changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1947"/> + <source>No revision given. Aborting...</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -14084,6 +14094,139 @@ </message> </context> <context> + <name>HgBackoutDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="14"/> + <source>Mercurial Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Версия (ревизия)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="29"/> + <source>Select to specify a revision by number</source> + <translation type="unfinished">Задать ревизию порядковым номером</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="32"/> + <source>Number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="42"/> + <source>Enter a revision number</source> + <translation type="unfinished">Задайте номер ревизии</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="71"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="74"/> + <source>Id:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="84"/> + <source>Enter a changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="91"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="94"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="110"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="120"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="123"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="139"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="152"/> + <source>No revision selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="165"/> + <source>Commit data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="171"/> + <source>Commit message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> + <source>Enter the commit message or leave empty to use the default one</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="190"/> + <source>Commit Date:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="197"/> + <source>Enter optional date for the commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="210"/> + <source>Commit User:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="217"/> + <source>Enter optional user for the commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="229"/> + <source>Select to merge with parent of the project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="232"/> + <source>Merge with current parent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py" line="75"/> + <source>Backed out changeset <{0}>.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgBundleDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="14"/> @@ -15948,7 +16091,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> @@ -15998,7 +16141,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> @@ -16088,7 +16231,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> @@ -16162,6 +16305,21 @@ <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> + <source>Back out changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Back out changes of an earlier changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -19987,12 +20145,12 @@ <translation type="unfinished">Задайте количество комментариев к фиксациям, которое необходимо помнить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="143"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> <source>Edit the mercurial config file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> <source>Edit config file</source> <translation type="unfinished">Править файл конфигурации</translation> </message> @@ -20011,6 +20169,21 @@ <source>Use Log Browser for incoming / outgoing log</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="143"/> + <source>Pull</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="149"/> + <source>Select to update the working directory to new tip</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="152"/> + <source>Update after pulling</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -42721,17 +42894,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1388"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1391"/> <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="1392"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1395"/> <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="1399"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1402"/> <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> @@ -42739,36 +42912,36 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1382"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1385"/> <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="1384"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1387"/> <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="1396"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1399"/> <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="1021"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1022"/> <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="1033"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1034"/> <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="1054"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1055"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric5_tr.ts Sun May 02 09:55:49 2010 +0000 +++ b/i18n/eric5_tr.ts Sun May 02 15:11:44 2010 +0000 @@ -14455,230 +14455,240 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="164"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="165"/> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="167"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="168"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="169"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="170"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="196"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="196"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="223"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="238"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="239"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="280"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="377"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="378"/> <source>Commiting changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="423"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="424"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="532"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="589"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="590"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="698"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="728"/> <source>Reverting changes</source> <translation type="unfinished">Değişiklikler eski haline alınıyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="768"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="769"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="968"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="969"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1138"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1231"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1231"/> <source>Select number of entries to show.</source> <translation type="unfinished">gösterilecek giriş miktarını seç.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1304"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1326"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1329"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1435"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1438"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1471"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1533"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1536"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1557"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1583"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1606"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1819"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1494"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1740"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1833"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1859"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1886"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1795"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1654"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1654"/> <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="1906"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1701"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> + <source>Backing out changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1947"/> + <source>No revision given. Aborting...</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -14769,6 +14779,139 @@ </message> </context> <context> + <name>HgBackoutDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="14"/> + <source>Mercurial Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Gözden Geçirme</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="29"/> + <source>Select to specify a revision by number</source> + <translation type="unfinished">Gözden geçirme numarasının açıkça belirtmeyi seç</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="32"/> + <source>Number</source> + <translation type="unfinished">Numara</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="42"/> + <source>Enter a revision number</source> + <translation type="unfinished">Gözden geçirme numarası gir</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="71"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="74"/> + <source>Id:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="84"/> + <source>Enter a changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="91"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="94"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="110"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="120"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="123"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="139"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="152"/> + <source>No revision selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="165"/> + <source>Commit data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="171"/> + <source>Commit message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> + <source>Enter the commit message or leave empty to use the default one</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="190"/> + <source>Commit Date:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="197"/> + <source>Enter optional date for the commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="210"/> + <source>Commit User:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="217"/> + <source>Enter optional user for the commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="229"/> + <source>Select to merge with parent of the project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="232"/> + <source>Merge with current parent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py" line="75"/> + <source>Backed out changeset <{0}>.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgBundleDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="14"/> @@ -16589,7 +16732,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> @@ -16639,7 +16782,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> @@ -16729,7 +16872,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> @@ -16803,6 +16946,21 @@ <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> + <source>Back out changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Back out changes of an earlier changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -20642,15 +20800,30 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="143"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> <source>Edit the mercurial config file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> <source>Edit config file</source> <translation type="unfinished">Ayar dosyasını düzenle</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="143"/> + <source>Pull</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="149"/> + <source>Select to update the working directory to new tip</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="152"/> + <source>Update after pulling</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -44464,30 +44637,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1022"/> <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="1388"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1391"/> <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="1392"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1395"/> <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="1033"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1034"/> <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="1054"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1055"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -44498,23 +44671,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1382"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1385"/> <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="1384"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1387"/> <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="1396"/> - <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="1399"/> + <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="1402"/> <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>
--- a/i18n/eric5_zh_CN.GB2312.ts Sun May 02 09:55:49 2010 +0000 +++ b/i18n/eric5_zh_CN.GB2312.ts Sun May 02 15:11:44 2010 +0000 @@ -14495,230 +14495,240 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="164"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="165"/> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="167"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="168"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="169"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="170"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="196"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="196"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="223"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="238"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="239"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="280"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="377"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="378"/> <source>Commiting changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="423"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="424"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="532"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="589"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="590"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="698"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="728"/> <source>Reverting changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="768"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="769"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="968"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="969"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1138"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1231"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1231"/> <source>Select number of entries to show.</source> <translation type="unfinished">选择要显示的条目数。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1304"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1326"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1329"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1435"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1438"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1471"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1533"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1536"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1557"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1583"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1606"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1819"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1494"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1740"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1833"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1859"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1886"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1795"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1654"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1654"/> <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="1906"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1701"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> + <source>Backing out changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1947"/> + <source>No revision given. Aborting...</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -14809,6 +14819,139 @@ </message> </context> <context> + <name>HgBackoutDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="14"/> + <source>Mercurial Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">修订</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="29"/> + <source>Select to specify a revision by number</source> + <translation type="unfinished">选择通过号码指定一个修订</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="32"/> + <source>Number</source> + <translation type="unfinished">号码</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="42"/> + <source>Enter a revision number</source> + <translation type="unfinished">输入一个修订号</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="71"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="74"/> + <source>Id:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="84"/> + <source>Enter a changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="91"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="94"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="110"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="120"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="123"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="139"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="152"/> + <source>No revision selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="165"/> + <source>Commit data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="171"/> + <source>Commit message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> + <source>Enter the commit message or leave empty to use the default one</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="190"/> + <source>Commit Date:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="197"/> + <source>Enter optional date for the commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="210"/> + <source>Commit User:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="217"/> + <source>Enter optional user for the commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="229"/> + <source>Select to merge with parent of the project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="232"/> + <source>Merge with current parent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py" line="75"/> + <source>Backed out changeset <{0}>.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgBundleDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="14"/> @@ -16666,7 +16809,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> @@ -16716,7 +16859,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> @@ -16806,7 +16949,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> @@ -16880,6 +17023,21 @@ <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> + <source>Back out changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Back out changes of an earlier changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -20722,15 +20880,30 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="143"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> <source>Edit the mercurial config file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> <source>Edit config file</source> <translation type="unfinished">编辑配置文件</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="143"/> + <source>Pull</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="149"/> + <source>Select to update the working directory to new tip</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="152"/> + <source>Update after pulling</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -45334,30 +45507,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1022"/> <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="1388"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1391"/> <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="1392"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1395"/> <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="1033"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1034"/> <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="1054"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1055"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -45368,23 +45541,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1382"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1385"/> <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="1384"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1387"/> <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="1396"/> - <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="1399"/> + <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="1402"/> <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>