Mercurial Repositories > eric / changeset
changeset
Added changegroup related actions to the Mercurial plug-in.
Sat, 24 Apr 2010 17:32:07 +0000
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 24 Apr 2010 17:32:07 +0000
- changeset 199
- 675623ee5d7d
- parent 198
- 7ab8e126f404
- child 200
- 6c3f5faf7775
Added changegroup related actions to the Mercurial plug-in.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.py Sat Apr 24 17:32:07 2010 +0000 @@ -0,0 +1,45 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2010 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter the data for a bundle operation. +""" + +from PyQt4.QtGui import QDialog + +from .Ui_HgBundleDialog import Ui_HgBundleDialog + +class HgBundleDialog(QDialog, Ui_HgBundleDialog): + """ + Class implementing a dialog to enter the data for a bundle operation. + """ + def __init__(self, parent = None): + """ + Constructor + """ + QDialog.__init__(self, parent) + self.setupUi(self) + + self.compressionCombo.addItems(["", "bzip2", "gzip", "none"]) + + def getParameters(self): + """ + Public method to retrieve the bundle data. + + @return tuple naming the revision, the compression type and a flag indicating + to bundle all changesets (string, string, boolean) + """ + if self.numberButton.isChecked(): + rev = str(self.numberSpinBox.value()) + elif self.idButton.isChecked(): + rev = self.idEdit.text() + elif self.tagButton.isChecked(): + rev = self.tagCombo.currentText() + elif self.branchButton.isChecked(): + rev = self.branchCombo.currentText() + else: + rev = "" + + return rev, self.compressionCombo.currentText(), self.allCheckBox.isChecked()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui Sat Apr 24 17:32:07 2010 +0000 @@ -0,0 +1,292 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>HgBundleDialog</class> + <widget class="QDialog" name="HgBundleDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>372</width> + <height>276</height> + </rect> + </property> + <property name="windowTitle"> + <string>Mercurial Bundle</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Revision</string> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QRadioButton" name="numberButton"> + <property name="toolTip"> + <string>Select to specify a revision by number</string> + </property> + <property name="text"> + <string>Number</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QSpinBox" name="numberSpinBox"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter a revision number</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight</set> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>999999999</number> + </property> + </widget> + </item> + <item row="0" column="2"> + <spacer name="spacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>158</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="0"> + <widget class="QRadioButton" name="idButton"> + <property name="toolTip"> + <string>Select to specify a revision by changeset id</string> + </property> + <property name="text"> + <string>Id:</string> + </property> + </widget> + </item> + <item row="1" column="1" colspan="2"> + <widget class="QLineEdit" name="idEdit"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter a changeset id</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QRadioButton" name="tagButton"> + <property name="toolTip"> + <string>Select to specify a revision by a tag</string> + </property> + <property name="text"> + <string>Tag:</string> + </property> + </widget> + </item> + <item row="2" column="1" colspan="2"> + <widget class="QComboBox" name="tagCombo"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter a tag name</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QRadioButton" name="branchButton"> + <property name="toolTip"> + <string>Select to specify a revision by a branch</string> + </property> + <property name="text"> + <string>Branch:</string> + </property> + </widget> + </item> + <item row="3" column="1" colspan="2"> + <widget class="QComboBox" name="branchCombo"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter a branch name</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="4" column="0" colspan="3"> + <widget class="QRadioButton" name="noneButton"> + <property name="toolTip"> + <string>Select to not specify a specific revision</string> + </property> + <property name="text"> + <string>No revision selected</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QComboBox" name="compressionCombo"> + <property name="toolTip"> + <string>Select the compression type (empty for default)</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="allCheckBox"> + <property name="toolTip"> + <string>Select to bundle all changesets</string> + </property> + <property name="text"> + <string>Bundle all changesets</string> + </property> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> + <tabstops> + <tabstop>numberButton</tabstop> + <tabstop>numberSpinBox</tabstop> + <tabstop>idButton</tabstop> + <tabstop>idEdit</tabstop> + <tabstop>tagButton</tabstop> + <tabstop>tagCombo</tabstop> + <tabstop>branchButton</tabstop> + <tabstop>branchCombo</tabstop> + <tabstop>noneButton</tabstop> + <tabstop>compressionCombo</tabstop> + <tabstop>allCheckBox</tabstop> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>HgBundleDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>257</x> + <y>246</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>229</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>HgBundleDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>325</x> + <y>246</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>229</y> + </hint> + </hints> + </connection> + <connection> + <sender>numberButton</sender> + <signal>toggled(bool)</signal> + <receiver>numberSpinBox</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>48</x> + <y>42</y> + </hint> + <hint type="destinationlabel"> + <x>113</x> + <y>43</y> + </hint> + </hints> + </connection> + <connection> + <sender>idButton</sender> + <signal>toggled(bool)</signal> + <receiver>idEdit</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>38</x> + <y>76</y> + </hint> + <hint type="destinationlabel"> + <x>125</x> + <y>75</y> + </hint> + </hints> + </connection> + <connection> + <sender>tagButton</sender> + <signal>toggled(bool)</signal> + <receiver>tagCombo</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>52</x> + <y>104</y> + </hint> + <hint type="destinationlabel"> + <x>124</x> + <y>99</y> + </hint> + </hints> + </connection> + <connection> + <sender>branchButton</sender> + <signal>toggled(bool)</signal> + <receiver>branchCombo</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>71</x> + <y>127</y> + </hint> + <hint type="destinationlabel"> + <x>123</x> + <y>130</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Sat Apr 24 13:56:43 2010 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Sat Apr 24 17:32:07 2010 +0000 @@ -567,6 +567,34 @@ )) self.connect(self.hgCreateIgnoreAct, SIGNAL('triggered()'), self.__hgCreateIgnore) self.actions.append(self.hgCreateIgnoreAct) + + self.hgBundleAct = E5Action(self.trUtf8('Create changegroup'), + self.trUtf8('Create changegroup...'), + 0, 0, self, 'mercurial_bundle') + self.hgBundleAct.setStatusTip(self.trUtf8( + 'Create changegroup file collecting changesets' + )) + self.hgBundleAct.setWhatsThis(self.trUtf8( + """<b>Create changegroup</b>""" + """<p>This creates a changegroup file collecting selected changesets""" + """ (hg bundle).</p>""" + )) + self.connect(self.hgBundleAct, SIGNAL('triggered()'), self.__hgBundle) + self.actions.append(self.hgBundleAct) + + self.hgUnbundleAct = E5Action(self.trUtf8('Apply changegroups'), + self.trUtf8('Apply changegroups...'), + 0, 0, self, 'mercurial_unbundle') + self.hgUnbundleAct.setStatusTip(self.trUtf8( + 'Apply one or several changegroup files' + )) + self.hgUnbundleAct.setWhatsThis(self.trUtf8( + """<b>Apply changegroups</b>""" + """<p>This applies one or several changegroup files generated by""" + """ the 'Create changegroup' action (hg unbundle).</p>""" + )) + self.connect(self.hgUnbundleAct, SIGNAL('triggered()'), self.__hgUnbundle) + self.actions.append(self.hgUnbundleAct) def initMenu(self, menu): """ @@ -592,6 +620,10 @@ adminMenu.addSeparator() adminMenu.addAction(self.hgVerifyAct) + bundleMenu = QMenu(self.trUtf8("Changegroup Management"), menu) + bundleMenu.addAction(self.hgBundleAct) + bundleMenu.addAction(self.hgUnbundleAct) + act = menu.addAction( UI.PixmapCache.getIcon( os.path.join("VcsPlugins", "vcsMercurial", "icons", "mercurial.png")), @@ -609,6 +641,8 @@ menu.addAction(self.hgOutgoingAct) menu.addAction(self.hgPushAct) menu.addSeparator() + menu.addMenu(bundleMenu) + menu.addSeparator() menu.addAction(self.vcsNewAct) menu.addAction(self.vcsExportAct) menu.addSeparator() @@ -781,3 +815,15 @@ Protected slot used to create a .hgignore file for the project. """ self.vcs.hgCreateIgnoreFile(self.project.ppath, autoAdd = True) + + def __hgBundle(self): + """ + Protected slot used to create a changegroup file. + """ + self.vcs.hgBundle(self.project.ppath) + + def __hgUnbundle(self): + """ + Protected slot used to apply changegroup files. + """ + self.vcs.hgUnbundle(self.project.ppath)
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Sat Apr 24 13:56:43 2010 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Sat Apr 24 17:32:07 2010 +0000 @@ -11,8 +11,8 @@ import shutil import urllib.request, urllib.parse, urllib.error -from PyQt4.QtCore import QProcess, SIGNAL -from PyQt4.QtGui import QMessageBox, QApplication, QDialog, QInputDialog +from PyQt4.QtCore import QProcess, SIGNAL, QFileInfo +from PyQt4.QtGui import QMessageBox, QApplication, QDialog, QInputDialog, QFileDialog from E5Gui.E5Application import e5App @@ -38,6 +38,7 @@ from .HgTagDialog import HgTagDialog from .HgTagBranchListDialog import HgTagBranchListDialog from .HgCommandDialog import HgCommandDialog +from .HgBundleDialog import HgBundleDialog from .ProjectBrowserHelper import HgProjectBrowserHelper @@ -1604,6 +1605,112 @@ return status + def hgBundle(self, name): + """ + Public method to create a changegroup file. + + @param name file/directory name (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 + + dlg = HgBundleDialog() + if dlg.exec_() == QDialog.Accepted: + rev, compression, all = dlg.getParameters() + + fname, selectedFilter = QFileDialog.getSaveFileNameAndFilter(\ + None, + self.trUtf8("Mercurial Bundle"), + None, + self.trUtf8("Mercurial Bundle Files (*.bundle)"), + None, + QFileDialog.Options(QFileDialog.DontConfirmOverwrite)) + + if not fname: + return # user aborted + + ext = QFileInfo(fname).suffix() + if not ext: + ex = selectedFilter.split("(*")[1].split(")")[0] + if ex: + fname += ex + if QFileInfo(fname).exists(): + res = QMessageBox.warning(None, + self.trUtf8("Mercurial Bundle"), + self.trUtf8("<p>The Mercurial bundle file <b>{0}</b> " + "already exists.</p>") + .format(fname), + QMessageBox.StandardButtons(\ + QMessageBox.Abort | \ + QMessageBox.Save), + QMessageBox.Abort) + if res != QMessageBox.Save: + return + fname = Utilities.toNativeSeparators(fname) + + args = [] + args.append('bundle') + if all: + args.append("--all") + if rev: + args.append("--rev") + args.append(rev) + if compression: + args.append("--type") + args.append(compression) + args.append(fname) + + dia = HgDialog(self.trUtf8('Recovering from interrupted transaction')) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + + def hgUnbundle(self, name): + """ + Public method to apply changegroup files. + + @param name file/directory name (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 + + files = QFileDialog.getOpenFileNames(\ + None, + self.trUtf8("Mercurial Unbundle"), + "", + self.trUtf8("Mercurial Bundle Files (*.bundle);;All Files (*)")) + if files: + update = QMessageBox.question(None, + self.trUtf8("Mercurial Unbundle"), + self.trUtf8("""Shall the working directory be updated?"""), + QMessageBox.StandardButtons(\ + QMessageBox.No | \ + QMessageBox.Yes), + QMessageBox.Yes) == QMessageBox.Yes + + args = [] + args.append('unbundle') + if update: + args.append("--update") + args.extend(files) + + dia = HgDialog(self.trUtf8('Recovering from interrupted transaction')) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + ############################################################################ ## Methods to get the helper objects are below. ############################################################################
--- a/changelog Sat Apr 24 13:56:43 2010 +0000 +++ b/changelog Sat Apr 24 17:32:07 2010 +0000 @@ -2,7 +2,8 @@ ---------- Version 5.0-snapshot-2010mmdd: - bug fixes -- added administration actions to the Mercurial plugin +- added administration actions to the Mercurial plug-in +- added changegroup related actions to the Mercurial plug-in Version 5.0-snapshot-20100418: - bug fixes
--- a/eric5.e4p Sat Apr 24 13:56:43 2010 +0000 +++ b/eric5.e4p Sat Apr 24 17:32:07 2010 +0000 @@ -796,6 +796,7 @@ <Source>Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.py</Source> </Sources> <Forms> <Form>PyUnit/UnittestDialog.ui</Form> @@ -1018,6 +1019,7 @@ <Form>Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui</Form> </Forms> <Translations> <Translation>i18n/eric5_cs.qm</Translation>
--- a/i18n/eric5_cs.ts Sat Apr 24 13:56:43 2010 +0000 +++ b/i18n/eric5_cs.ts Sat Apr 24 17:32:07 2010 +0000 @@ -14149,82 +14149,82 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="157"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="158"/> <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="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="161"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="163"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="188"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="189"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="188"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="189"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="215"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="216"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="231"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="232"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="371"/> <source>Commiting changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="412"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="459"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="460"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="520"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="577"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="578"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="685"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="686"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="716"/> <source>Reverting changes</source> <translation type="unfinished">Navrácení změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="756"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="757"/> <source>Merging</source> <translation type="unfinished"></translation> </message> @@ -14294,10 +14294,40 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1644"/> + <source>Mercurial Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1627"/> + <source>Mercurial Bundle Files (*.bundle)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1644"/> + <source><p>The Mercurial bundle file <b>{0}</b> already exists.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695"/> + <source>Mercurial Unbundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1689"/> + <source>Mercurial Bundle Files (*.bundle);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695"/> + <source>Shall the working directory be updated?</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -14388,6 +14418,104 @@ </message> </context> <context> + <name>HgBundleDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="14"/> + <source>Mercurial Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Revize</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.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/HgBundleDialog.ui" line="32"/> + <source>Number</source> + <translation type="unfinished">Číslo</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="42"/> + <source>Enter a revision number</source> + <translation type="unfinished">Zadejte číslo revize</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="71"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="74"/> + <source>Id:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="84"/> + <source>Enter a changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="91"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="94"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="104"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="114"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="117"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="127"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="137"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="140"/> + <source>No revision selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="153"/> + <source>Select the compression type (empty for default)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="160"/> + <source>Select to bundle all changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="163"/> + <source>Bundle all changesets</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="14"/> @@ -14740,12 +14868,12 @@ <translation type="unfinished">Vybrat pole pro filtrování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="800"/> <source>Revision</source> <translation type="unfinished">Revize</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="797"/> <source>Author</source> <translation type="unfinished">Autor</translation> </message> @@ -14905,27 +15033,27 @@ <translation type="unfinished">Změněno</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="463"/> <source>Process Generation Error</source> <translation type="unfinished">Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="463"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="314"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="316"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="319"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -15246,7 +15374,7 @@ <translation type="unfinished">Vyberte adresář repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py" line="82"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py" line="71"/> <source>Select Project Directory</source> <translation type="unfinished">Vyberte adresář projektu</translation> </message> @@ -15295,97 +15423,97 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="450"/> <source>Version Control</source> <translation type="unfinished">Kontrola verzí</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="461"/> + <source>Commit changes to repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="466"/> + <source>Add to repository</source> + <translation type="unfinished">Přidat do repozitáře</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="469"/> + <source>Remove from repository (and disk)</source> + <translation type="unfinished">Odebrat z repozitáře (a z disku)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="391"/> + <source>Copy in repository</source> + <translation type="unfinished">Kopírovat v repozitáři</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="393"/> + <source>Move in repository</source> + <translation type="unfinished">Přesunout v repozitáři</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="396"/> + <source>Show log</source> + <translation type="unfinished">Zobrazit log</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="399"/> + <source>Show limited log</source> + <translation type="unfinished">Zobrazit limitovaný log</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402"/> + <source>Show log browser</source> + <translation type="unfinished">Zobrazit log prohlížeč</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="474"/> + <source>Show status</source> + <translation type="unfinished">Zobrazit status</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> + <source>Show difference</source> + <translation type="unfinished">Zobrazit odlišnosti</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481"/> - <source>Commit changes to repository...</source> - <translation type="unfinished"></translation> + <source>Show difference (extended)</source> + <translation type="unfinished">Zobrazit odlišnosti (rozšířeně)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="233"/> + <source>Show annotated file</source> + <translation type="unfinished">Zobrazit komentované soubory</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="486"/> - <source>Add to repository</source> - <translation type="unfinished">Přidat do repozitáře</translation> + <source>Revert changes</source> + <translation type="unfinished">Vrátit změny</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="489"/> - <source>Remove from repository (and disk)</source> - <translation type="unfinished">Odebrat z repozitáře (a z disku)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="411"/> - <source>Copy in repository</source> - <translation type="unfinished">Kopírovat v repozitáři</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="413"/> - <source>Move in repository</source> - <translation type="unfinished">Přesunout v repozitáři</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="416"/> - <source>Show log</source> - <translation type="unfinished">Zobrazit log</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="419"/> - <source>Show limited log</source> - <translation type="unfinished">Zobrazit limitovaný log</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="422"/> - <source>Show log browser</source> - <translation type="unfinished">Zobrazit log prohlížeč</translation> + <source>Resolve conflict</source> + <translation type="unfinished">Vyřešit konflikty</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="492"/> + <source>Select all local file entries</source> + <translation type="unfinished">Vybrat všechny lokální soubory</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="494"/> - <source>Show status</source> - <translation type="unfinished">Zobrazit status</translation> + <source>Select all versioned file entries</source> + <translation type="unfinished">Vybrat všechny soubory ve správě verzí</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="496"/> + <source>Select all local directory entries</source> + <translation type="unfinished">Vybrat všechny lokální adresáře</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> - <source>Show difference</source> - <translation type="unfinished">Zobrazit odlišnosti</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="501"/> - <source>Show difference (extended)</source> - <translation type="unfinished">Zobrazit odlišnosti (rozšířeně)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="248"/> - <source>Show annotated file</source> - <translation type="unfinished">Zobrazit komentované soubory</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="506"/> - <source>Revert changes</source> - <translation type="unfinished">Vrátit změny</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="509"/> - <source>Resolve conflict</source> - <translation type="unfinished">Vyřešit konflikty</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="512"/> - <source>Select all local file entries</source> - <translation type="unfinished">Vybrat všechny lokální soubory</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="514"/> - <source>Select all versioned file entries</source> - <translation type="unfinished">Vybrat všechny soubory ve správě verzí</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="516"/> - <source>Select all local directory entries</source> - <translation type="unfinished">Vybrat všechny lokální adresáře</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="518"/> <source>Select all versioned directory entries</source> <translation type="unfinished">Vybrat všechny adresáře ve správě verzí</translation> </message> @@ -16078,7 +16206,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> @@ -16097,6 +16225,51 @@ <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Create changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <source>Create changegroup file collecting changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> + <source>Apply changegroups...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> + <source>Apply one or several changegroup files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> + <source>Changegroup Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> + <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/> + <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -16451,12 +16624,12 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="104"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="103"/> <source>Mercurial status checked successfully</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="114"/> <source>Could not start the Mercurial process.</source> <translation type="unfinished"></translation> </message> @@ -24558,7 +24731,7 @@ <translation>VCS Status</translation> </message> <message> - <location filename="Project/ProjectBrowserModel.py" line="614"/> + <location filename="Project/ProjectBrowserModel.py" line="599"/> <source>local</source> <translation>lokální</translation> </message>
--- a/i18n/eric5_de.ts Sat Apr 24 13:56:43 2010 +0000 +++ b/i18n/eric5_de.ts Sat Apr 24 17:32:07 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,82 +13206,82 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="157"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="158"/> <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="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="161"/> <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="162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="163"/> <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="188"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="189"/> <source>Create project repository</source> <translation>Projektrepository anlegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="188"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="189"/> <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="215"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="216"/> <source>Creating Mercurial repository</source> <translation>Lege Mercurial Repository an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="231"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="232"/> <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="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> <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="370"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="371"/> <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="411"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="412"/> <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="459"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="460"/> <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="519"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="520"/> <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="577"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="578"/> <source>Renaming {0}</source> <translation>Benenne {0} um</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="685"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="686"/> <source>Taging in the Mercurial repository</source> <translation>Marke im Mercurial Repository setzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="716"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="756"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="757"/> <source>Merging</source> <translation>Zusammenführen</translation> </message> @@ -13352,10 +13351,40 @@ <translation>Zeige Namen für entfernte Repositories</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1644"/> + <source>Mercurial Bundle</source> + <translation>Mercurial Bundle</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1627"/> + <source>Mercurial Bundle Files (*.bundle)</source> + <translation>Mercurial Bundle Dateien (*.bundle)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1644"/> + <source><p>The Mercurial bundle file <b>{0}</b> already exists.</p></source> + <translation><p>Die Mercurial Bundle Datei <b>{0}</b> existiert bereits.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695"/> + <source>Mercurial Unbundle</source> + <translation>Mercurial Unbundle</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1689"/> + <source>Mercurial Bundle Files (*.bundle);;All Files (*)</source> + <translation>Mercurial Bundle Dateien (*.bundle);;Alle Dateien (*)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695"/> + <source>Shall the working directory be updated?</source> + <translation>Soll das Arbeitsverzeichnis aktualisiert werden?</translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -13446,6 +13475,104 @@ </message> </context> <context> + <name>HgBundleDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="14"/> + <source>Mercurial Bundle</source> + <translation>Mercurial Bundle</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="23"/> + <source>Revision</source> + <translation>Revision</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.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/HgBundleDialog.ui" line="32"/> + <source>Number</source> + <translation>Nummer</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="42"/> + <source>Enter a revision number</source> + <translation>Gib eine Revisionsnummer ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.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/HgBundleDialog.ui" line="74"/> + <source>Id:</source> + <translation>Id:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="84"/> + <source>Enter a changeset id</source> + <translation>Gib die Änderungssatz ID ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.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/HgBundleDialog.ui" line="94"/> + <source>Tag:</source> + <translation>Marke:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="104"/> + <source>Enter a tag name</source> + <translation>Gib den Namen der Marke ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="114"/> + <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/HgBundleDialog.ui" line="117"/> + <source>Branch:</source> + <translation>Zweig:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="127"/> + <source>Enter a branch name</source> + <translation>Gib einen Zweignamen ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="137"/> + <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/HgBundleDialog.ui" line="140"/> + <source>No revision selected</source> + <translation>Keine Revision ausgewählt</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="153"/> + <source>Select the compression type (empty for default)</source> + <translation>Wähle den Kompressionstype (leer für Standard)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="160"/> + <source>Select to bundle all changesets</source> + <translation>Auswählen, um alle Änderungssätze zu packen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="163"/> + <source>Bundle all changesets</source> + <translation>Packe alle Änderungssätze</translation> + </message> +</context> +<context> <name>HgCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="14"/> @@ -13804,12 +13931,12 @@ <translation>Wähle das als Filter zu verwendende Feld</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="800"/> <source>Revision</source> <translation>Revision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="797"/> <source>Author</source> <translation>Autor</translation> </message> @@ -13969,27 +14096,27 @@ <translation>Modifiziert</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="463"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="463"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="314"/> <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/HgLogBrowserDialog.py" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="316"/> <source>Could not start the hg executable.</source> <translation>Das hg Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="319"/> <source>Mercurial Error</source> <translation>Mercurial Fehler</translation> </message> @@ -14317,7 +14444,7 @@ <translation>Wähle Repository-Verzeichnis</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py" line="82"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py" line="71"/> <source>Select Project Directory</source> <translation>Wähle Projektverzeichnis</translation> </message> @@ -14369,97 +14496,97 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="450"/> <source>Version Control</source> <translation>Versionskontrolle</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="461"/> + <source>Commit changes to repository...</source> + <translation>Änderungen einpflegen...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="466"/> + <source>Add to repository</source> + <translation>Zum Repository hinzufügen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="469"/> + <source>Remove from repository (and disk)</source> + <translation>Vom Repository (und der Platte) löschen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="391"/> + <source>Copy in repository</source> + <translation>Im Repository kopieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="393"/> + <source>Move in repository</source> + <translation>Im Repository verschieben</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="396"/> + <source>Show log</source> + <translation>Beschreibungen anzeigen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="399"/> + <source>Show limited log</source> + <translation>Beschreibungen limitiert anzeigen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402"/> + <source>Show log browser</source> + <translation>Zeige Log Browser</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="474"/> + <source>Show status</source> + <translation>Status anzeigen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> + <source>Show difference</source> + <translation>Unterschiede anzeigen</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481"/> - <source>Commit changes to repository...</source> - <translation>Änderungen einpflegen...</translation> + <source>Show difference (extended)</source> + <translation>Unterschiede anzeigen (erweitert)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="233"/> + <source>Show annotated file</source> + <translation>Zeige kommentierte Datei</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="486"/> - <source>Add to repository</source> - <translation>Zum Repository hinzufügen</translation> + <source>Revert changes</source> + <translation>Änderungen rückgängig</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="489"/> - <source>Remove from repository (and disk)</source> - <translation>Vom Repository (und der Platte) löschen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="411"/> - <source>Copy in repository</source> - <translation>Im Repository kopieren</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="413"/> - <source>Move in repository</source> - <translation>Im Repository verschieben</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="416"/> - <source>Show log</source> - <translation>Beschreibungen anzeigen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="419"/> - <source>Show limited log</source> - <translation>Beschreibungen limitiert anzeigen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="422"/> - <source>Show log browser</source> - <translation>Zeige Log Browser</translation> + <source>Resolve conflict</source> + <translation>Konflikt lösen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="492"/> + <source>Select all local file entries</source> + <translation>Alle lokalen Dateieinträge auswählen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="494"/> - <source>Show status</source> - <translation>Status anzeigen</translation> + <source>Select all versioned file entries</source> + <translation>Alle versionierten Dateieinträge auswählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="496"/> + <source>Select all local directory entries</source> + <translation>Alle lokalen Verzeichniseinträge auswählen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> - <source>Show difference</source> - <translation>Unterschiede anzeigen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="501"/> - <source>Show difference (extended)</source> - <translation>Unterschiede anzeigen (erweitert)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="248"/> - <source>Show annotated file</source> - <translation>Zeige kommentierte Datei</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="506"/> - <source>Revert changes</source> - <translation>Änderungen rückgängig</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="509"/> - <source>Resolve conflict</source> - <translation>Konflikt lösen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="512"/> - <source>Select all local file entries</source> - <translation>Alle lokalen Dateieinträge auswählen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="514"/> - <source>Select all versioned file entries</source> - <translation>Alle versionierten Dateieinträge auswählen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="516"/> - <source>Select all local directory entries</source> - <translation>Alle lokalen Verzeichniseinträge auswählen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="518"/> <source>Select all versioned directory entries</source> <translation>Alle versionierten Verzeichniseinträge auswählen</translation> </message> @@ -15152,7 +15279,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="579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/> <source>Repository Administration</source> <translation>Repository Administration</translation> </message> @@ -15171,6 +15298,51 @@ <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation><b>Erstelle .hgignore</b><p>Dies erstellt eine .hgignore Datei mit Standardwerten.</p></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Create changegroup</source> + <translation>Änderungsgruppe erzeugen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Create changegroup...</source> + <translation>Änderungsgruppe erzeugen...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <source>Create changegroup file collecting changesets</source> + <translation>Erzeuge eine Änderungsgruppendatei für Änderungssätze</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> + <source>Apply changegroups</source> + <translation>Änderungsgruppen anwenden</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> + <source>Apply changegroups...</source> + <translation>Änderungsgruppen anwenden...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> + <source>Apply one or several changegroup files</source> + <translation>Wende eine oder mehrere Änderungsgruppendateien an</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> + <source>Changegroup Management</source> + <translation>Verwaltung von Änderungsgruppen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> + <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> + <translation><b>Änderungsgruppe erzeugen</b><p>Dies erzeuge eine Änderungsgruppendatei für ausgewählte Änderungssätze (hg bundle).</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/> + <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> + <translation><b>Änderungsgruppen anwenden</b><p>Dies wendet eine oder mehrere mit 'Änderungsgruppe erzeugen' erstellte Änderungsgruppendateien an (hg unbundle).</p></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -15526,12 +15698,12 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="104"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="103"/> <source>Mercurial status checked successfully</source> <translation>Mercurial Status erfolgreich überprüft</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="114"/> <source>Could not start the Mercurial process.</source> <translation>Der Mercurial Prozess konnte nicht gestartet werden.</translation> </message> @@ -22817,7 +22989,7 @@ <translation>VCS Status</translation> </message> <message> - <location filename="Project/ProjectBrowserModel.py" line="614"/> + <location filename="Project/ProjectBrowserModel.py" line="599"/> <source>local</source> <translation>lokal</translation> </message>
--- a/i18n/eric5_es.ts Sat Apr 24 13:56:43 2010 +0000 +++ b/i18n/eric5_es.ts Sat Apr 24 17:32:07 2010 +0000 @@ -13206,155 +13206,185 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="157"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="158"/> <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="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="161"/> <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="162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="163"/> <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="188"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="189"/> <source>Create project repository</source> <translation>Crear repositorio del proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="188"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="189"/> <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="215"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="216"/> <source>Creating Mercurial repository</source> <translation>Creando repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="231"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="232"/> <source>Initial commit to Mercurial repository</source> <translation>Commit inicial al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> <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="370"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="371"/> <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="411"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="412"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizando con el repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="459"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="460"/> <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="519"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="520"/> <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="577"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="578"/> <source>Renaming {0}</source> <translation>Renombrando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="756"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="757"/> <source>Merging</source> <translation>Haciendo un merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1129"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1218"/> <source>Mercurial Log</source> <translation>Registro de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1218"/> <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="1293"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1289"/> <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="1318"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1314"/> <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="1427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1423"/> <source>Resolving files/directories</source> <translation>Resolviendo archivos/directorios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="685"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="686"/> <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="715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="716"/> <source>Reverting changes</source> <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="960"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1449"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1445"/> <source>Create Branch</source> <translation>Crear Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1449"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1445"/> <source>Enter branch name</source> <translation>Introducir nombre de branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1456"/> <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="1502"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1498"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1526"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1522"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1549"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1545"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1644"/> + <source>Mercurial Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1627"/> + <source>Mercurial Bundle Files (*.bundle)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1644"/> + <source><p>The Mercurial bundle file <b>{0}</b> already exists.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695"/> + <source>Mercurial Unbundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1689"/> + <source>Mercurial Bundle Files (*.bundle);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695"/> + <source>Shall the working directory be updated?</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -13445,6 +13475,104 @@ </message> </context> <context> + <name>HgBundleDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="14"/> + <source>Mercurial Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Revisión</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.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/HgBundleDialog.ui" line="32"/> + <source>Number</source> + <translation type="unfinished">Número</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.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/HgBundleDialog.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/HgBundleDialog.ui" line="74"/> + <source>Id:</source> + <translation type="unfinished">Id:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="84"/> + <source>Enter a changeset id</source> + <translation type="unfinished">Introduzca un changeset id</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.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/HgBundleDialog.ui" line="94"/> + <source>Tag:</source> + <translation type="unfinished">Tag:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="104"/> + <source>Enter a tag name</source> + <translation type="unfinished">Introduzca un nombre de tag</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="114"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="117"/> + <source>Branch:</source> + <translation type="unfinished">Branch:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="127"/> + <source>Enter a branch name</source> + <translation type="unfinished">Introducir un nombre de branch</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="137"/> + <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/HgBundleDialog.ui" line="140"/> + <source>No revision selected</source> + <translation type="unfinished">No hay seleccionada una revisión</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="153"/> + <source>Select the compression type (empty for default)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="160"/> + <source>Select to bundle all changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="163"/> + <source>Bundle all changesets</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="14"/> @@ -13803,12 +13931,12 @@ <translation>Seleccione el campo de filtrado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="800"/> <source>Revision</source> <translation>Revisión</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="797"/> <source>Author</source> <translation>Autor</translation> </message> @@ -13958,12 +14086,12 @@ <translation>Modificado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="463"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="463"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> @@ -13978,17 +14106,17 @@ <translation>Tags</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="314"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished">El proceso hg no terminó en un plazo de 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="316"/> <source>Could not start the hg executable.</source> <translation type="unfinished">No se ha podido iniciar el ejecutable de hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="319"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -14311,7 +14439,7 @@ <translation>Seleccionar Repositorio-Directorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py" line="82"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py" line="71"/> <source>Select Project Directory</source> <translation>Seleccionar Directorio del Proyecto</translation> </message> @@ -14368,97 +14496,97 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="450"/> <source>Version Control</source> <translation>Control de Versiones</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="461"/> + <source>Commit changes to repository...</source> + <translation>Hacer commit de los cambios al repositorio...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="466"/> + <source>Add to repository</source> + <translation>Añadir al repositorio</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="469"/> + <source>Remove from repository (and disk)</source> + <translation>Eliminar del repositorio (y del disco)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="391"/> + <source>Copy in repository</source> + <translation>Copiar en el repositorio</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="393"/> + <source>Move in repository</source> + <translation>Mover en el repositorio</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="396"/> + <source>Show log</source> + <translation>Mostrar log</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="399"/> + <source>Show limited log</source> + <translation>Mostrar log limitado</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402"/> + <source>Show log browser</source> + <translation>Mostrar navegador de log</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> + <source>Show difference</source> + <translation>Mostrar diferencia</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481"/> - <source>Commit changes to repository...</source> - <translation>Hacer commit de los cambios al repositorio...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="486"/> - <source>Add to repository</source> - <translation>Añadir al repositorio</translation> + <source>Show difference (extended)</source> + <translation>Mostrar diferencia (extendida)</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="489"/> - <source>Remove from repository (and disk)</source> - <translation>Eliminar del repositorio (y del disco)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="411"/> - <source>Copy in repository</source> - <translation>Copiar en el repositorio</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="413"/> - <source>Move in repository</source> - <translation>Mover en el repositorio</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="416"/> - <source>Show log</source> - <translation>Mostrar log</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="419"/> - <source>Show limited log</source> - <translation>Mostrar log limitado</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="422"/> - <source>Show log browser</source> - <translation>Mostrar navegador de log</translation> + <source>Resolve conflict</source> + <translation>Resolver conflicto</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="492"/> + <source>Select all local file entries</source> + <translation>Seleccionar todas las entradas de archivo locales</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="494"/> + <source>Select all versioned file entries</source> + <translation>Seleccionar todas las entradas de archivo versionadas</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="496"/> + <source>Select all local directory entries</source> + <translation>Seleccionar todas las entradas de directorio locales</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> - <source>Show difference</source> - <translation>Mostrar diferencia</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="501"/> - <source>Show difference (extended)</source> - <translation>Mostrar diferencia (extendida)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="509"/> - <source>Resolve conflict</source> - <translation>Resolver conflicto</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="512"/> - <source>Select all local file entries</source> - <translation>Seleccionar todas las entradas de archivo locales</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="514"/> - <source>Select all versioned file entries</source> - <translation>Seleccionar todas las entradas de archivo versionadas</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="516"/> - <source>Select all local directory entries</source> - <translation>Seleccionar todas las entradas de directorio locales</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="518"/> <source>Select all versioned directory entries</source> <translation>Seleccionar todas las entradas de directorio versionadas</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="494"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="474"/> <source>Show status</source> <translation>Mostrar estado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="233"/> <source>Show annotated file</source> <translation>Mostrar archivo anotado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="506"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="486"/> <source>Revert changes</source> <translation>Revertir cambios</translation> </message> @@ -15166,10 +15294,55 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Create changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <source>Create changegroup file collecting changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> + <source>Apply changegroups...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> + <source>Apply one or several changegroup files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> + <source>Changegroup Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> + <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/> + <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -15525,12 +15698,12 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="104"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="103"/> <source>Mercurial status checked successfully</source> <translation>El estado de Mercurial se ha chequeado con éxito</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="114"/> <source>Could not start the Mercurial process.</source> <translation>No se pudo ejecutar el proceso Mercurial.</translation> </message> @@ -22815,7 +22988,7 @@ <translation>Estatus de VCS</translation> </message> <message> - <location filename="Project/ProjectBrowserModel.py" line="614"/> + <location filename="Project/ProjectBrowserModel.py" line="599"/> <source>local</source> <translation>local</translation> </message> @@ -40702,17 +40875,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1380"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1376"/> <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="1384"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1380"/> <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="1391"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1387"/> <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> @@ -40723,31 +40896,31 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1374"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1370"/> <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="1376"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1372"/> <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="1388"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1384"/> <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="1013"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1009"/> <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="1025"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> <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> @@ -40756,7 +40929,7 @@ <tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1046"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1042"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric5_fr.ts Sat Apr 24 13:56:43 2010 +0000 +++ b/i18n/eric5_fr.ts Sat Apr 24 17:32:07 2010 +0000 @@ -14523,82 +14523,82 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="157"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="158"/> <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="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="161"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="163"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="188"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="189"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="188"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="189"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="215"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="216"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="231"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="232"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="371"/> <source>Commiting changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="412"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="459"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="460"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="520"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="577"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="578"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="685"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="686"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="716"/> <source>Reverting changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="756"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="757"/> <source>Merging</source> <translation type="unfinished"></translation> </message> @@ -14668,10 +14668,40 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1644"/> + <source>Mercurial Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1627"/> + <source>Mercurial Bundle Files (*.bundle)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1644"/> + <source><p>The Mercurial bundle file <b>{0}</b> already exists.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695"/> + <source>Mercurial Unbundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1689"/> + <source>Mercurial Bundle Files (*.bundle);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695"/> + <source>Shall the working directory be updated?</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -14762,6 +14792,104 @@ </message> </context> <context> + <name>HgBundleDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="14"/> + <source>Mercurial Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Révision</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.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/HgBundleDialog.ui" line="32"/> + <source>Number</source> + <translation type="unfinished">Numéro</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.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/HgBundleDialog.ui" line="71"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="74"/> + <source>Id:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="84"/> + <source>Enter a changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="91"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="94"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="104"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="114"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="117"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="127"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="137"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="140"/> + <source>No revision selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="153"/> + <source>Select the compression type (empty for default)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="160"/> + <source>Select to bundle all changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="163"/> + <source>Bundle all changesets</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="14"/> @@ -15116,12 +15244,12 @@ <translation type="unfinished">Sélectionner le champ à filtrer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="800"/> <source>Revision</source> <translation type="unfinished">Révision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="797"/> <source>Author</source> <translation type="unfinished">Auteur</translation> </message> @@ -15281,27 +15409,27 @@ <translation type="unfinished">Modifié</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="463"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="463"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="314"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="316"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="319"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -15626,7 +15754,7 @@ <translation type="unfinished">Sélection du répertoire référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py" line="82"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py" line="71"/> <source>Select Project Directory</source> <translation type="unfinished">Selection d'un répertoire projet</translation> </message> @@ -15677,97 +15805,97 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="450"/> <source>Version Control</source> <translation type="unfinished">Contrôle de version</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="461"/> + <source>Commit changes to repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="466"/> + <source>Add to repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="469"/> + <source>Remove from repository (and disk)</source> + <translation type="unfinished">Supprimer du référentiel (et du disque)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="391"/> + <source>Copy in repository</source> + <translation type="unfinished">Copier dans le référentiel</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="393"/> + <source>Move in repository</source> + <translation type="unfinished">Déplacer dans le référentiel</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="396"/> + <source>Show log</source> + <translation type="unfinished">Afficher le log</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="399"/> + <source>Show limited log</source> + <translation type="unfinished">Afficher un log limité</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402"/> + <source>Show log browser</source> + <translation type="unfinished">Afficher le navigateur de logs</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="474"/> + <source>Show status</source> + <translation type="unfinished">Afficher l'état (status)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> + <source>Show difference</source> + <translation type="unfinished">Afficher les différences</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481"/> - <source>Commit changes to repository...</source> - <translation type="unfinished"></translation> + <source>Show difference (extended)</source> + <translation type="unfinished">Afficher les différences (étendu)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="233"/> + <source>Show annotated file</source> + <translation type="unfinished">Afficher les fichiers annotés</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="486"/> - <source>Add to repository</source> - <translation type="unfinished"></translation> + <source>Revert changes</source> + <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="489"/> - <source>Remove from repository (and disk)</source> - <translation type="unfinished">Supprimer du référentiel (et du disque)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="411"/> - <source>Copy in repository</source> - <translation type="unfinished">Copier dans le référentiel</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="413"/> - <source>Move in repository</source> - <translation type="unfinished">Déplacer dans le référentiel</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="416"/> - <source>Show log</source> - <translation type="unfinished">Afficher le log</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="419"/> - <source>Show limited log</source> - <translation type="unfinished">Afficher un log limité</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="422"/> - <source>Show log browser</source> - <translation type="unfinished">Afficher le navigateur de logs</translation> + <source>Resolve conflict</source> + <translation type="unfinished">Résoudre les conflits</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="492"/> + <source>Select all local file entries</source> + <translation type="unfinished">Sélectionner tous les fichiers locaux</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="494"/> - <source>Show status</source> - <translation type="unfinished">Afficher l'état (status)</translation> + <source>Select all versioned file entries</source> + <translation type="unfinished">Sélectionner tous les fichiers ayant une version</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="496"/> + <source>Select all local directory entries</source> + <translation type="unfinished">Sélectionner tous les répertoires locaux</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> - <source>Show difference</source> - <translation type="unfinished">Afficher les différences</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="501"/> - <source>Show difference (extended)</source> - <translation type="unfinished">Afficher les différences (étendu)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="248"/> - <source>Show annotated file</source> - <translation type="unfinished">Afficher les fichiers annotés</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="506"/> - <source>Revert changes</source> - <translation type="unfinished">Revenir avant les modifications</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="509"/> - <source>Resolve conflict</source> - <translation type="unfinished">Résoudre les conflits</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="512"/> - <source>Select all local file entries</source> - <translation type="unfinished">Sélectionner tous les fichiers locaux</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="514"/> - <source>Select all versioned file entries</source> - <translation type="unfinished">Sélectionner tous les fichiers ayant une version</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="516"/> - <source>Select all local directory entries</source> - <translation type="unfinished">Sélectionner tous les répertoires locaux</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="518"/> <source>Select all versioned directory entries</source> <translation type="unfinished">Sélectionner tous les répertoires ayant une version</translation> </message> @@ -16460,7 +16588,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> @@ -16479,6 +16607,51 @@ <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Create changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <source>Create changegroup file collecting changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> + <source>Apply changegroups...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> + <source>Apply one or several changegroup files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> + <source>Changegroup Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> + <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/> + <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -16833,12 +17006,12 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="104"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="103"/> <source>Mercurial status checked successfully</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="114"/> <source>Could not start the Mercurial process.</source> <translation type="unfinished"></translation> </message> @@ -24986,7 +25159,7 @@ <translation>VCS Status</translation> </message> <message> - <location filename="Project/ProjectBrowserModel.py" line="614"/> + <location filename="Project/ProjectBrowserModel.py" line="599"/> <source>local</source> <translation>local</translation> </message>
--- a/i18n/eric5_it.ts Sat Apr 24 13:56:43 2010 +0000 +++ b/i18n/eric5_it.ts Sat Apr 24 17:32:07 2010 +0000 @@ -14188,82 +14188,82 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="157"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="158"/> <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="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="161"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="163"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="188"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="189"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="188"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="189"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="215"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="216"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="231"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="232"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="371"/> <source>Commiting changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="412"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="459"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="460"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="520"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="577"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="578"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="685"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="686"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="716"/> <source>Reverting changes</source> <translation type="unfinished">Annullamento modifiche</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="756"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="757"/> <source>Merging</source> <translation type="unfinished"></translation> </message> @@ -14333,10 +14333,40 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1644"/> + <source>Mercurial Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1627"/> + <source>Mercurial Bundle Files (*.bundle)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1644"/> + <source><p>The Mercurial bundle file <b>{0}</b> already exists.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695"/> + <source>Mercurial Unbundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1689"/> + <source>Mercurial Bundle Files (*.bundle);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695"/> + <source>Shall the working directory be updated?</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -14427,6 +14457,104 @@ </message> </context> <context> + <name>HgBundleDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="14"/> + <source>Mercurial Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Revisione</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.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/HgBundleDialog.ui" line="32"/> + <source>Number</source> + <translation type="unfinished">Numero</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.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/HgBundleDialog.ui" line="71"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="74"/> + <source>Id:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="84"/> + <source>Enter a changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="91"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="94"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="104"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="114"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="117"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="127"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="137"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="140"/> + <source>No revision selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="153"/> + <source>Select the compression type (empty for default)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="160"/> + <source>Select to bundle all changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="163"/> + <source>Bundle all changesets</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="14"/> @@ -14781,12 +14909,12 @@ <translation type="unfinished">Seleziona il campo su cui filtrare</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="800"/> <source>Revision</source> <translation type="unfinished">Revisione</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="797"/> <source>Author</source> <translation type="unfinished">Autore</translation> </message> @@ -14946,27 +15074,27 @@ <translation type="unfinished">Modificato</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="463"/> <source>Process Generation Error</source> <translation type="unfinished">Errore Generazione Processo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="463"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="314"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="316"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="319"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -15291,7 +15419,7 @@ <translation type="unfinished">Seleziona la directory del Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py" line="82"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py" line="71"/> <source>Select Project Directory</source> <translation type="unfinished">Seleziona la directory del progetto</translation> </message> @@ -15343,97 +15471,97 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="450"/> <source>Version Control</source> <translation type="unfinished">Controllo di Versione</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="461"/> + <source>Commit changes to repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="466"/> + <source>Add to repository</source> + <translation type="unfinished">Aggiungi al repository</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="469"/> + <source>Remove from repository (and disk)</source> + <translation type="unfinished">Rimuovi dal repository (e dal disco)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="391"/> + <source>Copy in repository</source> + <translation type="unfinished">Copia nel repository</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="393"/> + <source>Move in repository</source> + <translation type="unfinished">Muovi nel repository</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="396"/> + <source>Show log</source> + <translation type="unfinished">Mostra log</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="399"/> + <source>Show limited log</source> + <translation type="unfinished">Mostra log ridotto</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402"/> + <source>Show log browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="474"/> + <source>Show status</source> + <translation type="unfinished">Mostra stato</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> + <source>Show difference</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481"/> - <source>Commit changes to repository...</source> - <translation type="unfinished"></translation> + <source>Show difference (extended)</source> + <translation type="unfinished">Mostra differenza (esteso)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="233"/> + <source>Show annotated file</source> + <translation type="unfinished">Mostra file appuntati</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="486"/> - <source>Add to repository</source> - <translation type="unfinished">Aggiungi al repository</translation> + <source>Revert changes</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="489"/> - <source>Remove from repository (and disk)</source> - <translation type="unfinished">Rimuovi dal repository (e dal disco)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="411"/> - <source>Copy in repository</source> - <translation type="unfinished">Copia nel repository</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="413"/> - <source>Move in repository</source> - <translation type="unfinished">Muovi nel repository</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="416"/> - <source>Show log</source> - <translation type="unfinished">Mostra log</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="419"/> - <source>Show limited log</source> - <translation type="unfinished">Mostra log ridotto</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="422"/> - <source>Show log browser</source> - <translation type="unfinished"></translation> + <source>Resolve conflict</source> + <translation type="unfinished">Risolvi conflitti</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="492"/> + <source>Select all local file entries</source> + <translation type="unfinished">Seleziona tutt i file locali</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="494"/> - <source>Show status</source> - <translation type="unfinished">Mostra stato</translation> + <source>Select all versioned file entries</source> + <translation type="unfinished">Seleziona tutti i file controllati</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="496"/> + <source>Select all local directory entries</source> + <translation type="unfinished">Seleziona tutte le directory locali</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> - <source>Show difference</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="501"/> - <source>Show difference (extended)</source> - <translation type="unfinished">Mostra differenza (esteso)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="248"/> - <source>Show annotated file</source> - <translation type="unfinished">Mostra file appuntati</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="506"/> - <source>Revert changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="509"/> - <source>Resolve conflict</source> - <translation type="unfinished">Risolvi conflitti</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="512"/> - <source>Select all local file entries</source> - <translation type="unfinished">Seleziona tutt i file locali</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="514"/> - <source>Select all versioned file entries</source> - <translation type="unfinished">Seleziona tutti i file controllati</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="516"/> - <source>Select all local directory entries</source> - <translation type="unfinished">Seleziona tutte le directory locali</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="518"/> <source>Select all versioned directory entries</source> <translation type="unfinished">Seleziona tutte le directory controllate</translation> </message> @@ -16126,7 +16254,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> @@ -16145,6 +16273,51 @@ <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Create changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <source>Create changegroup file collecting changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> + <source>Apply changegroups...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> + <source>Apply one or several changegroup files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> + <source>Changegroup Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> + <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/> + <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -16499,12 +16672,12 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="104"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="103"/> <source>Mercurial status checked successfully</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="114"/> <source>Could not start the Mercurial process.</source> <translation type="unfinished"></translation> </message> @@ -24632,7 +24805,7 @@ <translation>Stato VCS</translation> </message> <message> - <location filename="Project/ProjectBrowserModel.py" line="614"/> + <location filename="Project/ProjectBrowserModel.py" line="599"/> <source>local</source> <translation>locale</translation> </message>
--- a/i18n/eric5_ru.ts Sat Apr 24 13:56:43 2010 +0000 +++ b/i18n/eric5_ru.ts Sat Apr 24 17:32:07 2010 +0000 @@ -13770,72 +13770,72 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="157"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="158"/> <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="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="161"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="163"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="188"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="189"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="188"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="189"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="215"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="216"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="231"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="232"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="371"/> <source>Commiting changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="412"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="459"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="460"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="520"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="577"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="578"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="756"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="757"/> <source>Merging</source> <translation type="unfinished"></translation> </message> @@ -13870,12 +13870,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="685"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="686"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="716"/> <source>Reverting changes</source> <translation type="unfinished">Отменяю изменения</translation> </message> @@ -13915,10 +13915,40 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1644"/> + <source>Mercurial Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1627"/> + <source>Mercurial Bundle Files (*.bundle)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1644"/> + <source><p>The Mercurial bundle file <b>{0}</b> already exists.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695"/> + <source>Mercurial Unbundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1689"/> + <source>Mercurial Bundle Files (*.bundle);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695"/> + <source>Shall the working directory be updated?</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -14009,6 +14039,104 @@ </message> </context> <context> + <name>HgBundleDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="14"/> + <source>Mercurial Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Версия (ревизия)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="29"/> + <source>Select to specify a revision by number</source> + <translation type="unfinished">Задать ревизию порядковым номером</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="32"/> + <source>Number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="42"/> + <source>Enter a revision number</source> + <translation type="unfinished">Задайте номер ревизии</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="71"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="74"/> + <source>Id:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="84"/> + <source>Enter a changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="91"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="94"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="104"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="114"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="117"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="127"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="137"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="140"/> + <source>No revision selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="153"/> + <source>Select the compression type (empty for default)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="160"/> + <source>Select to bundle all changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="163"/> + <source>Bundle all changesets</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="14"/> @@ -14363,12 +14491,12 @@ <translation type="unfinished">Задайте поле, по которому фильтровать</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="800"/> <source>Revision</source> <translation type="unfinished">Версия (ревизия)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="797"/> <source>Author</source> <translation type="unfinished">Автор</translation> </message> @@ -14518,12 +14646,12 @@ <translation type="unfinished">Изменено</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="463"/> <source>Process Generation Error</source> <translation type="unfinished">Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="463"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -14538,17 +14666,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="314"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="316"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="319"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -14872,7 +15000,7 @@ <translation type="unfinished">Задайте каталог репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py" line="82"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py" line="71"/> <source>Select Project Directory</source> <translation type="unfinished">Выберите каталог проекта</translation> </message> @@ -14929,97 +15057,97 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="450"/> <source>Version Control</source> <translation type="unfinished">Контроль версий</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="461"/> + <source>Commit changes to repository...</source> + <translation type="unfinished">Зафиксировать изменения в репозитории...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="466"/> + <source>Add to repository</source> + <translation type="unfinished">Добавить в репозиторий</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="469"/> + <source>Remove from repository (and disk)</source> + <translation type="unfinished">Удаление из репозитория (и с диска)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="391"/> + <source>Copy in repository</source> + <translation type="unfinished">Копировать в репозиторий</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="393"/> + <source>Move in repository</source> + <translation type="unfinished">Переместить в репозиторий</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="396"/> + <source>Show log</source> + <translation type="unfinished">Показать журнал</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="399"/> + <source>Show limited log</source> + <translation type="unfinished">Показать ограниченный журнал</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402"/> + <source>Show log browser</source> + <translation type="unfinished">Показать проводник журналов</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> + <source>Show difference</source> + <translation type="unfinished">Показать различие</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481"/> - <source>Commit changes to repository...</source> - <translation type="unfinished">Зафиксировать изменения в репозитории...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="486"/> - <source>Add to repository</source> - <translation type="unfinished">Добавить в репозиторий</translation> + <source>Show difference (extended)</source> + <translation type="unfinished">Показать различие (расширенно)</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="489"/> - <source>Remove from repository (and disk)</source> - <translation type="unfinished">Удаление из репозитория (и с диска)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="411"/> - <source>Copy in repository</source> - <translation type="unfinished">Копировать в репозиторий</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="413"/> - <source>Move in repository</source> - <translation type="unfinished">Переместить в репозиторий</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="416"/> - <source>Show log</source> - <translation type="unfinished">Показать журнал</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="419"/> - <source>Show limited log</source> - <translation type="unfinished">Показать ограниченный журнал</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="422"/> - <source>Show log browser</source> - <translation type="unfinished">Показать проводник журналов</translation> + <source>Resolve conflict</source> + <translation type="unfinished">Разрешить конфликт</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="492"/> + <source>Select all local file entries</source> + <translation type="unfinished">Выделить все локальные файлы</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="494"/> + <source>Select all versioned file entries</source> + <translation type="unfinished">Выделить все файлы с версиями (VCS)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="496"/> + <source>Select all local directory entries</source> + <translation type="unfinished">Выделить все локальные каталоги</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> - <source>Show difference</source> - <translation type="unfinished">Показать различие</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="501"/> - <source>Show difference (extended)</source> - <translation type="unfinished">Показать различие (расширенно)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="509"/> - <source>Resolve conflict</source> - <translation type="unfinished">Разрешить конфликт</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="512"/> - <source>Select all local file entries</source> - <translation type="unfinished">Выделить все локальные файлы</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="514"/> - <source>Select all versioned file entries</source> - <translation type="unfinished">Выделить все файлы с версиями (VCS)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="516"/> - <source>Select all local directory entries</source> - <translation type="unfinished">Выделить все локальные каталоги</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="518"/> <source>Select all versioned directory entries</source> <translation type="unfinished">Выделить все каталоги с версиями (VCS)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="494"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="474"/> <source>Show status</source> <translation type="unfinished">Показать статус</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="233"/> <source>Show annotated file</source> <translation type="unfinished">Показать файл, снабжённый комментариями</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="506"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="486"/> <source>Revert changes</source> <translation type="unfinished">Отмена изменений</translation> </message> @@ -15714,7 +15842,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> @@ -15733,6 +15861,51 @@ <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Create changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <source>Create changegroup file collecting changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> + <source>Apply changegroups...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> + <source>Apply one or several changegroup files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> + <source>Changegroup Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> + <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/> + <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -16117,12 +16290,12 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="104"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="103"/> <source>Mercurial status checked successfully</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="114"/> <source>Could not start the Mercurial process.</source> <translation type="unfinished"></translation> </message> @@ -23811,7 +23984,7 @@ <translation>Статус VCS</translation> </message> <message> - <location filename="Project/ProjectBrowserModel.py" line="614"/> + <location filename="Project/ProjectBrowserModel.py" line="599"/> <source>local</source> <translation>локальный</translation> </message>
--- a/i18n/eric5_tr.ts Sat Apr 24 13:56:43 2010 +0000 +++ b/i18n/eric5_tr.ts Sat Apr 24 17:32:07 2010 +0000 @@ -14455,82 +14455,82 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="157"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="158"/> <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="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="161"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="163"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="188"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="189"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="188"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="189"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="215"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="216"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="231"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="232"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="371"/> <source>Commiting changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="412"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="459"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="460"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="520"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="577"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="578"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="685"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="686"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="716"/> <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="756"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="757"/> <source>Merging</source> <translation type="unfinished"></translation> </message> @@ -14600,10 +14600,40 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1644"/> + <source>Mercurial Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1627"/> + <source>Mercurial Bundle Files (*.bundle)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1644"/> + <source><p>The Mercurial bundle file <b>{0}</b> already exists.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695"/> + <source>Mercurial Unbundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1689"/> + <source>Mercurial Bundle Files (*.bundle);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695"/> + <source>Shall the working directory be updated?</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -14694,6 +14724,104 @@ </message> </context> <context> + <name>HgBundleDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="14"/> + <source>Mercurial Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Gözden Geçirme</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.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/HgBundleDialog.ui" line="32"/> + <source>Number</source> + <translation type="unfinished">Numara</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.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/HgBundleDialog.ui" line="71"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="74"/> + <source>Id:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="84"/> + <source>Enter a changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="91"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="94"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="104"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="114"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="117"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="127"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="137"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="140"/> + <source>No revision selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="153"/> + <source>Select the compression type (empty for default)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="160"/> + <source>Select to bundle all changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="163"/> + <source>Bundle all changesets</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="14"/> @@ -15047,12 +15175,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="800"/> <source>Revision</source> <translation type="unfinished">Gözden Geçirme</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="797"/> <source>Author</source> <translation type="unfinished">Yazar</translation> </message> @@ -15212,27 +15340,27 @@ <translation type="unfinished">Değiştirildi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="463"/> <source>Process Generation Error</source> <translation type="unfinished">İşlem Üretecinde Hata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="463"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="314"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="316"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="319"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -15548,7 +15676,7 @@ <translation type="unfinished">Kaynak Havuzu Dizinin Seçiniz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py" line="82"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py" line="71"/> <source>Select Project Directory</source> <translation type="unfinished">Proje Dizinini Seç</translation> </message> @@ -15597,97 +15725,97 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="450"/> <source>Version Control</source> <translation type="unfinished">Sürüm Kontrol</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="461"/> + <source>Commit changes to repository...</source> + <translation type="unfinished">Yapılan değişiklekleri kaynak havuzuna teslim et...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="466"/> + <source>Add to repository</source> + <translation type="unfinished">Kaynak havuzuna ekle</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="469"/> + <source>Remove from repository (and disk)</source> + <translation type="unfinished">Kaynak havuzundan kaldır (ve diskten)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="391"/> + <source>Copy in repository</source> + <translation type="unfinished">Kaynak havuzuna kopyala</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="393"/> + <source>Move in repository</source> + <translation type="unfinished">Kaynak havuzuna taşı</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="396"/> + <source>Show log</source> + <translation type="unfinished">Kayıtı göster</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="399"/> + <source>Show limited log</source> + <translation type="unfinished">Sınırlı kayıtı göster</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402"/> + <source>Show log browser</source> + <translation type="unfinished">Kayıt gözatıcısını gösted</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="474"/> + <source>Show status</source> + <translation type="unfinished">Durumu Göster</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> + <source>Show difference</source> + <translation type="unfinished">Farkları göster</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481"/> - <source>Commit changes to repository...</source> - <translation type="unfinished">Yapılan değişiklekleri kaynak havuzuna teslim et...</translation> + <source>Show difference (extended)</source> + <translation type="unfinished">Farkları göster (gelişmiş)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="233"/> + <source>Show annotated file</source> + <translation type="unfinished">Açıklama dosyalarını göster</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="486"/> - <source>Add to repository</source> - <translation type="unfinished">Kaynak havuzuna ekle</translation> + <source>Revert changes</source> + <translation type="unfinished">Değişiklikleri başa döndür</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="489"/> - <source>Remove from repository (and disk)</source> - <translation type="unfinished">Kaynak havuzundan kaldır (ve diskten)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="411"/> - <source>Copy in repository</source> - <translation type="unfinished">Kaynak havuzuna kopyala</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="413"/> - <source>Move in repository</source> - <translation type="unfinished">Kaynak havuzuna taşı</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="416"/> - <source>Show log</source> - <translation type="unfinished">Kayıtı göster</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="419"/> - <source>Show limited log</source> - <translation type="unfinished">Sınırlı kayıtı göster</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="422"/> - <source>Show log browser</source> - <translation type="unfinished">Kayıt gözatıcısını gösted</translation> + <source>Resolve conflict</source> + <translation type="unfinished">Çelişkiyi çözümle</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="492"/> + <source>Select all local file entries</source> + <translation type="unfinished">tüm yerel dosyalırın girişini seç</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="494"/> - <source>Show status</source> - <translation type="unfinished">Durumu Göster</translation> + <source>Select all versioned file entries</source> + <translation type="unfinished">Giriş yapılan tüm dosyaları seç</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="496"/> + <source>Select all local directory entries</source> + <translation type="unfinished">Tüm yerel dizin kalemlerini seç</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> - <source>Show difference</source> - <translation type="unfinished">Farkları göster</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="501"/> - <source>Show difference (extended)</source> - <translation type="unfinished">Farkları göster (gelişmiş)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="248"/> - <source>Show annotated file</source> - <translation type="unfinished">Açıklama dosyalarını göster</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="506"/> - <source>Revert changes</source> - <translation type="unfinished">Değişiklikleri başa döndür</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="509"/> - <source>Resolve conflict</source> - <translation type="unfinished">Çelişkiyi çözümle</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="512"/> - <source>Select all local file entries</source> - <translation type="unfinished">tüm yerel dosyalırın girişini seç</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="514"/> - <source>Select all versioned file entries</source> - <translation type="unfinished">Giriş yapılan tüm dosyaları seç</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="516"/> - <source>Select all local directory entries</source> - <translation type="unfinished">Tüm yerel dizin kalemlerini seç</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="518"/> <source>Select all versioned directory entries</source> <translation type="unfinished">Giriş yapılan tüm dizinleri seç</translation> </message> @@ -16380,7 +16508,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> @@ -16399,6 +16527,51 @@ <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Create changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <source>Create changegroup file collecting changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> + <source>Apply changegroups...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> + <source>Apply one or several changegroup files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> + <source>Changegroup Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> + <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/> + <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -16753,12 +16926,12 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="104"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="103"/> <source>Mercurial status checked successfully</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="114"/> <source>Could not start the Mercurial process.</source> <translation type="unfinished"></translation> </message> @@ -24657,7 +24830,7 @@ <translation>VCS Durumu</translation> </message> <message> - <location filename="Project/ProjectBrowserModel.py" line="614"/> + <location filename="Project/ProjectBrowserModel.py" line="599"/> <source>local</source> <translation>yerel</translation> </message>
--- a/i18n/eric5_zh_CN.GB2312.ts Sat Apr 24 13:56:43 2010 +0000 +++ b/i18n/eric5_zh_CN.GB2312.ts Sat Apr 24 17:32:07 2010 +0000 @@ -14495,82 +14495,82 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="157"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="158"/> <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="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="161"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="163"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="188"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="189"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="188"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="189"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="215"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="216"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="231"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="232"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="371"/> <source>Commiting changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="412"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="459"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="460"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="520"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="577"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="578"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="685"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="686"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="716"/> <source>Reverting changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="756"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="757"/> <source>Merging</source> <translation type="unfinished"></translation> </message> @@ -14640,10 +14640,40 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1644"/> + <source>Mercurial Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1627"/> + <source>Mercurial Bundle Files (*.bundle)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1644"/> + <source><p>The Mercurial bundle file <b>{0}</b> already exists.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695"/> + <source>Mercurial Unbundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1689"/> + <source>Mercurial Bundle Files (*.bundle);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695"/> + <source>Shall the working directory be updated?</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -14734,6 +14764,104 @@ </message> </context> <context> + <name>HgBundleDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="14"/> + <source>Mercurial Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">修订</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="29"/> + <source>Select to specify a revision by number</source> + <translation type="unfinished">选择通过号码指定一个修订</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="32"/> + <source>Number</source> + <translation type="unfinished">号码</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="42"/> + <source>Enter a revision number</source> + <translation type="unfinished">输入一个修订号</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="71"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="74"/> + <source>Id:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="84"/> + <source>Enter a changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="91"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="94"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="104"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="114"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="117"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="127"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="137"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="140"/> + <source>No revision selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="153"/> + <source>Select the compression type (empty for default)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="160"/> + <source>Select to bundle all changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="163"/> + <source>Bundle all changesets</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="14"/> @@ -15088,12 +15216,12 @@ <translation type="unfinished">选择要过滤的区域</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="800"/> <source>Revision</source> <translation type="unfinished">修订</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="797"/> <source>Author</source> <translation type="unfinished">作者</translation> </message> @@ -15253,27 +15381,27 @@ <translation type="unfinished">已修改</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="463"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="463"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="314"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="316"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="319"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -15597,7 +15725,7 @@ <translation type="unfinished">选择储存库文件夹</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py" line="82"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py" line="71"/> <source>Select Project Directory</source> <translation type="unfinished">选择项目文件夹</translation> </message> @@ -15649,97 +15777,97 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="450"/> <source>Version Control</source> <translation type="unfinished">版本控制</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="461"/> + <source>Commit changes to repository...</source> + <translation type="unfinished">将更改提交到储存库中……</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="466"/> + <source>Add to repository</source> + <translation type="unfinished">添加到储存库</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="469"/> + <source>Remove from repository (and disk)</source> + <translation type="unfinished">从储存库（和磁盘）中移除</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="391"/> + <source>Copy in repository</source> + <translation type="unfinished">在储存库中复制</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="393"/> + <source>Move in repository</source> + <translation type="unfinished">在储存库中移动</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="396"/> + <source>Show log</source> + <translation type="unfinished">显示日志</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="399"/> + <source>Show limited log</source> + <translation type="unfinished">显示受限日志</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402"/> + <source>Show log browser</source> + <translation type="unfinished">显示日志浏览器</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="474"/> + <source>Show status</source> + <translation type="unfinished">显示状态</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> + <source>Show difference</source> + <translation type="unfinished">显示差异</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481"/> - <source>Commit changes to repository...</source> - <translation type="unfinished">将更改提交到储存库中……</translation> + <source>Show difference (extended)</source> + <translation type="unfinished">显示差异（扩展）</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="233"/> + <source>Show annotated file</source> + <translation type="unfinished">显示有注释的文件</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="486"/> - <source>Add to repository</source> - <translation type="unfinished">添加到储存库</translation> + <source>Revert changes</source> + <translation type="unfinished">还原改变</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="489"/> - <source>Remove from repository (and disk)</source> - <translation type="unfinished">从储存库（和磁盘）中移除</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="411"/> - <source>Copy in repository</source> - <translation type="unfinished">在储存库中复制</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="413"/> - <source>Move in repository</source> - <translation type="unfinished">在储存库中移动</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="416"/> - <source>Show log</source> - <translation type="unfinished">显示日志</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="419"/> - <source>Show limited log</source> - <translation type="unfinished">显示受限日志</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="422"/> - <source>Show log browser</source> - <translation type="unfinished">显示日志浏览器</translation> + <source>Resolve conflict</source> + <translation type="unfinished">解析冲突</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="492"/> + <source>Select all local file entries</source> + <translation type="unfinished">选择所有本地文件条目</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="494"/> - <source>Show status</source> - <translation type="unfinished">显示状态</translation> + <source>Select all versioned file entries</source> + <translation type="unfinished">选择所有版本化的文件条目</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="496"/> + <source>Select all local directory entries</source> + <translation type="unfinished">选择所有本地文件夹条目</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> - <source>Show difference</source> - <translation type="unfinished">显示差异</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="501"/> - <source>Show difference (extended)</source> - <translation type="unfinished">显示差异（扩展）</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="248"/> - <source>Show annotated file</source> - <translation type="unfinished">显示有注释的文件</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="506"/> - <source>Revert changes</source> - <translation type="unfinished">还原改变</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="509"/> - <source>Resolve conflict</source> - <translation type="unfinished">解析冲突</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="512"/> - <source>Select all local file entries</source> - <translation type="unfinished">选择所有本地文件条目</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="514"/> - <source>Select all versioned file entries</source> - <translation type="unfinished">选择所有版本化的文件条目</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="516"/> - <source>Select all local directory entries</source> - <translation type="unfinished">选择所有本地文件夹条目</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="518"/> <source>Select all versioned directory entries</source> <translation type="unfinished">选择所有版本化的文件夹条目</translation> </message> @@ -16432,7 +16560,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> @@ -16451,6 +16579,51 @@ <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Create changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <source>Create changegroup file collecting changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> + <source>Apply changegroups...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> + <source>Apply one or several changegroup files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> + <source>Changegroup Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> + <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/> + <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -16805,12 +16978,12 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="104"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="103"/> <source>Mercurial status checked successfully</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="114"/> <source>Could not start the Mercurial process.</source> <translation type="unfinished"></translation> </message> @@ -24963,7 +25136,7 @@ <translation>版本控制系统状态</translation> </message> <message> - <location filename="Project/ProjectBrowserModel.py" line="614"/> + <location filename="Project/ProjectBrowserModel.py" line="599"/> <source>local</source> <translation>本地</translation> </message>
