Mercurial Repositories > eric / changeset
changeset
Added actions to identify the repo, to forget about files and added an additional status to be reported by the status monitor.
Sat, 01 May 2010 18:26:14 +0000
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 01 May 2010 18:26:14 +0000
- changeset 216
- 6f9713e8d570
- parent 215
- e8978dca44af
- child 217
- 8ce554fb0bee
Added actions to identify the repo, to forget about files and added an additional status to be reported by the status monitor.
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Fri Apr 30 16:45:56 2010 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Sat May 01 18:26:14 2010 +0000 @@ -59,6 +59,8 @@ self.menuactions.append(self.menu.addAction(\ self.trUtf8("Add to repository"), self.__add)) self.menuactions.append(self.menu.addAction(\ + self.trUtf8("Remove from repository"), self.__forget)) + self.menuactions.append(self.menu.addAction(\ self.trUtf8("Revert changes"), self.__revert)) self.menu.addSeparator() self.menuactions.append(self.menu.addAction(self.trUtf8("Adjust column sizes"), @@ -81,6 +83,10 @@ self.trUtf8('not tracked'), ] + self.missingIndicators = [ + self.trUtf8('missing') + ] + self.status = { 'A' : self.trUtf8('added'), 'C' : self.trUtf8('normal'), @@ -404,6 +410,21 @@ project.getModel().updateVCSStatus(name) self.vcs.checkVCSStatus() + def __forget(self): + """ + Private slot to handle the Remove context menu entry. + """ + names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ + for itm in self.__getMissingItems()] + if not names: + QMessageBox.information(self, + self.trUtf8("Remove"), + self.trUtf8("""There are no missing entries available/selected.""")) + return + + self.vcs.hgForget(names) + self.on_refreshButton_clicked() + def __revert(self): """ Private slot to handle the Revert context menu entry. @@ -447,3 +468,15 @@ if itm.text(self.__statusColumn) in self.unversionedIndicators: unversionedItems.append(itm) return unversionedItems + + def __getMissingItems(self): + """ + Private method to retrieve all entries, that have a missing status. + + @return list of all items with a missing status + """ + missingItems = [] + for itm in self.statusList.selectedItems(): + if itm.text(self.__statusColumn) in self.missingIndicators: + missingItems.append(itm) + return missingItems
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py Fri Apr 30 16:45:56 2010 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py Sat May 01 18:26:14 2010 +0000 @@ -41,6 +41,7 @@ <ul> <li>"A" path was added but not yet comitted</li> <li>"M" path has local changes</li> + <li>"O" path was removed</li> <li>"R" path was deleted and then re-added</li> <li>"U" path needs an update</li> <li>"Z" path contains a conflict</li> @@ -69,8 +70,11 @@ for line in output.splitlines(): if not line.startswith(" "): flag, name = line.split(" ", 1) - if flag in "AM": - status = flag + if flag in "AMR": + if flag == "R": + status = "O" + else: + status = flag states[name] = status args = []
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Fri Apr 30 16:45:56 2010 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Sat May 01 18:26:14 2010 +0000 @@ -10,10 +10,13 @@ import os from PyQt4.QtCore import SIGNAL -from PyQt4.QtGui import QMenu +from PyQt4.QtGui import QMenu, QDialog + +from Project.ProjectBrowserModel import ProjectBrowserFileItem from VCS.ProjectBrowserHelper import VcsProjectBrowserHelper +from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog import UI.PixmapCache class HgProjectBrowserHelper(VcsProjectBrowserHelper): @@ -203,6 +206,10 @@ self.trUtf8('Remove from repository (and disk)'), self._VCSRemove) self.vcsMenuActions.append(act) + act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), + self.trUtf8('Remove from repository only'), + self.__HgForget) + self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction(self.trUtf8('Copy in repository'), self.__HgCopy) self.vcsMenuActions.append(act) @@ -287,7 +294,10 @@ self.trUtf8('Remove from repository (and disk)'), self._VCSRemove) self.vcsMultiMenuActions.append(act) - self.vcsRemoveMultiMenuItem = act + act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), + self.trUtf8('Remove from repository only'), + self.__HgForget) + self.vcsMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction(UI.PixmapCache.getIcon("vcsStatus.png"), self.trUtf8('Show status'), self._VCSStatus) @@ -592,3 +602,32 @@ except AttributeError: names.append(itm.dirName()) self.vcs.hgResolve(names) + + def __HgForget(self): + """ + Private slot called by the context menu to remove the selected file from the + Mercurial repository leaving a copy in the project directory. + """ + if self.isTranslationsBrowser: + items = self.browser.getSelectedItems([ProjectBrowserFileItem]) + names = [itm.fileName() for itm in items] + + dlg = DeleteFilesConfirmationDialog(self.parent(), + self.trUtf8("Remove from repository only"), + self.trUtf8("Do you really want to remove these translation files from" + " the repository?"), + names) + else: + items = self.browser.getSelectedItems() + names = [itm.fileName() for itm in items] + files = [name.replace(self.browser.project.ppath + os.sep, '') \ + for name in names] + + dlg = DeleteFilesConfirmationDialog(self.parent(), + self.trUtf8("Remove from repository only"), + self.trUtf8("Do you really want to remove these files" + " from the repository?"), + files) + + if dlg.exec_() == QDialog.Accepted: + self.vcs.hgForget(names)
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Fri Apr 30 16:45:56 2010 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Sat May 01 18:26:14 2010 +0000 @@ -568,6 +568,19 @@ self.connect(self.hgRecoverAct, SIGNAL('triggered()'), self.__hgRecover) self.actions.append(self.hgRecoverAct) + self.hgIdentifyAct = E5Action(self.trUtf8('Identify'), + self.trUtf8('Identify...'), + 0, 0, self, 'mercurial_identify') + self.hgIdentifyAct.setStatusTip(self.trUtf8( + 'Identify the project directory' + )) + self.hgIdentifyAct.setWhatsThis(self.trUtf8( + """<b>Identify</b>""" + """<p>This identifies the project directory.</p>""" + )) + self.connect(self.hgIdentifyAct, SIGNAL('triggered()'), self.__hgIdentify) + self.actions.append(self.hgIdentifyAct) + self.hgCreateIgnoreAct = E5Action(self.trUtf8('Create .hgignore'), self.trUtf8('Create .hgignore'), 0, 0, self, 'mercurial_create ignore') @@ -603,10 +616,10 @@ )) self.hgPreviewBundleAct.setWhatsThis(self.trUtf8( """<b>Preview changegroup</b>""" - """<p>This previews a changegroup file containing a collecting of""" + """<p>This previews a changegroup file containing a collecting of""" """ changesets.</p>""" )) - self.connect(self.hgPreviewBundleAct, SIGNAL('triggered()'), + self.connect(self.hgPreviewBundleAct, SIGNAL('triggered()'), self.__hgPreviewBundle) self.actions.append(self.hgPreviewBundleAct) @@ -689,6 +702,7 @@ adminMenu.addAction(self.hgParentsAct) adminMenu.addAction(self.hgTipAct) adminMenu.addAction(self.hgShowBranchAct) + adminMenu.addAction(self.hgIdentifyAct) adminMenu.addSeparator() adminMenu.addAction(self.hgShowPathsAct) adminMenu.addSeparator() @@ -702,7 +716,7 @@ adminMenu.addAction(self.hgVerifyAct) bundleMenu = QMenu(self.trUtf8("Changegroup Management"), menu) - bundleMenu.addAction(self.hgBundleAct) + bundleMenu.addAction(self.hgBundleAct) bundleMenu.addAction(self.hgPreviewBundleAct) bundleMenu.addAction(self.hgUnbundleAct) @@ -906,6 +920,12 @@ """ self.vcs.hgRecover(self.project.ppath) + def __hgIdentify(self): + """ + Protected slot used to identify the project directory. + """ + self.vcs.hgIdentify(self.project.ppath) + def __hgCreateIgnore(self): """ Protected slot used to create a .hgignore file for the project. @@ -917,12 +937,12 @@ Protected slot used to create a changegroup file. """ self.vcs.hgBundle(self.project.ppath) - + def __hgPreviewBundle(self): """ Protected slot used to preview a changegroup file. """ - self.vcs.hgPreviewBundle(self.project.ppath) + self.vcs.hgPreviewBundle(self.project.ppath) def __hgUnbundle(self): """
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Fri Apr 30 16:45:56 2010 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Sat May 01 18:26:14 2010 +0000 @@ -51,7 +51,7 @@ @signal committed() emitted after the commit action has completed """ - def __init__(self, plugin, parent=None, name=None): + def __init__(self, plugin, parent = None, name = None): """ Constructor @@ -109,6 +109,8 @@ self.__commitData = {} self.__commitDialog = None + + self.__forgotNames = [] def getPlugin(self): """ @@ -377,6 +379,11 @@ if res: dia.exec_() self.emit(SIGNAL("committed()")) + if self.__forgotNames: + model = e5App().getObject("Project").getModel() + for name in self.__forgotNames: + model.updateVCSStatus(name) + self.__forgotNames = [] self.checkVCSStatus() def vcsUpdate(self, name, noDialog = False, revision = None): @@ -1598,6 +1605,29 @@ if res: dia.exec_() + def hgIdentify(self, name): + """ + Public method to identify the current working directory. + + @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 + + args = [] + args.append('identify') + + dia = HgDialog(self.trUtf8('Identifying project directory')) + res = dia.startProcess(args, repodir, False) + if res: + dia.exec_() + def hgCreateIgnoreFile(self, name, autoAdd = False): """ Public method to create the ignore file. @@ -1606,6 +1636,7 @@ @param autoAdd flag indicating to add it automatically (boolean) @return flag indicating success """ + status = False ignorePatterns = [ "glob:.eric5project", "glob:.ropeproject", @@ -1616,20 +1647,32 @@ ] ignoreName = os.path.join(name, ".hgignore") - try: - # create a .hgignore file - ignore = open(ignoreName, "w") - ignore.write("\n".join(ignorePatterns)) - ignore.write("\n") - ignore.close() - status = True - except IOError: - status = False - - if status and autoAdd: - self.vcsAdd(ignoreName, noDialog = True) - project = e5App().getObject("Project") - project.appendFile(ignoreName) + if os.path.exists(ignoreName): + res = QMessageBox.warning(None, + self.trUtf8("Create .hgignore file"), + self.trUtf8("""<p>The file <b>{0}</b> exists already.""" + """ Overwrite it?</p>""").format(ignoreName), + QMessageBox.StandardButtons(\ + QMessageBox.No | \ + QMessageBox.Yes), + QMessageBox.No) + else: + res = QMessageBox.Yes + if res == QMessageBox.Yes: + try: + # create a .hgignore file + ignore = open(ignoreName, "w") + ignore.write("\n".join(ignorePatterns)) + ignore.write("\n") + ignore.close() + status = True + except IOError: + status = False + + if status and autoAdd: + self.vcsAdd(ignoreName, noDialog = True) + project = e5App().getObject("Project") + project.appendFile(ignoreName) return status @@ -1701,7 +1744,7 @@ def hgPreviewBundle(self, name): """ - Public method used to view the log of incoming changes from a + Public method used to view the log of incoming changes from a changegroup file. @param name file/directory name to show the log of (string) @@ -1713,7 +1756,7 @@ self.trUtf8("Mercurial Bundle Files (*.hg);;All Files (*)")) if file: if self.getPlugin().getPreferences("UseLogBrowser"): - self.logBrowser = \ + self.logBrowser = \ HgLogBrowserDialog(self, mode = "incoming", bundle = file) self.logBrowser.show() self.logBrowser.start(name) @@ -1803,6 +1846,43 @@ if res: dia.exec_() + def hgForget(self, name): + """ + Public method used to remove a file from the Mercurial repository. + + This will not remove the file from the project directory. + + @param name file/directory name to be removed (string or list of strings)) + """ + args = [] + args.append('forget') + self.addArguments(args, self.options['global']) + args.append('-v') + + if isinstance(name, list): + dname, fnames = self.splitPathList(name) + self.addArguments(args, name) + else: + dname, fname = self.splitPath(name) + args.append(name) + + # find the root of the repo + repodir = dname + while not os.path.isdir(os.path.join(repodir, self.adminDir)): + repodir = os.path.dirname(repodir) + if repodir == os.sep: + return False + + dia = HgDialog(\ + self.trUtf8('Removing files from the Mercurial repository only')) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + if isinstance(name, list): + self.__forgotNames.extend(name) + else: + self.__forgotNames.append(name) + ############################################################################ ## Methods to get the helper objects are below. ############################################################################
--- a/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py Fri Apr 30 16:45:56 2010 +0000 +++ b/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py Sat May 01 18:26:14 2010 +0000 @@ -358,7 +358,6 @@ self.trUtf8('Remove from repository (and disk)'), self._VCSRemove) self.vcsMultiMenuActions.append(act) - self.vcsRemoveMultiMenuItem = act if pysvn.svn_version >= (1, 5, 0) and pysvn.version >= (1, 6, 0): menu.addSeparator() act = menu.addAction(self.trUtf8("Add to Changelist"),
--- a/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py Fri Apr 30 16:45:56 2010 +0000 +++ b/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py Sat May 01 18:26:14 2010 +0000 @@ -355,7 +355,6 @@ self.trUtf8('Remove from repository (and disk)'), self._VCSRemove) self.vcsMultiMenuActions.append(act) - self.vcsRemoveMultiMenuItem = act if self.vcs.versionStr >= '1.5.0': menu.addSeparator() act = menu.addAction(self.trUtf8("Add to Changelist"),
--- a/Preferences/ConfigurationPages/VcsPage.py Fri Apr 30 16:45:56 2010 +0000 +++ b/Preferences/ConfigurationPages/VcsPage.py Sat May 01 18:26:14 2010 +0000 @@ -58,6 +58,9 @@ self.projectBrowserColours["VcsConflict"] = \ self.initColour("VcsConflict", self.pbVcsConflictButton, Preferences.getProjectBrowserColour) + self.projectBrowserColours["VcsRemoved"] = \ + self.initColour("VcsRemoved", self.pbVcsRemovedButton, + Preferences.getProjectBrowserColour) def save(self): """ @@ -88,7 +91,7 @@ self.projectBrowserColours["VcsAdded"] = \ self.selectColour(self.pbVcsAddedButton, self.projectBrowserColours["VcsAdded"]) - + @pyqtSlot() def on_pbVcsConflictButton_clicked(self): """ @@ -98,7 +101,7 @@ self.projectBrowserColours["VcsConflict"] = \ self.selectColour(self.pbVcsConflictButton, self.projectBrowserColours["VcsConflict"]) - + @pyqtSlot() def on_pbVcsModifiedButton_clicked(self): """ @@ -108,7 +111,7 @@ self.projectBrowserColours["VcsModified"] = \ self.selectColour(self.pbVcsModifiedButton, self.projectBrowserColours["VcsModified"]) - + @pyqtSlot() def on_pbVcsReplacedButton_clicked(self): """ @@ -118,7 +121,17 @@ self.projectBrowserColours["VcsReplaced"] = \ self.selectColour(self.pbVcsReplacedButton, self.projectBrowserColours["VcsReplaced"]) - + + @pyqtSlot() + def on_pbVcsRemovedButton_clicked(self): + """ + Private slot to set the background colour for entries with VCS + status "removed". + """ + self.projectBrowserColours["VcsRemoved"] = \ + self.selectColour(self.pbVcsRemovedButton, + self.projectBrowserColours["VcsRemoved"]) + @pyqtSlot() def on_pbVcsUpdateButton_clicked(self): """
--- a/Preferences/ConfigurationPages/VcsPage.ui Fri Apr 30 16:45:56 2010 +0000 +++ b/Preferences/ConfigurationPages/VcsPage.ui Sat May 01 18:26:14 2010 +0000 @@ -256,6 +256,29 @@ </property> </widget> </item> + <item row="2" column="2"> + <widget class="QLabel" name="label_7"> + <property name="text"> + <string>VCS status "removed":</string> + </property> + </widget> + </item> + <item row="2" column="3"> + <widget class="QPushButton" name="pbVcsRemovedButton"> + <property name="minimumSize"> + <size> + <width>100</width> + <height>0</height> + </size> + </property> + <property name="toolTip"> + <string>Select the background colour for entries with VCS status "removed".</string> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> </layout> </widget> </item>
--- a/Preferences/__init__.py Fri Apr 30 16:45:56 2010 +0000 +++ b/Preferences/__init__.py Sat May 01 18:26:14 2010 +0000 @@ -531,6 +531,7 @@ "VcsModified" : QtGui.QColor(QtCore.Qt.yellow), "VcsReplaced" : QtGui.QColor(QtCore.Qt.cyan), "VcsUpdate" : QtGui.QColor(QtCore.Qt.green), + "VcsRemoved" : QtGui.QColor(QtCore.Qt.magenta) } # defaults for the help settings
--- a/Project/ProjectBrowser.py Fri Apr 30 16:45:56 2010 +0000 +++ b/Project/ProjectBrowser.py Sat May 01 18:26:14 2010 +0000 @@ -62,6 +62,7 @@ self.vcsStatusColorNames = { "A" : "VcsAdded", "M" : "VcsModified", + "O" : "VcsRemoved", "R" : "VcsReplaced", "U" : "VcsUpdate", "Z" : "VcsConflict", @@ -70,6 +71,7 @@ " " : self.trUtf8("up to date"), "A" : self.trUtf8("files added"), "M" : self.trUtf8("local modifications"), + "O" : self.trUtf8("files removed"), "R" : self.trUtf8("files replaced"), "U" : self.trUtf8("update required"), "Z" : self.trUtf8("conflict"),
--- a/Project/ProjectBrowserModel.py Fri Apr 30 16:45:56 2010 +0000 +++ b/Project/ProjectBrowserModel.py Sat May 01 18:26:14 2010 +0000 @@ -236,6 +236,7 @@ self.colorNames = { "A" : "VcsAdded", "M" : "VcsModified", + "O" : "VcsRemoved", "R" : "VcsReplaced", "U" : "VcsUpdate", "Z" : "VcsConflict", @@ -244,6 +245,7 @@ " " : QColor(), "A" : Preferences.getProjectBrowserColour(self.colorNames["A"]), "M" : Preferences.getProjectBrowserColour(self.colorNames["M"]), + "O" : Preferences.getProjectBrowserColour(self.colorNames["O"]), "R" : Preferences.getProjectBrowserColour(self.colorNames["R"]), "U" : Preferences.getProjectBrowserColour(self.colorNames["U"]), "Z" : Preferences.getProjectBrowserColour(self.colorNames["Z"]), @@ -681,6 +683,7 @@ <ul> <li>"A" path was added but not yet comitted</li> <li>"M" path has local changes</li> + <li>"O" path was removed</li> <li>"R" path was deleted and then re-added</li> <li>"U" path needs an update</li> <li>"Z" path contains a conflict</li>
--- a/VCS/StatusMonitorThread.py Fri Apr 30 16:45:56 2010 +0000 +++ b/VCS/StatusMonitorThread.py Sat May 01 18:26:14 2010 +0000 @@ -175,6 +175,7 @@ <ul> <li>"A" path was added but not yet comitted</li> <li>"M" path has local changes</li> + <li>"O" path was removed</li> <li>"R" path was deleted and then re-added</li> <li>"U" path needs an update</li> <li>"Z" path contains a conflict</li>
--- a/i18n/eric5_cs.ts Fri Apr 30 16:45:56 2010 +0000 +++ b/i18n/eric5_cs.ts Sat May 01 18:26:14 2010 +0000 @@ -14149,205 +14149,225 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="164"/> <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="165"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="167"/> + <source>The hg process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="169"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="222"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="238"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="377"/> <source>Commiting changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="416"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="423"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="464"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="471"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="524"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="582"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="589"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="690"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="697"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="720"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="727"/> <source>Reverting changes</source> <translation type="unfinished">Navrácení změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="761"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="768"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="961"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="968"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1130"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> <source>Select number of entries to show.</source> <translation type="unfinished">Vyberte počet položek, které se mají zobrazit.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1319"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1326"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1428"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1435"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1461"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/> <source>Creating branch in 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="1533"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1550"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1557"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1573"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1596"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1603"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <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="1746"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1697"/> - <source>Create changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> - <source>Apply changegroups</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> - <source>Bisect subcommand ({0}) invalid.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> - <source>Mercurial Bisect ({0})</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1655"/> - <source>Mercurial Bundle Files (*.hg)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> - <source>Preview changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1740"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1803"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <source>Mercurial Bisect ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1698"/> + <source>Mercurial Bundle Files (*.hg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1752"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> <source>Mercurial Bundle Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1626"/> + <source>Identifying project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <source>Create .hgignore file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> + <source>Removing files from the Mercurial repository only</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -15489,100 +15509,115 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="460"/> <source>Version Control</source> <translation type="unfinished">Kontrola verzí</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="461"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="471"/> <source>Commit changes to repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="466"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="476"/> <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"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="479"/> <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"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="401"/> <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"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403"/> <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"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="406"/> <source>Show log</source> <translation type="unfinished">Zobrazit log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="399"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="409"/> <source>Show limited log</source> <translation type="unfinished">Zobrazit limitovaný log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="412"/> <source>Show log browser</source> <translation type="unfinished">Zobrazit log prohlížeč</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="474"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484"/> <source>Show status</source> <translation type="unfinished">Zobrazit status</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="488"/> <source>Show difference</source> <translation type="unfinished">Zobrazit odlišnosti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="491"/> <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"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="240"/> <source>Show annotated file</source> <translation type="unfinished">Zobrazit komentované soubory</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="486"/> - <source>Revert changes</source> - <translation type="unfinished">Vrátit změny</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="489"/> - <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>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>Revert changes</source> + <translation type="unfinished">Vrátit změny</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="499"/> + <source>Resolve conflict</source> + <translation type="unfinished">Vyřešit konflikty</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="502"/> + <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="504"/> + <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="506"/> <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"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="508"/> <source>Select all versioned directory entries</source> <translation type="unfinished">Vybrat všechny adresáře ve správě verzí</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <source>Remove from repository only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="615"/> + <source>Do you really want to remove these translation files from the repository?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <source>Do you really want to remove these files from the repository?</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -16272,67 +16307,67 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> - <source>Create .hgignore</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Create a .hgignore file with default values</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> - <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="584"/> - <source>Create changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="584"/> - <source>Create changegroup...</source> + <source>Create .hgignore</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> - <source>Create changegroup file collecting changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> - <source>Apply changegroups</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> - <source>Apply changegroups...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> - <source>Apply one or several changegroup files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> - <source>Changegroup Management</source> + <source>Create a .hgignore file with default values</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> + <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="597"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="597"/> + <source>Create changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <source>Create changegroup file collecting changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <source>Apply changegroups...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <source>Apply one or several changegroup files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> + <source>Changegroup Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <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="619"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> <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> @@ -16352,100 +16387,120 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> - <source>Mark a selectable changeset as good</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> - <source>Mark as "bad"</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> - <source>Mark a selectable changeset as bad</source> + <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> - <source>Skip</source> - <translation type="unfinished">Přeskočit</translation> + <source>Mark as "bad"</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> - <source>Skip the current changeset</source> + <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> - <source><b>Skip</b><p>This skips the current changeset.</p></source> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> - <source>Reset</source> - <translation type="unfinished"></translation> + <source>Skip</source> + <translation type="unfinished">Přeskočit</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> - <source>Reset the bisect search data</source> + <source>Skip the current changeset</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <source><b>Skip</b><p>This skips the current changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="679"/> + <source>Reset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <source>Reset the bisect search data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> - <source>Mark as "good"...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> + <source>Mark as "good"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source>Preview a changegroup file containing a collecting of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collecting of changesets.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Identify</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Identify...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <source>Identify the project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> + <source><b>Identify</b><p>This identifies the project directory.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -16641,7 +16696,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="186"/> <source>Mercurial Status</source> <translation type="unfinished"></translation> </message> @@ -16727,95 +16782,110 @@ <translation type="unfinished">Přidat do repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="61"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="63"/> <source>Revert changes</source> <translation type="unfinished">Vrátit změny</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="64"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="66"/> <source>Adjust column sizes</source> <translation type="unfinished">Přizpůsobit šířky sloupců</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="85"/> - <source>added</source> - <translation type="unfinished">přidáno</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="88"/> - <source>modified</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="89"/> - <source>removed</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="90"/> - <source>not tracked</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="86"/> - <source>normal</source> - <translation type="unfinished">normální</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="87"/> - <source>ignored</source> - <translation type="unfinished">ignorováno</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="91"/> + <source>added</source> + <translation type="unfinished">přidáno</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="94"/> + <source>modified</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> + <source>removed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="96"/> + <source>not tracked</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="92"/> + <source>normal</source> + <translation type="unfinished">normální</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="93"/> + <source>ignored</source> + <translation type="unfinished">ignorováno</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="97"/> <source>missing</source> <translation type="unfinished">chybějící</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="187"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="193"/> <source>Process Generation Error</source> <translation type="unfinished">Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="187"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="193"/> <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/HgStatusDialog.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="374"/> <source>Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="414"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="435"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished">Nekomitnuté změny nejsou dostupné/vybrané.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="400"/> <source>Add</source> <translation type="unfinished">Přidat</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="400"/> <source>There are no unversioned entries available/selected.</source> <translation type="unfinished">Položky mimo verzi nejsou dostupné/vybrány.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="414"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="435"/> <source>Revert</source> <translation type="unfinished">Vrátit</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="61"/> + <source>Remove from repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="420"/> + <source>Remove</source> + <translation type="unfinished">Odebrat</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="420"/> + <source>There are no missing entries available/selected.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgStatusMonitorThread</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="103"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="107"/> <source>Mercurial status checked successfully</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="118"/> <source>Could not start the Mercurial process.</source> <translation type="unfinished"></translation> </message> @@ -23189,12 +23259,12 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="828"/> + <location filename="Preferences/__init__.py" line="829"/> <source>Export Preferences</source> <translation>Předvolby exportu</translation> </message> <message> - <location filename="Preferences/__init__.py" line="847"/> + <location filename="Preferences/__init__.py" line="848"/> <source>Import Preferences</source> <translation>Předvolby importu</translation> </message> @@ -24874,34 +24944,39 @@ <context> <name>ProjectBrowser</name> <message> - <location filename="Project/ProjectBrowser.py" line="70"/> + <location filename="Project/ProjectBrowser.py" line="71"/> <source>up to date</source> <translation>aktuální</translation> </message> <message> - <location filename="Project/ProjectBrowser.py" line="71"/> - <source>files added</source> - <translation>souborů přidáno</translation> - </message> - <message> <location filename="Project/ProjectBrowser.py" line="72"/> + <source>files added</source> + <translation>souborů přidáno</translation> + </message> + <message> + <location filename="Project/ProjectBrowser.py" line="73"/> <source>local modifications</source> <translation>místní změny</translation> </message> <message> + <location filename="Project/ProjectBrowser.py" line="76"/> + <source>update required</source> + <translation>požadováno update</translation> + </message> + <message> + <location filename="Project/ProjectBrowser.py" line="77"/> + <source>conflict</source> + <translation>konflikt</translation> + </message> + <message> + <location filename="Project/ProjectBrowser.py" line="75"/> + <source>files replaced</source> + <translation>nahrazeno souborů</translation> + </message> + <message> <location filename="Project/ProjectBrowser.py" line="74"/> - <source>update required</source> - <translation>požadováno update</translation> - </message> - <message> - <location filename="Project/ProjectBrowser.py" line="75"/> - <source>conflict</source> - <translation>konflikt</translation> - </message> - <message> - <location filename="Project/ProjectBrowser.py" line="73"/> - <source>files replaced</source> - <translation>nahrazeno souborů</translation> + <source>files removed</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -24917,7 +24992,7 @@ <translation>VCS Status</translation> </message> <message> - <location filename="Project/ProjectBrowserModel.py" line="599"/> + <location filename="Project/ProjectBrowserModel.py" line="601"/> <source>local</source> <translation>lokální</translation> </message> @@ -32616,22 +32691,22 @@ <context> <name>SvnProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="584"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="583"/> <source>Version Control</source> <translation>Kontrola verzí</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="595"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="594"/> <source>Update from repository</source> <translation>Obnovit z repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="597"/> <source>Commit changes to repository...</source> <translation>Commitovat změny do repozitáře...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="603"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="602"/> <source>Add to repository</source> <translation>Přidat do repozitáře</translation> </message> @@ -32641,42 +32716,42 @@ <translation>Přidat stromovou strukturu do repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="606"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="605"/> <source>Remove from repository (and disk)</source> <translation>Odebrat z repozitáře (a z disku)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="499"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="498"/> <source>Copy in repository</source> <translation>Kopírovat v repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="501"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="500"/> <source>Move in repository</source> <translation>Přesunout v repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="512"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="511"/> <source>Show log</source> <translation>Zobrazit log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="515"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="514"/> <source>Show limited log</source> <translation>Zobrazit limitovaný log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="619"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="618"/> <source>Show status</source> <translation>Zobrazit status</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="623"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="622"/> <source>Show difference</source> <translation>Zobrazit odlišnosti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="625"/> <source>Show difference (extended)</source> <translation>Zobrazit odlišnosti (rozšířeně)</translation> </message> @@ -32686,102 +32761,102 @@ <translation>Zobrazit komentované soubory</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="635"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="634"/> <source>Revert changes</source> <translation>Vrátit změny</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="638"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="637"/> <source>Merge changes</source> <translation>Sloučit změny</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="640"/> <source>Resolve conflict</source> <translation>Vyřešit konflikty</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="393"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="392"/> <source>Lock</source> <translation>Zamknout</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="396"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="395"/> <source>Unlock</source> <translation>Odemknout</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="399"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="398"/> <source>Break Lock</source> <translation>Prolomit zámek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="402"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="401"/> <source>Steal Lock</source> <translation>Scizit zámek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="643"/> <source>Set Property</source> <translation>Nastavit vlastnosti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="646"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="645"/> <source>List Properties</source> <translation>Seznam vlastností</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="648"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="647"/> <source>Delete Property</source> <translation>Smazat vlastnost</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="651"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="650"/> <source>Select all local file entries</source> <translation>Vybrat všechny lokální soubory</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="653"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="652"/> <source>Select all versioned file entries</source> <translation>Vybrat všechny soubory ve správě verzí</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="655"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="654"/> <source>Select all local directory entries</source> <translation>Vybrat všechny lokální adresáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="657"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="656"/> <source>Select all versioned directory entries</source> <translation>Vybrat všechny adresáře ve správě verzí</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="525"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="524"/> <source>Show repository info</source> <translation>Zobrazit info o repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="630"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="629"/> <source>Show difference (URLs)</source> <translation>Zobrazit odlišnosti (URL)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="518"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="517"/> <source>Show log browser</source> <translation>Zobrazit log prohlížeč</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="660"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="659"/> <source>Configure...</source> <translation>Konfigurovat...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="612"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="611"/> <source>Add to Changelist</source> <translation>Přidat do seznamu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="615"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="614"/> <source>Remove from Changelist</source> <translation>Odebrat ze seznamu změn</translation> </message> @@ -40458,6 +40533,16 @@ <source>Automatic updates enabled</source> <translation>Automatické aktualizace zapnuty</translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/VcsPage.ui" line="262"/> + <source>VCS status "removed":</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/VcsPage.ui" line="275"/> + <source>Select the background colour for entries with VCS status "removed".</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>VcsProjectBrowserHelper</name> @@ -43997,30 +44082,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1014"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1381"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1388"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1385"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1392"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1033"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1047"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1054"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -44031,23 +44116,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1382"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1377"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1384"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1389"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1396"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1392"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1399"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr>
--- a/i18n/eric5_de.ts Fri Apr 30 16:45:56 2010 +0000 +++ b/i18n/eric5_de.ts Sat May 01 18:26:14 2010 +0000 @@ -13206,205 +13206,225 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="164"/> <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="165"/> - <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="167"/> + <source>The hg process did not finish within 30s.</source> + <translation>Der hg Prozess endete nicht innerhalb von 30s.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="169"/> <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="193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> <source>Create project repository</source> <translation>Projektrepository anlegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> <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="220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="222"/> <source>Creating Mercurial repository</source> <translation>Lege Mercurial Repository an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="238"/> <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="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> <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="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="377"/> <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="416"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="423"/> <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="464"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="471"/> <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="524"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> <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="582"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="589"/> <source>Renaming {0}</source> <translation>Benenne {0} um</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="690"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="697"/> <source>Taging in the Mercurial repository</source> <translation>Marke im Mercurial Repository setzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="720"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="727"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="761"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="768"/> <source>Merging</source> <translation>Zusammenführen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="961"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="968"/> <source>Mercurial command</source> <translation>Mercurial Befehl</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1130"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> <source>Mercurial Log</source> <translation>Mercurial Log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> <source>Select number of entries to show.</source> <translation>Wähle Anzahl der anzuzeigenden Einträge.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> <source>Pulling from a remote Mercurial repository</source> <translation>Pull von einem entfernten Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1319"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1326"/> <source>Pushing to a remote Mercurial repository</source> <translation>Push in ein entferntes Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1428"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1435"/> <source>Resolving files/directories</source> <translation>Löse Dateien/Verzeichnisse auf</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> <source>Create Branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> <source>Enter branch name</source> <translation>Gib den Zweignamen ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1461"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/> <source>Creating branch in the Mercurial repository</source> <translation>Erzeuge Zweig im Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1526"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1533"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verifiziere die Integrität des Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1550"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1557"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1573"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> <source>Showing aliases for remote repositories</source> <translation>Zeige Namen für entfernte Repositories</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1596"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1603"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <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="1746"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> <source>Shall the working directory be updated?</source> <translation>Soll das Arbeitsverzeichnis aktualisiert werden?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1697"/> - <source>Create changegroup</source> - <translation>Änderungsgruppe erzeugen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> - <source>Apply changegroups</source> - <translation>Änderungsgruppen anwenden</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> - <source>Bisect subcommand ({0}) invalid.</source> - <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> - <source>Mercurial Bisect ({0})</source> - <translation>Mercurial Bisect ({0})</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1655"/> - <source>Mercurial Bundle Files (*.hg)</source> - <translation>Mercurial Bundle Dateien (*.hg)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> - <source>Preview changegroup</source> - <translation>Änderungsgruppe ansehen</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1740"/> + <source>Create changegroup</source> + <translation>Änderungsgruppe erzeugen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1803"/> + <source>Apply changegroups</source> + <translation>Änderungsgruppen anwenden</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <source>Mercurial Bisect ({0})</source> + <translation>Mercurial Bisect ({0})</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1698"/> + <source>Mercurial Bundle Files (*.hg)</source> + <translation>Mercurial Bundle Dateien (*.hg)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1752"/> + <source>Preview changegroup</source> + <translation>Änderungsgruppe ansehen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> <source>Mercurial Bundle Files (*.hg);;All Files (*)</source> <translation>Mercurial Bundle Dateien (*.hg);;Alle Dateien (*)</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1626"/> + <source>Identifying project directory</source> + <translation>Projektverzeichnis identifizieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <source>Create .hgignore file</source> + <translation>.hgignore Datei erstellen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> + <source>Removing files from the Mercurial repository only</source> + <translation>Lösche Dateien nur aus dem Mercurial Repository</translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -14537,100 +14557,115 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="460"/> <source>Version Control</source> <translation>Versionskontrolle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="461"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="471"/> <source>Commit changes to repository...</source> <translation>Änderungen einpflegen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="466"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="476"/> <source>Add to repository</source> <translation>Zum Repository hinzufügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="469"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="479"/> <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"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="401"/> <source>Copy in repository</source> <translation>Im Repository kopieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="393"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403"/> <source>Move in repository</source> <translation>Im Repository verschieben</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="396"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="406"/> <source>Show log</source> <translation>Beschreibungen anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="399"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="409"/> <source>Show limited log</source> <translation>Beschreibungen limitiert anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="412"/> <source>Show log browser</source> <translation>Zeige Log Browser</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="474"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484"/> <source>Show status</source> <translation>Status anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="488"/> <source>Show difference</source> <translation>Unterschiede anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="491"/> <source>Show difference (extended)</source> <translation>Unterschiede anzeigen (erweitert)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="240"/> <source>Show annotated file</source> <translation>Zeige kommentierte Datei</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="486"/> - <source>Revert changes</source> - <translation>Änderungen rückgängig</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="489"/> - <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>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>Revert changes</source> + <translation>Änderungen rückgängig</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="499"/> + <source>Resolve conflict</source> + <translation>Konflikt lösen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="502"/> + <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="504"/> + <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="506"/> <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"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="508"/> <source>Select all versioned directory entries</source> <translation>Alle versionierten Verzeichniseinträge auswählen</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <source>Remove from repository only</source> + <translation>Nur vom Repository löschen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="615"/> + <source>Do you really want to remove these translation files from the repository?</source> + <translation>Wollen Sie wirklich diese Übersetzungsdateien vom Repository löschen?</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <source>Do you really want to remove these files from the repository?</source> + <translation>Wollen Sie wirklich diese Dateien vom Repository löschen?</translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -15320,67 +15355,67 @@ <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="687"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Repository Administration</source> <translation>Repository Administration</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> - <source>Create .hgignore</source> - <translation>Erstelle .hgignore</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Create a .hgignore file with default values</source> - <translation>Erstelle eine .hgignore Datei mit Standardwerten</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> - <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="584"/> - <source>Create changegroup</source> - <translation>Änderungsgruppe erzeugen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="584"/> - <source>Create changegroup...</source> - <translation>Änderungsgruppe erzeugen...</translation> + <source>Create .hgignore</source> + <translation>Erstelle .hgignore</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> - <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="613"/> - <source>Apply changegroups</source> - <translation>Änderungsgruppen anwenden</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> - <source>Apply changegroups...</source> - <translation>Änderungsgruppen anwenden...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> - <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="704"/> - <source>Changegroup Management</source> - <translation>Verwaltung von Änderungsgruppen</translation> + <source>Create a .hgignore file with default values</source> + <translation>Erstelle eine .hgignore Datei mit Standardwerten</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> + <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="597"/> + <source>Create changegroup</source> + <translation>Änderungsgruppe erzeugen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="597"/> + <source>Create changegroup...</source> + <translation>Änderungsgruppe erzeugen...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <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="626"/> + <source>Apply changegroups</source> + <translation>Änderungsgruppen anwenden</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <source>Apply changegroups...</source> + <translation>Änderungsgruppen anwenden...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <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="718"/> + <source>Changegroup Management</source> + <translation>Verwaltung von Änderungsgruppen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <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="619"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> <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> @@ -15400,100 +15435,120 @@ <translation><b>Zeige aktuellen Zweig</b><p>Dies zeigt den aktuellen Zweig des Projektes.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Mark as "good"</source> <translation>Als "gut" markieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> - <source>Mark a selectable changeset as good</source> - <translation>Markiere einen auswählbaren Änderungssatz als gut</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation><b>Als gut markieren</b><p>Dies markiert einen auswählbaren Änderungssatz als gut.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> - <source>Mark as "bad"</source> - <translation>Als "schlecht" markieren</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> - <source>Mark a selectable changeset as bad</source> - <translation>Markiere einen auswählbaren Änderungssatz als schlecht</translation> + <source>Mark a selectable changeset as good</source> + <translation>Markiere einen auswählbaren Änderungssatz als gut</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> - <translation><b>Als schlecht markieren</b><p>Dies markiert einen auswählbaren Änderungssatz als schlecht.</p></translation> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> + <translation><b>Als gut markieren</b><p>Dies markiert einen auswählbaren Änderungssatz als gut.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> - <source>Skip</source> - <translation>Überspringen</translation> + <source>Mark as "bad"</source> + <translation>Als "schlecht" markieren</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> - <source>Skip the current changeset</source> - <translation>Überspringe den aktuellen Änderungssatz</translation> + <source>Mark a selectable changeset as bad</source> + <translation>Markiere einen auswählbaren Änderungssatz als schlecht</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> - <source><b>Skip</b><p>This skips the current changeset.</p></source> - <translation><b>Überspringen</b><p>Dies überspringt den aktuellen Änderungssatz.</p></translation> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <translation><b>Als schlecht markieren</b><p>Dies markiert einen auswählbaren Änderungssatz als schlecht.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> - <source>Reset</source> - <translation>Zurücksetzen</translation> + <source>Skip</source> + <translation>Überspringen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> - <source>Reset the bisect search data</source> - <translation>Setzt die Bisect Suchdaten zurück</translation> + <source>Skip the current changeset</source> + <translation>Überspringe den aktuellen Änderungssatz</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <source><b>Skip</b><p>This skips the current changeset.</p></source> + <translation><b>Überspringen</b><p>Dies überspringt den aktuellen Änderungssatz.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="679"/> + <source>Reset</source> + <translation>Zurücksetzen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <source>Reset the bisect search data</source> + <translation>Setzt die Bisect Suchdaten zurück</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Zurücksetzen</b><p>Dies setzt die Bisect Suchdaten zurück.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> - <source>Mark as "good"...</source> - <translation>Als "gut" markieren...</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> + <source>Mark as "good"...</source> + <translation>Als "gut" markieren...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> <source>Mark as "bad"...</source> <translation>Als "schlecht" markieren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Preview changegroup...</source> <translation>Änderungsgruppe ansehen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source>Preview a changegroup file containing a collecting of changesets</source> <translation>Eine Änderungsgruppendatei für Änderungssätze ansehen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collecting of changesets.</p></source> <translation><b>Änderungsgruppe ansehen</b><p>Dies zeigt den Inhalt einer Änderungsgruppendatei für Änderungssätze an.</p></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Identify</source> + <translation>Identifizieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Identify...</source> + <translation>Identifizieren...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <source>Identify the project directory</source> + <translation>Identifiziere das Projektverzeichnis</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> + <source><b>Identify</b><p>This identifies the project directory.</p></source> + <translation><b>Identifizieren</b><p>Dies identifiziert das Projektverzeichnis.</p></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -15689,7 +15744,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="186"/> <source>Mercurial Status</source> <translation>Mercurial Status</translation> </message> @@ -15776,95 +15831,110 @@ <translation>Zum Repository hinzufügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="61"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="63"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="64"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="66"/> <source>Adjust column sizes</source> <translation>Spaltengrößen anpassen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="85"/> - <source>added</source> - <translation>hinzugefügt</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="88"/> - <source>modified</source> - <translation>modifiziert</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="89"/> - <source>removed</source> - <translation>gelöscht</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="90"/> - <source>not tracked</source> - <translation>nicht versioniert</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="86"/> - <source>normal</source> - <translation>normal</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="87"/> - <source>ignored</source> - <translation>ignoriert</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="91"/> + <source>added</source> + <translation>hinzugefügt</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="94"/> + <source>modified</source> + <translation>modifiziert</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> + <source>removed</source> + <translation>gelöscht</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="96"/> + <source>not tracked</source> + <translation>nicht versioniert</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="92"/> + <source>normal</source> + <translation>normal</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="93"/> + <source>ignored</source> + <translation>ignoriert</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="97"/> <source>missing</source> <translation>fehlt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="187"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="193"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="187"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="193"/> <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/HgStatusDialog.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="374"/> <source>Commit</source> <translation>Einpflegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="414"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="435"/> <source>There are no uncommitted changes available/selected.</source> <translation>Es sind keine nicht eingepflegten Änderungen vorhanden/ausgewählt.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="400"/> <source>Add</source> <translation>Hinzufügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="400"/> <source>There are no unversioned entries available/selected.</source> <translation>Es sind keine unversionierten Einträge vorhanden/ausgewählt.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="414"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="435"/> <source>Revert</source> <translation>Rückgängig machen</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="61"/> + <source>Remove from repository</source> + <translation>Vom Repository löschen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="420"/> + <source>Remove</source> + <translation>Entfernen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="420"/> + <source>There are no missing entries available/selected.</source> + <translation>Es sind keine fehlenden Einträge vorhanden/ausgewählt.</translation> + </message> </context> <context> <name>HgStatusMonitorThread</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="103"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="107"/> <source>Mercurial status checked successfully</source> <translation>Mercurial Status erfolgreich überprüft</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="118"/> <source>Could not start the Mercurial process.</source> <translation>Der Mercurial Prozess konnte nicht gestartet werden.</translation> </message> @@ -21688,12 +21758,12 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="828"/> + <location filename="Preferences/__init__.py" line="829"/> <source>Export Preferences</source> <translation>Konfiguration exportieren</translation> </message> <message> - <location filename="Preferences/__init__.py" line="847"/> + <location filename="Preferences/__init__.py" line="848"/> <source>Import Preferences</source> <translation>Konfiguration importieren</translation> </message> @@ -23107,34 +23177,39 @@ <context> <name>ProjectBrowser</name> <message> - <location filename="Project/ProjectBrowser.py" line="71"/> + <location filename="Project/ProjectBrowser.py" line="72"/> <source>files added</source> <translation>Dateien hinzugefügt</translation> </message> <message> - <location filename="Project/ProjectBrowser.py" line="72"/> + <location filename="Project/ProjectBrowser.py" line="73"/> <source>local modifications</source> <translation>Lokale Änderungen</translation> </message> <message> + <location filename="Project/ProjectBrowser.py" line="76"/> + <source>update required</source> + <translation>Abgleich erforderlich</translation> + </message> + <message> + <location filename="Project/ProjectBrowser.py" line="77"/> + <source>conflict</source> + <translation>Konflikt</translation> + </message> + <message> + <location filename="Project/ProjectBrowser.py" line="71"/> + <source>up to date</source> + <translation>Aktuell</translation> + </message> + <message> + <location filename="Project/ProjectBrowser.py" line="75"/> + <source>files replaced</source> + <translation>Dateien ersetzt</translation> + </message> + <message> <location filename="Project/ProjectBrowser.py" line="74"/> - <source>update required</source> - <translation>Abgleich erforderlich</translation> - </message> - <message> - <location filename="Project/ProjectBrowser.py" line="75"/> - <source>conflict</source> - <translation>Konflikt</translation> - </message> - <message> - <location filename="Project/ProjectBrowser.py" line="70"/> - <source>up to date</source> - <translation>Aktuell</translation> - </message> - <message> - <location filename="Project/ProjectBrowser.py" line="73"/> - <source>files replaced</source> - <translation>Dateien ersetzt</translation> + <source>files removed</source> + <translation>Dateien entfernt</translation> </message> </context> <context> @@ -23150,7 +23225,7 @@ <translation>VCS Status</translation> </message> <message> - <location filename="Project/ProjectBrowserModel.py" line="599"/> + <location filename="Project/ProjectBrowserModel.py" line="601"/> <source>local</source> <translation>lokal</translation> </message> @@ -30470,17 +30545,17 @@ <context> <name>SvnProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="595"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="594"/> <source>Update from repository</source> <translation>Abgleich mit Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="597"/> <source>Commit changes to repository...</source> <translation>Änderungen einpflegen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="603"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="602"/> <source>Add to repository</source> <translation>Zum Repository hinzufügen</translation> </message> @@ -30490,117 +30565,117 @@ <translation>Verzeichnisbaum zum Repository hinzufügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="606"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="605"/> <source>Remove from repository (and disk)</source> <translation>Vom Repository (und der Platte) löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="499"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="498"/> <source>Copy in repository</source> <translation>Im Repository kopieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="501"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="500"/> <source>Move in repository</source> <translation>Im Repository verschieben</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="512"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="511"/> <source>Show log</source> <translation>Beschreibungen anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="619"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="618"/> <source>Show status</source> <translation>Status anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="623"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="622"/> <source>Show difference</source> <translation>Unterschiede anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="625"/> <source>Show difference (extended)</source> <translation>Unterschiede anzeigen (erweitert)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="635"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="634"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="638"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="637"/> <source>Merge changes</source> <translation>Änderungen einarbeiten</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="640"/> <source>Resolve conflict</source> <translation>Konflikt lösen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="643"/> <source>Set Property</source> <translation>Eigenschaft definieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="646"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="645"/> <source>List Properties</source> <translation>Eigenschaften listen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="648"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="647"/> <source>Delete Property</source> <translation>Eigenschaft löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="651"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="650"/> <source>Select all local file entries</source> <translation>Alle lokalen Dateieinträge auswählen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="653"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="652"/> <source>Select all versioned file entries</source> <translation>Alle versionierten Dateieinträge auswählen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="655"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="654"/> <source>Select all local directory entries</source> <translation>Alle lokalen Verzeichniseinträge auswählen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="657"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="656"/> <source>Select all versioned directory entries</source> <translation>Alle versionierten Verzeichniseinträge auswählen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="515"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="514"/> <source>Show limited log</source> <translation>Beschreibungen limitiert anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="393"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="392"/> <source>Lock</source> <translation>Sperren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="396"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="395"/> <source>Unlock</source> <translation>Entsperren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="399"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="398"/> <source>Break Lock</source> <translation>Sperre brechen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="402"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="401"/> <source>Steal Lock</source> <translation>Sperre stehlen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="584"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="583"/> <source>Version Control</source> <translation>Versionskontrolle</translation> </message> @@ -30610,32 +30685,32 @@ <translation>Zeige kommentierte Datei</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="525"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="524"/> <source>Show repository info</source> <translation>Zeige Repository Informationen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="630"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="629"/> <source>Show difference (URLs)</source> <translation>Unterschiede anzeigen (URLs)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="518"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="517"/> <source>Show log browser</source> <translation>Zeige Log Browser</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="660"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="659"/> <source>Configure...</source> <translation>Einstellungen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="612"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="611"/> <source>Add to Changelist</source> <translation>Zu Änderungsliste hinzufügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="615"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="614"/> <source>Remove from Changelist</source> <translation>Von Änderungsliste entfernen</translation> </message> @@ -37820,6 +37895,16 @@ <source>Automatic updates enabled</source> <translation>Automatische Updates</translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/VcsPage.ui" line="262"/> + <source>VCS status "removed":</source> + <translation>VCS Status "Gelöscht":</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/VcsPage.ui" line="275"/> + <source>Select the background colour for entries with VCS status "removed".</source> + <translation>Wähle die Hintergrundfarbe für Einträge mit VCS Status "gelöscht".</translation> + </message> </context> <context> <name>VcsProjectBrowserHelper</name> @@ -41087,24 +41172,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1014"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Vorgänger #{0}</b></td><td></td></tr> <tr><td><b>Änderungssatz</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1381"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1388"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marken</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1385"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1392"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Zweige</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1033"/> <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> @@ -41113,7 +41198,7 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1047"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1054"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -41130,24 +41215,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1382"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Spitze</b></td><td></td></tr> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1377"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1384"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Änderungssatz</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1389"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1396"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Vorgänger</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1392"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1399"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr>
--- a/i18n/eric5_es.ts Fri Apr 30 16:45:56 2010 +0000 +++ b/i18n/eric5_es.ts Sat May 01 18:26:14 2010 +0000 @@ -13206,205 +13206,225 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="164"/> <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="165"/> - <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="167"/> + <source>The hg process did not finish within 30s.</source> + <translation>El proceso hg no terminó en un plazo de 30s.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="169"/> <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="193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> <source>Create project repository</source> <translation>Crear repositorio del proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> <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="220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="222"/> <source>Creating Mercurial repository</source> <translation>Creando repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="238"/> <source>Initial commit to Mercurial repository</source> <translation>Commit inicial al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> <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="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="377"/> <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="416"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="423"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizando con el repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="464"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="471"/> <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="524"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> <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="582"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="589"/> <source>Renaming {0}</source> <translation>Renombrando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="761"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="768"/> <source>Merging</source> <translation>Haciendo un merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1130"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> <source>Mercurial Log</source> <translation>Registro de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> <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="1294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> <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="1319"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1326"/> <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="1428"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1435"/> <source>Resolving files/directories</source> <translation>Resolviendo archivos/directorios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="690"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="697"/> <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="720"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="727"/> <source>Reverting changes</source> <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="961"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="968"/> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> <source>Create Branch</source> <translation>Crear Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> <source>Enter branch name</source> <translation>Introducir nombre de branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1461"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/> <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="1526"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1533"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1550"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1557"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1573"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1596"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1603"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <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="1746"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1697"/> - <source>Create changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> - <source>Apply changegroups</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> - <source>Bisect subcommand ({0}) invalid.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> - <source>Mercurial Bisect ({0})</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1655"/> - <source>Mercurial Bundle Files (*.hg)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> - <source>Preview changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1740"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1803"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <source>Mercurial Bisect ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1698"/> + <source>Mercurial Bundle Files (*.hg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1752"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> <source>Mercurial Bundle Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1626"/> + <source>Identifying project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <source>Create .hgignore file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> + <source>Removing files from the Mercurial repository only</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -14562,100 +14582,115 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="460"/> <source>Version Control</source> <translation>Control de Versiones</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="461"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="471"/> <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"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="476"/> <source>Add to repository</source> <translation>Añadir al repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="469"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="479"/> <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"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="401"/> <source>Copy in repository</source> <translation>Copiar en el repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="393"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403"/> <source>Move in repository</source> <translation>Mover en el repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="396"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="406"/> <source>Show log</source> <translation>Mostrar log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="399"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="409"/> <source>Show limited log</source> <translation>Mostrar log limitado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="412"/> <source>Show log browser</source> <translation>Mostrar navegador de log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="488"/> <source>Show difference</source> <translation>Mostrar diferencia</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="491"/> <source>Show difference (extended)</source> <translation>Mostrar diferencia (extendida)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="489"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="499"/> <source>Resolve conflict</source> <translation>Resolver conflicto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="492"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="502"/> <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"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="504"/> <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="506"/> + <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="508"/> + <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="484"/> + <source>Show status</source> + <translation>Mostrar estado</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="240"/> + <source>Show annotated file</source> + <translation>Mostrar archivo anotado</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>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="474"/> - <source>Show status</source> - <translation>Mostrar estado</translation> - </message> - <message> - <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="486"/> <source>Revert changes</source> <translation>Revertir cambios</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <source>Remove from repository only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="615"/> + <source>Do you really want to remove these translation files from the repository?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <source>Do you really want to remove these files from the repository?</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -15345,67 +15380,67 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="584"/> <source>Create .hgignore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Create a .hgignore file with default values</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> - <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="687"/> - <source>Repository Administration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="584"/> - <source>Create changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="584"/> - <source>Create changegroup...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> - <source>Create changegroup file collecting changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> - <source>Apply changegroups</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> - <source>Apply changegroups...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> - <source>Apply one or several changegroup files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> - <source>Changegroup Management</source> + <source>Create a .hgignore file with default values</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> + <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="700"/> + <source>Repository Administration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="597"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="597"/> + <source>Create changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <source>Create changegroup file collecting changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <source>Apply changegroups...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <source>Apply one or several changegroup files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> + <source>Changegroup Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <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="619"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> <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> @@ -15425,100 +15460,120 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> - <source>Mark a selectable changeset as good</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> - <source>Mark as "bad"</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> - <source>Mark a selectable changeset as bad</source> + <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> - <source>Skip</source> - <translation type="unfinished">Saltar</translation> + <source>Mark as "bad"</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> - <source>Skip the current changeset</source> + <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> - <source><b>Skip</b><p>This skips the current changeset.</p></source> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> - <source>Reset</source> - <translation type="unfinished"></translation> + <source>Skip</source> + <translation type="unfinished">Saltar</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> - <source>Reset the bisect search data</source> + <source>Skip the current changeset</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <source><b>Skip</b><p>This skips the current changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="679"/> + <source>Reset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <source>Reset the bisect search data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> - <source>Mark as "good"...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> + <source>Mark as "good"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source>Preview a changegroup file containing a collecting of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collecting of changesets.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Identify</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Identify...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <source>Identify the project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> + <source><b>Identify</b><p>This identifies the project directory.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -15714,7 +15769,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="186"/> <source>Mercurial Status</source> <translation>Mercurial Status</translation> </message> @@ -15801,95 +15856,110 @@ <translation>Añadir al repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="61"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="63"/> <source>Revert changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="64"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="66"/> <source>Adjust column sizes</source> <translation>Adjustar tamaño de columnas</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="85"/> - <source>added</source> - <translation>añadido</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="88"/> - <source>modified</source> - <translation>modificado</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="89"/> - <source>removed</source> - <translation>eliminado</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="90"/> - <source>not tracked</source> - <translation>sin seguimiento</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="86"/> - <source>normal</source> - <translation>normal</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="87"/> - <source>ignored</source> - <translation>ignorado</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="91"/> + <source>added</source> + <translation>añadido</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="94"/> + <source>modified</source> + <translation>modificado</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> + <source>removed</source> + <translation>eliminado</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="96"/> + <source>not tracked</source> + <translation>sin seguimiento</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="92"/> + <source>normal</source> + <translation>normal</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="93"/> + <source>ignored</source> + <translation>ignorado</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="97"/> <source>missing</source> <translation>perdido</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="187"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="193"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="187"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="193"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="374"/> <source>Commit</source> <translation>Commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="414"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="435"/> <source>There are no uncommitted changes available/selected.</source> <translation>No hay cambios pendientes de commit disponibles/seleccionados.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="400"/> <source>Add</source> <translation>Añadir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="400"/> <source>There are no unversioned entries available/selected.</source> <translation>No hay entradas sin versionar disponibles/seleccionadas.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="414"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="435"/> <source>Revert</source> <translation>Revertir</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="61"/> + <source>Remove from repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="420"/> + <source>Remove</source> + <translation type="unfinished">Eliminar</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="420"/> + <source>There are no missing entries available/selected.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgStatusMonitorThread</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="103"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="107"/> <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="114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="118"/> <source>Could not start the Mercurial process.</source> <translation>No se pudo ejecutar el proceso Mercurial.</translation> </message> @@ -21712,12 +21782,12 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="828"/> + <location filename="Preferences/__init__.py" line="829"/> <source>Export Preferences</source> <translation>Exportar Preferencias</translation> </message> <message> - <location filename="Preferences/__init__.py" line="847"/> + <location filename="Preferences/__init__.py" line="848"/> <source>Import Preferences</source> <translation>Importar Preferencias</translation> </message> @@ -23131,34 +23201,39 @@ <context> <name>ProjectBrowser</name> <message> - <location filename="Project/ProjectBrowser.py" line="71"/> + <location filename="Project/ProjectBrowser.py" line="72"/> <source>files added</source> <translation>archivos añadidos</translation> </message> <message> - <location filename="Project/ProjectBrowser.py" line="72"/> + <location filename="Project/ProjectBrowser.py" line="73"/> <source>local modifications</source> <translation>modificaciones locales</translation> </message> <message> + <location filename="Project/ProjectBrowser.py" line="76"/> + <source>update required</source> + <translation>actualización necesaria</translation> + </message> + <message> + <location filename="Project/ProjectBrowser.py" line="77"/> + <source>conflict</source> + <translation>conflicto</translation> + </message> + <message> + <location filename="Project/ProjectBrowser.py" line="71"/> + <source>up to date</source> + <translation>al dia</translation> + </message> + <message> + <location filename="Project/ProjectBrowser.py" line="75"/> + <source>files replaced</source> + <translation>Archivos reemplazados</translation> + </message> + <message> <location filename="Project/ProjectBrowser.py" line="74"/> - <source>update required</source> - <translation>actualización necesaria</translation> - </message> - <message> - <location filename="Project/ProjectBrowser.py" line="75"/> - <source>conflict</source> - <translation>conflicto</translation> - </message> - <message> - <location filename="Project/ProjectBrowser.py" line="70"/> - <source>up to date</source> - <translation>al dia</translation> - </message> - <message> - <location filename="Project/ProjectBrowser.py" line="73"/> - <source>files replaced</source> - <translation>Archivos reemplazados</translation> + <source>files removed</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -23174,7 +23249,7 @@ <translation>Estatus de VCS</translation> </message> <message> - <location filename="Project/ProjectBrowserModel.py" line="599"/> + <location filename="Project/ProjectBrowserModel.py" line="601"/> <source>local</source> <translation>local</translation> </message> @@ -30454,22 +30529,22 @@ <context> <name>SvnProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="584"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="583"/> <source>Version Control</source> <translation>Control de Versiones</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="595"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="594"/> <source>Update from repository</source> <translation>Hacer update desde repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="597"/> <source>Commit changes to repository...</source> <translation>Hacer commit de los cambios al repositorio...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="603"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="602"/> <source>Add to repository</source> <translation>Añadir al repositorio</translation> </message> @@ -30479,47 +30554,47 @@ <translation>Añadir árbol al repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="606"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="605"/> <source>Remove from repository (and disk)</source> <translation>Eliminar del repositorio (y del disco)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="499"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="498"/> <source>Copy in repository</source> <translation>Copiar en el repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="501"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="500"/> <source>Move in repository</source> <translation>Mover en el repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="512"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="511"/> <source>Show log</source> <translation>Mostrar log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="515"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="514"/> <source>Show limited log</source> <translation>Mostrar log limitado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="619"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="618"/> <source>Show status</source> <translation>Mostrar estado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="623"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="622"/> <source>Show difference</source> <translation>Mostrar diferencia</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="625"/> <source>Show difference (extended)</source> <translation>Mostrar diferencia (extendida)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="630"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="629"/> <source>Show difference (URLs)</source> <translation>Mostrar diferencia (URLs)</translation> </message> @@ -30529,97 +30604,97 @@ <translation>Mostrar archivo anotado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="635"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="634"/> <source>Revert changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="638"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="637"/> <source>Merge changes</source> <translation>Hacer merge de los cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="640"/> <source>Resolve conflict</source> <translation>Resolver conflicto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="393"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="392"/> <source>Lock</source> <translation>Bloquear</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="396"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="395"/> <source>Unlock</source> <translation>Desbloquear</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="399"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="398"/> <source>Break Lock</source> <translation>Romper bloqueo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="402"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="401"/> <source>Steal Lock</source> <translation>Robar bloqueo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="643"/> <source>Set Property</source> <translation>Establecer propiedad</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="646"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="645"/> <source>List Properties</source> <translation>Listar propiedades</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="648"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="647"/> <source>Delete Property</source> <translation>Borrar propiedad</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="651"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="650"/> <source>Select all local file entries</source> <translation>Seleccionar todas las entradas de archivo locales</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="653"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="652"/> <source>Select all versioned file entries</source> <translation>Seleccionar todas las entradas de archivo versionadas</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="655"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="654"/> <source>Select all local directory entries</source> <translation>Seleccionar todas las entradas de directorio locales</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="657"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="656"/> <source>Select all versioned directory entries</source> <translation>Seleccionar todas las entradas de directorio versionadas</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="525"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="524"/> <source>Show repository info</source> <translation>Mostrar informacion del repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="518"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="517"/> <source>Show log browser</source> <translation>Mostrar navegador de log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="660"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="659"/> <source>Configure...</source> <translation>Configurar...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="612"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="611"/> <source>Add to Changelist</source> <translation>Añadir a la lista de cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="615"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="614"/> <source>Remove from Changelist</source> <translation>Quitar de la lista de cambios</translation> </message> @@ -37795,6 +37870,16 @@ <source>Automatic updates enabled</source> <translation>Actualizaciones automáticas habilitadas</translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/VcsPage.ui" line="262"/> + <source>VCS status "removed":</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/VcsPage.ui" line="275"/> + <source>Select the background colour for entries with VCS status "removed".</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>VcsProjectBrowserHelper</name> @@ -41061,17 +41146,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1381"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1388"/> <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="1385"/> - <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="1392"/> + <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1399"/> <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> @@ -41082,31 +41167,31 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1382"/> <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="1377"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1384"/> <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="1389"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1396"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Padres</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1014"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> <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="1026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1033"/> <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> @@ -41115,7 +41200,7 @@ <tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1047"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1054"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric5_fr.ts Fri Apr 30 16:45:56 2010 +0000 +++ b/i18n/eric5_fr.ts Sat May 01 18:26:14 2010 +0000 @@ -14523,205 +14523,225 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="164"/> <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="165"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="167"/> + <source>The hg process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="169"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="222"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="238"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="377"/> <source>Commiting changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="416"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="423"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="464"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="471"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="524"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="582"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="589"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="690"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="697"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="720"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="727"/> <source>Reverting changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="761"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="768"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="961"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="968"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1130"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> <source>Select number of entries to show.</source> <translation type="unfinished">Sélectionner plusieurs entrées à afficher.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1319"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1326"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1428"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1435"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1461"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/> <source>Creating branch in 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="1533"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1550"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1557"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1573"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1596"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1603"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <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="1746"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1697"/> - <source>Create changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> - <source>Apply changegroups</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> - <source>Bisect subcommand ({0}) invalid.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> - <source>Mercurial Bisect ({0})</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1655"/> - <source>Mercurial Bundle Files (*.hg)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> - <source>Preview changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1740"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1803"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <source>Mercurial Bisect ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1698"/> + <source>Mercurial Bundle Files (*.hg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1752"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> <source>Mercurial Bundle Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1626"/> + <source>Identifying project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <source>Create .hgignore file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> + <source>Removing files from the Mercurial repository only</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -15871,100 +15891,115 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="460"/> <source>Version Control</source> <translation type="unfinished">Contrôle de version</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="461"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="471"/> <source>Commit changes to repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="466"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="476"/> <source>Add to repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="469"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="479"/> <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"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="401"/> <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"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403"/> <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"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="406"/> <source>Show log</source> <translation type="unfinished">Afficher le log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="399"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="409"/> <source>Show limited log</source> <translation type="unfinished">Afficher un log limité</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="412"/> <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"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484"/> <source>Show status</source> <translation type="unfinished">Afficher l'état (status)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="488"/> <source>Show difference</source> <translation type="unfinished">Afficher les différences</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="491"/> <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"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="240"/> <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>Revert changes</source> - <translation type="unfinished">Revenir avant les modifications</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="489"/> - <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>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>Revert changes</source> + <translation type="unfinished">Revenir avant les modifications</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="499"/> + <source>Resolve conflict</source> + <translation type="unfinished">Résoudre les conflits</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="502"/> + <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="504"/> + <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="506"/> <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"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="508"/> <source>Select all versioned directory entries</source> <translation type="unfinished">Sélectionner tous les répertoires ayant une version</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <source>Remove from repository only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="615"/> + <source>Do you really want to remove these translation files from the repository?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <source>Do you really want to remove these files from the repository?</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -16654,67 +16689,67 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> - <source>Create .hgignore</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Create a .hgignore file with default values</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> - <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="584"/> - <source>Create changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="584"/> - <source>Create changegroup...</source> + <source>Create .hgignore</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> - <source>Create changegroup file collecting changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> - <source>Apply changegroups</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> - <source>Apply changegroups...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> - <source>Apply one or several changegroup files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> - <source>Changegroup Management</source> + <source>Create a .hgignore file with default values</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> + <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="597"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="597"/> + <source>Create changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <source>Create changegroup file collecting changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <source>Apply changegroups...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <source>Apply one or several changegroup files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> + <source>Changegroup Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <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="619"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> <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> @@ -16734,100 +16769,120 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> - <source>Mark a selectable changeset as good</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> - <source>Mark as "bad"</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> - <source>Mark a selectable changeset as bad</source> + <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> - <source>Skip</source> - <translation type="unfinished">Passer</translation> + <source>Mark as "bad"</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> - <source>Skip the current changeset</source> + <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> - <source><b>Skip</b><p>This skips the current changeset.</p></source> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> - <source>Reset</source> - <translation type="unfinished">Réinitialiser</translation> + <source>Skip</source> + <translation type="unfinished">Passer</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> - <source>Reset the bisect search data</source> + <source>Skip the current changeset</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <source><b>Skip</b><p>This skips the current changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="679"/> + <source>Reset</source> + <translation type="unfinished">Réinitialiser</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <source>Reset the bisect search data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> - <source>Mark as "good"...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> + <source>Mark as "good"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source>Preview a changegroup file containing a collecting of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collecting of changesets.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Identify</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Identify...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <source>Identify the project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> + <source><b>Identify</b><p>This identifies the project directory.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -17023,7 +17078,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="186"/> <source>Mercurial Status</source> <translation type="unfinished"></translation> </message> @@ -17109,95 +17164,110 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="61"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="63"/> <source>Revert changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="64"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="66"/> <source>Adjust column sizes</source> <translation type="unfinished">Ajuster la largeur des colonnes</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="85"/> - <source>added</source> - <translation type="unfinished">ajouté</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="88"/> - <source>modified</source> - <translation type="unfinished">modifié</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="89"/> - <source>removed</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="90"/> - <source>not tracked</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="86"/> - <source>normal</source> - <translation type="unfinished">normal</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="87"/> - <source>ignored</source> - <translation type="unfinished">ignoré</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="91"/> + <source>added</source> + <translation type="unfinished">ajouté</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="94"/> + <source>modified</source> + <translation type="unfinished">modifié</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> + <source>removed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="96"/> + <source>not tracked</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="92"/> + <source>normal</source> + <translation type="unfinished">normal</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="93"/> + <source>ignored</source> + <translation type="unfinished">ignoré</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="97"/> <source>missing</source> <translation type="unfinished">manquant</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="187"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="193"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="187"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="193"/> <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/HgStatusDialog.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="374"/> <source>Commit</source> <translation type="unfinished">Commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="414"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="435"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished">Il n'y a pas de modification non commitée disponible/sélectionnée.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="400"/> <source>Add</source> <translation type="unfinished">Ajouter</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="400"/> <source>There are no unversioned entries available/selected.</source> <translation type="unfinished">Aucune entrée "non-versionnée" disponible/sélectionnée.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="414"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="435"/> <source>Revert</source> <translation type="unfinished">Recouvrir</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="61"/> + <source>Remove from repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="420"/> + <source>Remove</source> + <translation type="unfinished">Supprimer</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="420"/> + <source>There are no missing entries available/selected.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgStatusMonitorThread</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="103"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="107"/> <source>Mercurial status checked successfully</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="118"/> <source>Could not start the Mercurial process.</source> <translation type="unfinished"></translation> </message> @@ -23523,12 +23593,12 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="828"/> + <location filename="Preferences/__init__.py" line="829"/> <source>Export Preferences</source> <translation>Export des préférences</translation> </message> <message> - <location filename="Preferences/__init__.py" line="847"/> + <location filename="Preferences/__init__.py" line="848"/> <source>Import Preferences</source> <translation>Import des préférences</translation> </message> @@ -25302,34 +25372,39 @@ <context> <name>ProjectBrowser</name> <message> - <location filename="Project/ProjectBrowser.py" line="71"/> + <location filename="Project/ProjectBrowser.py" line="72"/> <source>files added</source> <translation>fichiers ajoutés</translation> </message> <message> - <location filename="Project/ProjectBrowser.py" line="72"/> + <location filename="Project/ProjectBrowser.py" line="73"/> <source>local modifications</source> <translation>modifications locales</translation> </message> <message> + <location filename="Project/ProjectBrowser.py" line="76"/> + <source>update required</source> + <translation>mise à jour nécessaire</translation> + </message> + <message> + <location filename="Project/ProjectBrowser.py" line="77"/> + <source>conflict</source> + <translation>conflit</translation> + </message> + <message> + <location filename="Project/ProjectBrowser.py" line="71"/> + <source>up to date</source> + <translation>à jour</translation> + </message> + <message> + <location filename="Project/ProjectBrowser.py" line="75"/> + <source>files replaced</source> + <translation>fichiers remplacés</translation> + </message> + <message> <location filename="Project/ProjectBrowser.py" line="74"/> - <source>update required</source> - <translation>mise à jour nécessaire</translation> - </message> - <message> - <location filename="Project/ProjectBrowser.py" line="75"/> - <source>conflict</source> - <translation>conflit</translation> - </message> - <message> - <location filename="Project/ProjectBrowser.py" line="70"/> - <source>up to date</source> - <translation>à jour</translation> - </message> - <message> - <location filename="Project/ProjectBrowser.py" line="73"/> - <source>files replaced</source> - <translation>fichiers remplacés</translation> + <source>files removed</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -25345,7 +25420,7 @@ <translation>VCS Status</translation> </message> <message> - <location filename="Project/ProjectBrowserModel.py" line="599"/> + <location filename="Project/ProjectBrowserModel.py" line="601"/> <source>local</source> <translation>local</translation> </message> @@ -33747,17 +33822,17 @@ <context> <name>SvnProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="595"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="594"/> <source>Update from repository</source> <translation>Mettre à jour à partir du référentiel (update)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="597"/> <source>Commit changes to repository...</source> <translation>Appliquer des changements dans le référentiel. (commit)...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="603"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="602"/> <source>Add to repository</source> <translation>Ajouter au référentiel (add)</translation> </message> @@ -33767,117 +33842,117 @@ <translation>Ajouter l'arborescence au référentiel (add)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="606"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="605"/> <source>Remove from repository (and disk)</source> <translation>Supprimer du référentiel (et du disque)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="499"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="498"/> <source>Copy in repository</source> <translation>Copier dans le référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="501"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="500"/> <source>Move in repository</source> <translation>Déplacer dans le référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="512"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="511"/> <source>Show log</source> <translation>Afficher le log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="619"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="618"/> <source>Show status</source> <translation>Afficher l'état (status)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="623"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="622"/> <source>Show difference</source> <translation>Afficher les différences</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="625"/> <source>Show difference (extended)</source> <translation>Afficher les différences (étendu)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="635"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="634"/> <source>Revert changes</source> <translation>Revenir avant les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="638"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="637"/> <source>Merge changes</source> <translation>Fusionner les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="640"/> <source>Resolve conflict</source> <translation>Résoudre les conflits</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="643"/> <source>Set Property</source> <translation>Définir une propriété</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="646"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="645"/> <source>List Properties</source> <translation>Lister les propriétés</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="648"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="647"/> <source>Delete Property</source> <translation>Supprimer une propriété</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="651"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="650"/> <source>Select all local file entries</source> <translation>Sélectionner tous les fichiers locaux</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="653"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="652"/> <source>Select all versioned file entries</source> <translation>Sélectionner tous les fichiers ayant une version</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="655"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="654"/> <source>Select all local directory entries</source> <translation>Sélectionner tous les répertoires locaux</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="657"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="656"/> <source>Select all versioned directory entries</source> <translation>Sélectionner tous les répertoires ayant une version</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="515"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="514"/> <source>Show limited log</source> <translation>Afficher un log limité</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="393"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="392"/> <source>Lock</source> <translation>Verrouiller</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="396"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="395"/> <source>Unlock</source> <translation>Déverrouiller</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="399"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="398"/> <source>Break Lock</source> <translation>Casser le verrouillage d'un autre utilisateur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="402"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="401"/> <source>Steal Lock</source> <translation>Voler le verrou</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="584"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="583"/> <source>Version Control</source> <translation>Contrôle de version</translation> </message> @@ -33887,32 +33962,32 @@ <translation>Afficher les fichiers annotés</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="525"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="524"/> <source>Show repository info</source> <translation>Afficher les infos du référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="630"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="629"/> <source>Show difference (URLs)</source> <translation>Afficher les différences (URLs)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="518"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="517"/> <source>Show log browser</source> <translation>Afficher le navigateur de logs</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="660"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="659"/> <source>Configure...</source> <translation>Configuration...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="612"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="611"/> <source>Add to Changelist</source> <translation>Ajouter à la liste des modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="615"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="614"/> <source>Remove from Changelist</source> <translation>Supprimer de la liste des modifications</translation> </message> @@ -41731,6 +41806,16 @@ <source>Automatic updates enabled</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/VcsPage.ui" line="262"/> + <source>VCS status "removed":</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/VcsPage.ui" line="275"/> + <source>Select the background colour for entries with VCS status "removed".</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>VcsProjectBrowserHelper</name> @@ -45253,30 +45338,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1014"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1381"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1388"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1385"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1392"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1033"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1047"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1054"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -45287,23 +45372,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1382"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1377"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1384"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1389"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1396"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1392"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1399"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr>
--- a/i18n/eric5_it.ts Fri Apr 30 16:45:56 2010 +0000 +++ b/i18n/eric5_it.ts Sat May 01 18:26:14 2010 +0000 @@ -14188,205 +14188,225 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="164"/> <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="165"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="167"/> + <source>The hg process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="169"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="222"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="238"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="377"/> <source>Commiting changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="416"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="423"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="464"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="471"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="524"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="582"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="589"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="690"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="697"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="720"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="727"/> <source>Reverting changes</source> <translation type="unfinished">Annullamento modifiche</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="761"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="768"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="961"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="968"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1130"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> <source>Select number of entries to show.</source> <translation type="unfinished">Mostra il numero di elementi da mostrare.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1319"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1326"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1428"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1435"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1461"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/> <source>Creating branch in 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="1533"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1550"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1557"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1573"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1596"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1603"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <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="1746"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1697"/> - <source>Create changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> - <source>Apply changegroups</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> - <source>Bisect subcommand ({0}) invalid.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> - <source>Mercurial Bisect ({0})</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1655"/> - <source>Mercurial Bundle Files (*.hg)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> - <source>Preview changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1740"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1803"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <source>Mercurial Bisect ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1698"/> + <source>Mercurial Bundle Files (*.hg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1752"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> <source>Mercurial Bundle Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1626"/> + <source>Identifying project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <source>Create .hgignore file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> + <source>Removing files from the Mercurial repository only</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -15537,100 +15557,115 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="460"/> <source>Version Control</source> <translation type="unfinished">Controllo di Versione</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="461"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="471"/> <source>Commit changes to repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="466"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="476"/> <source>Add to repository</source> <translation type="unfinished">Aggiungi al repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="469"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="479"/> <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"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="401"/> <source>Copy in repository</source> <translation type="unfinished">Copia nel repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="393"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403"/> <source>Move in repository</source> <translation type="unfinished">Muovi nel repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="396"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="406"/> <source>Show log</source> <translation type="unfinished">Mostra log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="399"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="409"/> <source>Show limited log</source> <translation type="unfinished">Mostra log ridotto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="412"/> <source>Show log browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="474"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484"/> <source>Show status</source> <translation type="unfinished">Mostra stato</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="488"/> <source>Show difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="491"/> <source>Show difference (extended)</source> <translation type="unfinished">Mostra differenza (esteso)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="240"/> <source>Show annotated file</source> <translation type="unfinished">Mostra file appuntati</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="486"/> - <source>Revert changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="489"/> - <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>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>Revert changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="499"/> + <source>Resolve conflict</source> + <translation type="unfinished">Risolvi conflitti</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="502"/> + <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="504"/> + <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="506"/> <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"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="508"/> <source>Select all versioned directory entries</source> <translation type="unfinished">Seleziona tutte le directory controllate</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <source>Remove from repository only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="615"/> + <source>Do you really want to remove these translation files from the repository?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <source>Do you really want to remove these files from the repository?</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -16320,67 +16355,67 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> - <source>Create .hgignore</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Create a .hgignore file with default values</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> - <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="584"/> - <source>Create changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="584"/> - <source>Create changegroup...</source> + <source>Create .hgignore</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> - <source>Create changegroup file collecting changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> - <source>Apply changegroups</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> - <source>Apply changegroups...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> - <source>Apply one or several changegroup files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> - <source>Changegroup Management</source> + <source>Create a .hgignore file with default values</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> + <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="597"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="597"/> + <source>Create changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <source>Create changegroup file collecting changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <source>Apply changegroups...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <source>Apply one or several changegroup files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> + <source>Changegroup Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <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="619"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> <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> @@ -16400,100 +16435,120 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> - <source>Mark a selectable changeset as good</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> - <source>Mark as "bad"</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> - <source>Mark a selectable changeset as bad</source> + <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> - <source>Skip</source> - <translation type="unfinished">Salta</translation> + <source>Mark as "bad"</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> - <source>Skip the current changeset</source> + <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> - <source><b>Skip</b><p>This skips the current changeset.</p></source> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> - <source>Reset</source> - <translation type="unfinished">Resetta</translation> + <source>Skip</source> + <translation type="unfinished">Salta</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> - <source>Reset the bisect search data</source> + <source>Skip the current changeset</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <source><b>Skip</b><p>This skips the current changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="679"/> + <source>Reset</source> + <translation type="unfinished">Resetta</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <source>Reset the bisect search data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> - <source>Mark as "good"...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> + <source>Mark as "good"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source>Preview a changegroup file containing a collecting of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collecting of changesets.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Identify</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Identify...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <source>Identify the project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> + <source><b>Identify</b><p>This identifies the project directory.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -16689,7 +16744,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="186"/> <source>Mercurial Status</source> <translation type="unfinished"></translation> </message> @@ -16775,95 +16830,110 @@ <translation type="unfinished">Aggiungi al repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="61"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="63"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="64"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="66"/> <source>Adjust column sizes</source> <translation type="unfinished">Adatta dimensione colonne</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="85"/> - <source>added</source> - <translation type="unfinished">aggiunto</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="88"/> - <source>modified</source> - <translation type="unfinished">modificato</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="89"/> - <source>removed</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="90"/> - <source>not tracked</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="86"/> - <source>normal</source> - <translation type="unfinished">normale</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="87"/> - <source>ignored</source> - <translation type="unfinished">ignorato</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="91"/> + <source>added</source> + <translation type="unfinished">aggiunto</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="94"/> + <source>modified</source> + <translation type="unfinished">modificato</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> + <source>removed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="96"/> + <source>not tracked</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="92"/> + <source>normal</source> + <translation type="unfinished">normale</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="93"/> + <source>ignored</source> + <translation type="unfinished">ignorato</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="97"/> <source>missing</source> <translation type="unfinished">mancante</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="187"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="193"/> <source>Process Generation Error</source> <translation type="unfinished">Errore Generazione Processo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="187"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="193"/> <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/HgStatusDialog.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="374"/> <source>Commit</source> <translation type="unfinished">Commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="414"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="435"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished">Non ci sono modifiche disponibili/selezionate da committare.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="400"/> <source>Add</source> <translation type="unfinished">Aggiungi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="400"/> <source>There are no unversioned entries available/selected.</source> <translation type="unfinished">Non ci sono elementi non sotto controllo disponibili/selezionati.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="414"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="435"/> <source>Revert</source> <translation type="unfinished">Inverti</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="61"/> + <source>Remove from repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="420"/> + <source>Remove</source> + <translation type="unfinished">Rimuovi</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="420"/> + <source>There are no missing entries available/selected.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgStatusMonitorThread</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="103"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="107"/> <source>Mercurial status checked successfully</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="118"/> <source>Could not start the Mercurial process.</source> <translation type="unfinished"></translation> </message> @@ -23259,12 +23329,12 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="828"/> + <location filename="Preferences/__init__.py" line="829"/> <source>Export Preferences</source> <translation>Esporta Preferenze</translation> </message> <message> - <location filename="Preferences/__init__.py" line="847"/> + <location filename="Preferences/__init__.py" line="848"/> <source>Import Preferences</source> <translation>Importa Preferenze</translation> </message> @@ -24948,34 +25018,39 @@ <context> <name>ProjectBrowser</name> <message> - <location filename="Project/ProjectBrowser.py" line="71"/> + <location filename="Project/ProjectBrowser.py" line="72"/> <source>files added</source> <translation>file aggiunti</translation> </message> <message> - <location filename="Project/ProjectBrowser.py" line="72"/> + <location filename="Project/ProjectBrowser.py" line="73"/> <source>local modifications</source> <translation>modifiche locali</translation> </message> <message> + <location filename="Project/ProjectBrowser.py" line="76"/> + <source>update required</source> + <translation>aggiornamento richiesto</translation> + </message> + <message> + <location filename="Project/ProjectBrowser.py" line="77"/> + <source>conflict</source> + <translation>conflitto</translation> + </message> + <message> + <location filename="Project/ProjectBrowser.py" line="71"/> + <source>up to date</source> + <translation>aggiornato</translation> + </message> + <message> + <location filename="Project/ProjectBrowser.py" line="75"/> + <source>files replaced</source> + <translation>file sostituiti</translation> + </message> + <message> <location filename="Project/ProjectBrowser.py" line="74"/> - <source>update required</source> - <translation>aggiornamento richiesto</translation> - </message> - <message> - <location filename="Project/ProjectBrowser.py" line="75"/> - <source>conflict</source> - <translation>conflitto</translation> - </message> - <message> - <location filename="Project/ProjectBrowser.py" line="70"/> - <source>up to date</source> - <translation>aggiornato</translation> - </message> - <message> - <location filename="Project/ProjectBrowser.py" line="73"/> - <source>files replaced</source> - <translation>file sostituiti</translation> + <source>files removed</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -24991,7 +25066,7 @@ <translation>Stato VCS</translation> </message> <message> - <location filename="Project/ProjectBrowserModel.py" line="599"/> + <location filename="Project/ProjectBrowserModel.py" line="601"/> <source>local</source> <translation>locale</translation> </message> @@ -32761,17 +32836,17 @@ <context> <name>SvnProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="595"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="594"/> <source>Update from repository</source> <translation>Aggiorna da repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="597"/> <source>Commit changes to repository...</source> <translation>Committa le modifica nel repository...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="603"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="602"/> <source>Add to repository</source> <translation>Aggiungi al repository</translation> </message> @@ -32781,117 +32856,117 @@ <translation>Aggiungi albero al repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="606"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="605"/> <source>Remove from repository (and disk)</source> <translation>Rimuovi dal repository (e dal disco)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="499"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="498"/> <source>Copy in repository</source> <translation>Copia nel repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="501"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="500"/> <source>Move in repository</source> <translation>Muovi nel repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="512"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="511"/> <source>Show log</source> <translation>Mostra log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="619"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="618"/> <source>Show status</source> <translation>Mostra stato</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="623"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="622"/> <source>Show difference</source> <translation>Mostra differenza</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="625"/> <source>Show difference (extended)</source> <translation>Mostra differenza (esteso)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="635"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="634"/> <source>Revert changes</source> <translation>Annulla modifiche</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="638"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="637"/> <source>Merge changes</source> <translation>Fondi modifiche</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="640"/> <source>Resolve conflict</source> <translation>Risolvi conflitti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="643"/> <source>Set Property</source> <translation>Imposta proprietà</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="646"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="645"/> <source>List Properties</source> <translation>Elenca proprietà</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="648"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="647"/> <source>Delete Property</source> <translation>Cancella proprietà</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="651"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="650"/> <source>Select all local file entries</source> <translation>Seleziona tutt i file locali</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="653"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="652"/> <source>Select all versioned file entries</source> <translation>Seleziona tutti i file controllati</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="655"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="654"/> <source>Select all local directory entries</source> <translation>Seleziona tutte le directory locali</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="657"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="656"/> <source>Select all versioned directory entries</source> <translation>Seleziona tutte le directory controllate</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="515"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="514"/> <source>Show limited log</source> <translation>Mostra log ridotto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="393"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="392"/> <source>Lock</source> <translation>Lock</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="396"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="395"/> <source>Unlock</source> <translation>Unlock</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="399"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="398"/> <source>Break Lock</source> <translation>Spezza lock</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="402"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="401"/> <source>Steal Lock</source> <translation>Ruba lock</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="584"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="583"/> <source>Version Control</source> <translation>Controllo di Versione</translation> </message> @@ -32901,32 +32976,32 @@ <translation>Mostra file appuntati</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="525"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="524"/> <source>Show repository info</source> <translation>Mostra informazioni del repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="630"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="629"/> <source>Show difference (URLs)</source> <translation>Mostra differenze (URL)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="518"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="517"/> <source>Show log browser</source> <translation>Mostra il browser dei log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="660"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="659"/> <source>Configure...</source> <translation>Configura...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="612"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="611"/> <source>Add to Changelist</source> <translation>Aggiungi alla Changelist</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="615"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="614"/> <source>Remove from Changelist</source> <translation>Rimuovi dalla Changelist</translation> </message> @@ -40638,6 +40713,16 @@ <source>Automatic updates enabled</source> <translation>Aggiornamenti automatici abilitati</translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/VcsPage.ui" line="262"/> + <source>VCS status "removed":</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/VcsPage.ui" line="275"/> + <source>Select the background colour for entries with VCS status "removed".</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>VcsProjectBrowserHelper</name> @@ -44144,30 +44229,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1014"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1381"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1388"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1385"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1392"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1033"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1047"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1054"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -44178,23 +44263,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1382"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1377"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1384"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1389"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1396"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1392"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1399"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr>
--- a/i18n/eric5_ru.ts Fri Apr 30 16:45:56 2010 +0000 +++ b/i18n/eric5_ru.ts Sat May 01 18:26:14 2010 +0000 @@ -13770,205 +13770,225 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="164"/> <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="165"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="167"/> + <source>The hg process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="169"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="222"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="238"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="377"/> <source>Commiting changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="416"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="423"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="464"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="471"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="524"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="582"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="589"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="761"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="768"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1130"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> <source>Select number of entries to show.</source> <translation type="unfinished">Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1319"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1326"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1428"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1435"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="690"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="697"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="720"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="727"/> <source>Reverting changes</source> <translation type="unfinished">Отменяю изменения</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="961"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="968"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1461"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/> <source>Creating branch in 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="1533"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1550"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1557"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1573"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1596"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1603"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <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="1746"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1697"/> - <source>Create changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> - <source>Apply changegroups</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> - <source>Bisect subcommand ({0}) invalid.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> - <source>Mercurial Bisect ({0})</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1655"/> - <source>Mercurial Bundle Files (*.hg)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> - <source>Preview changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1740"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1803"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <source>Mercurial Bisect ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1698"/> + <source>Mercurial Bundle Files (*.hg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1752"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> <source>Mercurial Bundle Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1626"/> + <source>Identifying project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <source>Create .hgignore file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> + <source>Removing files from the Mercurial repository only</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -15123,100 +15143,115 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="460"/> <source>Version Control</source> <translation type="unfinished">Контроль версий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="461"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="471"/> <source>Commit changes to repository...</source> <translation type="unfinished">Зафиксировать изменения в репозитории...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="466"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="476"/> <source>Add to repository</source> <translation type="unfinished">Добавить в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="469"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="479"/> <source>Remove from repository (and disk)</source> <translation type="unfinished">Удаление из репозитория (и с диска)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="391"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="401"/> <source>Copy in repository</source> <translation type="unfinished">Копировать в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="393"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403"/> <source>Move in repository</source> <translation type="unfinished">Переместить в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="396"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="406"/> <source>Show log</source> <translation type="unfinished">Показать журнал</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="399"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="409"/> <source>Show limited log</source> <translation type="unfinished">Показать ограниченный журнал</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="412"/> <source>Show log browser</source> <translation type="unfinished">Показать проводник журналов</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="488"/> <source>Show difference</source> <translation type="unfinished">Показать различие</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="491"/> <source>Show difference (extended)</source> <translation type="unfinished">Показать различие (расширенно)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="489"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="499"/> <source>Resolve conflict</source> <translation type="unfinished">Разрешить конфликт</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="492"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="502"/> <source>Select all local file entries</source> <translation type="unfinished">Выделить все локальные файлы</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="494"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="504"/> <source>Select all versioned file entries</source> <translation type="unfinished">Выделить все файлы с версиями (VCS)</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="506"/> + <source>Select all local directory entries</source> + <translation type="unfinished">Выделить все локальные каталоги</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="508"/> + <source>Select all versioned directory entries</source> + <translation type="unfinished">Выделить все каталоги с версиями (VCS)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484"/> + <source>Show status</source> + <translation type="unfinished">Показать статус</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="240"/> + <source>Show annotated file</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>Select all versioned directory entries</source> - <translation type="unfinished">Выделить все каталоги с версиями (VCS)</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="233"/> - <source>Show annotated file</source> - <translation type="unfinished">Показать файл, снабжённый комментариями</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="486"/> <source>Revert changes</source> <translation type="unfinished">Отмена изменений</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <source>Remove from repository only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="615"/> + <source>Do you really want to remove these translation files from the repository?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <source>Do you really want to remove these files from the repository?</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -15908,67 +15943,67 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> - <source>Create .hgignore</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Create a .hgignore file with default values</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> - <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="584"/> - <source>Create changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="584"/> - <source>Create changegroup...</source> + <source>Create .hgignore</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> - <source>Create changegroup file collecting changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> - <source>Apply changegroups</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> - <source>Apply changegroups...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> - <source>Apply one or several changegroup files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> - <source>Changegroup Management</source> + <source>Create a .hgignore file with default values</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> + <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="597"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="597"/> + <source>Create changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <source>Create changegroup file collecting changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <source>Apply changegroups...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <source>Apply one or several changegroup files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> + <source>Changegroup Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <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="619"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> <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> @@ -15988,100 +16023,120 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> - <source>Mark a selectable changeset as good</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> - <source>Mark as "bad"</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> - <source>Mark a selectable changeset as bad</source> + <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> - <source>Skip</source> - <translation type="unfinished">Пропустить</translation> + <source>Mark as "bad"</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> - <source>Skip the current changeset</source> + <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> - <source><b>Skip</b><p>This skips the current changeset.</p></source> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> - <source>Reset</source> - <translation type="unfinished"></translation> + <source>Skip</source> + <translation type="unfinished">Пропустить</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> - <source>Reset the bisect search data</source> + <source>Skip the current changeset</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <source><b>Skip</b><p>This skips the current changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="679"/> + <source>Reset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <source>Reset the bisect search data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> - <source>Mark as "good"...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> + <source>Mark as "good"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source>Preview a changegroup file containing a collecting of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collecting of changesets.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Identify</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Identify...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <source>Identify the project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> + <source><b>Identify</b><p>This identifies the project directory.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -16307,7 +16362,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="186"/> <source>Mercurial Status</source> <translation type="unfinished"></translation> </message> @@ -16393,95 +16448,110 @@ <translation type="unfinished">Добавить в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="61"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="63"/> <source>Revert changes</source> <translation type="unfinished">Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="64"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="66"/> <source>Adjust column sizes</source> <translation type="unfinished">Подстроить размеры колонок</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="85"/> - <source>added</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="88"/> - <source>modified</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="89"/> - <source>removed</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="90"/> - <source>not tracked</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="86"/> - <source>normal</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="87"/> - <source>ignored</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="91"/> + <source>added</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="94"/> + <source>modified</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> + <source>removed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="96"/> + <source>not tracked</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="92"/> + <source>normal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="93"/> + <source>ignored</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="97"/> <source>missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="187"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="193"/> <source>Process Generation Error</source> <translation type="unfinished">Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="187"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="193"/> <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/HgStatusDialog.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="374"/> <source>Commit</source> <translation type="unfinished">Зафиксировать</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="414"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="435"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished">Нет доступных/выбранных неотправленных изменений.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="400"/> <source>Add</source> <translation type="unfinished">Добавить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="400"/> <source>There are no unversioned entries available/selected.</source> <translation type="unfinished">Нет/не выбраны неверсионные элементы.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="414"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="435"/> <source>Revert</source> <translation type="unfinished">Откатить</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="61"/> + <source>Remove from repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="420"/> + <source>Remove</source> + <translation type="unfinished">Удалить</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="420"/> + <source>There are no missing entries available/selected.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgStatusMonitorThread</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="103"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="107"/> <source>Mercurial status checked successfully</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="118"/> <source>Could not start the Mercurial process.</source> <translation type="unfinished"></translation> </message> @@ -22590,12 +22660,12 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="828"/> + <location filename="Preferences/__init__.py" line="829"/> <source>Export Preferences</source> <translation>Экспорт предпочтений</translation> </message> <message> - <location filename="Preferences/__init__.py" line="847"/> + <location filename="Preferences/__init__.py" line="848"/> <source>Import Preferences</source> <translation>Импорт предпочтений</translation> </message> @@ -24127,34 +24197,39 @@ <context> <name>ProjectBrowser</name> <message> - <location filename="Project/ProjectBrowser.py" line="71"/> + <location filename="Project/ProjectBrowser.py" line="72"/> <source>files added</source> <translation>добавленные файлы</translation> </message> <message> - <location filename="Project/ProjectBrowser.py" line="72"/> + <location filename="Project/ProjectBrowser.py" line="73"/> <source>local modifications</source> <translation>локальные изменения</translation> </message> <message> + <location filename="Project/ProjectBrowser.py" line="76"/> + <source>update required</source> + <translation>необходимо обновление</translation> + </message> + <message> + <location filename="Project/ProjectBrowser.py" line="77"/> + <source>conflict</source> + <translation>конфликт</translation> + </message> + <message> + <location filename="Project/ProjectBrowser.py" line="71"/> + <source>up to date</source> + <translation>новых изменений нет</translation> + </message> + <message> + <location filename="Project/ProjectBrowser.py" line="75"/> + <source>files replaced</source> + <translation>файлы заменены</translation> + </message> + <message> <location filename="Project/ProjectBrowser.py" line="74"/> - <source>update required</source> - <translation>необходимо обновление</translation> - </message> - <message> - <location filename="Project/ProjectBrowser.py" line="75"/> - <source>conflict</source> - <translation>конфликт</translation> - </message> - <message> - <location filename="Project/ProjectBrowser.py" line="70"/> - <source>up to date</source> - <translation>новых изменений нет</translation> - </message> - <message> - <location filename="Project/ProjectBrowser.py" line="73"/> - <source>files replaced</source> - <translation>файлы заменены</translation> + <source>files removed</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -24170,7 +24245,7 @@ <translation>Статус VCS</translation> </message> <message> - <location filename="Project/ProjectBrowserModel.py" line="599"/> + <location filename="Project/ProjectBrowserModel.py" line="601"/> <source>local</source> <translation>локальный</translation> </message> @@ -31495,17 +31570,17 @@ <context> <name>SvnProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="595"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="594"/> <source>Update from repository</source> <translation>Загрузить из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="597"/> <source>Commit changes to repository...</source> <translation>Зафиксировать изменения в репозитории...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="603"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="602"/> <source>Add to repository</source> <translation>Добавить в репозиторий</translation> </message> @@ -31515,117 +31590,117 @@ <translation>Добавить дерево в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="606"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="605"/> <source>Remove from repository (and disk)</source> <translation>Удаление из репозитория (и с диска)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="499"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="498"/> <source>Copy in repository</source> <translation>Копировать в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="501"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="500"/> <source>Move in repository</source> <translation>Переместить в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="512"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="511"/> <source>Show log</source> <translation>Показать журнал</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="619"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="618"/> <source>Show status</source> <translation>Показать статус</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="623"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="622"/> <source>Show difference</source> <translation>Показать различие</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="625"/> <source>Show difference (extended)</source> <translation>Показать различие (расширенно)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="635"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="634"/> <source>Revert changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="638"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="637"/> <source>Merge changes</source> <translation>Слияние изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="640"/> <source>Resolve conflict</source> <translation>Разрешить конфликт</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="643"/> <source>Set Property</source> <translation>Установить свойство</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="646"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="645"/> <source>List Properties</source> <translation>Список свойств</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="648"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="647"/> <source>Delete Property</source> <translation>Удалить свойство</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="651"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="650"/> <source>Select all local file entries</source> <translation>Выделить все локальные файлы</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="653"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="652"/> <source>Select all versioned file entries</source> <translation>Выделить все файлы с версиями (VCS)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="655"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="654"/> <source>Select all local directory entries</source> <translation>Выделить все локальные каталоги</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="657"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="656"/> <source>Select all versioned directory entries</source> <translation>Выделить все каталоги с версиями (VCS)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="515"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="514"/> <source>Show limited log</source> <translation>Показать ограниченный журнал</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="393"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="392"/> <source>Lock</source> <translation>Захватить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="396"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="395"/> <source>Unlock</source> <translation>Освободить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="399"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="398"/> <source>Break Lock</source> <translation>Нарушить захват</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="402"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="401"/> <source>Steal Lock</source> <translation>Украсть захват</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="584"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="583"/> <source>Version Control</source> <translation>Контроль версий</translation> </message> @@ -31635,32 +31710,32 @@ <translation>Показать файл, снабжённый комментариями</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="525"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="524"/> <source>Show repository info</source> <translation>Показать информацию о репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="630"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="629"/> <source>Show difference (URLs)</source> <translation>Показать разницу (URL)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="518"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="517"/> <source>Show log browser</source> <translation>Показать проводник журналов</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="660"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="659"/> <source>Configure...</source> <translation>Настроить...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="612"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="611"/> <source>Add to Changelist</source> <translation>Добавить к списку изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="615"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="614"/> <source>Remove from Changelist</source> <translation>Удалить из списка изменений</translation> </message> @@ -39111,6 +39186,16 @@ <source>Automatic updates enabled</source> <translation>Автоматическое обновление разрешено</translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/VcsPage.ui" line="262"/> + <source>VCS status "removed":</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/VcsPage.ui" line="275"/> + <source>Select the background colour for entries with VCS status "removed".</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>VcsProjectBrowserHelper</name> @@ -42611,17 +42696,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1381"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1388"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1385"/> - <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1392"/> + <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1399"/> <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> @@ -42629,36 +42714,36 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1382"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1377"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1384"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1389"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1396"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1014"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1033"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1047"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1054"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric5_tr.ts Fri Apr 30 16:45:56 2010 +0000 +++ b/i18n/eric5_tr.ts Sat May 01 18:26:14 2010 +0000 @@ -14455,205 +14455,225 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="164"/> <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="165"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="167"/> + <source>The hg process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="169"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="222"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="238"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="377"/> <source>Commiting changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="416"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="423"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="464"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="471"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="524"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="582"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="589"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="690"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="697"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="720"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="727"/> <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="761"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="768"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="961"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="968"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1130"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> <source>Select number of entries to show.</source> <translation type="unfinished">gösterilecek giriş miktarını seç.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1319"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1326"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1428"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1435"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1461"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/> <source>Creating branch in 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="1533"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1550"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1557"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1573"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1596"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1603"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <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="1746"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1697"/> - <source>Create changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> - <source>Apply changegroups</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> - <source>Bisect subcommand ({0}) invalid.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> - <source>Mercurial Bisect ({0})</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1655"/> - <source>Mercurial Bundle Files (*.hg)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> - <source>Preview changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1740"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1803"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <source>Mercurial Bisect ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1698"/> + <source>Mercurial Bundle Files (*.hg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1752"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> <source>Mercurial Bundle Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1626"/> + <source>Identifying project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <source>Create .hgignore file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> + <source>Removing files from the Mercurial repository only</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -15766,100 +15786,115 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="460"/> <source>Version Control</source> <translation type="unfinished">Sürüm Kontrol</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="461"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="471"/> <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"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="476"/> <source>Add to repository</source> <translation type="unfinished">Kaynak havuzuna ekle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="469"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="479"/> <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"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="401"/> <source>Copy in repository</source> <translation type="unfinished">Kaynak havuzuna kopyala</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="393"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403"/> <source>Move in repository</source> <translation type="unfinished">Kaynak havuzuna taşı</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="396"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="406"/> <source>Show log</source> <translation type="unfinished">Kayıtı göster</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="399"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="409"/> <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"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="412"/> <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"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484"/> <source>Show status</source> <translation type="unfinished">Durumu Göster</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="488"/> <source>Show difference</source> <translation type="unfinished">Farkları göster</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="491"/> <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"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="240"/> <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>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>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>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>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="499"/> + <source>Resolve conflict</source> + <translation type="unfinished">Çelişkiyi çözümle</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="502"/> + <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="504"/> + <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="506"/> <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"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="508"/> <source>Select all versioned directory entries</source> <translation type="unfinished">Giriş yapılan tüm dizinleri seç</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <source>Remove from repository only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="615"/> + <source>Do you really want to remove these translation files from the repository?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <source>Do you really want to remove these files from the repository?</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -16549,67 +16584,67 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> - <source>Create .hgignore</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Create a .hgignore file with default values</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> - <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="584"/> - <source>Create changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="584"/> - <source>Create changegroup...</source> + <source>Create .hgignore</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> - <source>Create changegroup file collecting changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> - <source>Apply changegroups</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> - <source>Apply changegroups...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> - <source>Apply one or several changegroup files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> - <source>Changegroup Management</source> + <source>Create a .hgignore file with default values</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> + <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="597"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="597"/> + <source>Create changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <source>Create changegroup file collecting changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <source>Apply changegroups...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <source>Apply one or several changegroup files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> + <source>Changegroup Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <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="619"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> <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> @@ -16629,100 +16664,120 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> - <source>Mark a selectable changeset as good</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> - <source>Mark as "bad"</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> - <source>Mark a selectable changeset as bad</source> + <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> - <source>Skip</source> - <translation type="unfinished">Atla</translation> + <source>Mark as "bad"</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> - <source>Skip the current changeset</source> + <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> - <source><b>Skip</b><p>This skips the current changeset.</p></source> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> - <source>Reset</source> - <translation type="unfinished">Başadön</translation> + <source>Skip</source> + <translation type="unfinished">Atla</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> - <source>Reset the bisect search data</source> + <source>Skip the current changeset</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <source><b>Skip</b><p>This skips the current changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="679"/> + <source>Reset</source> + <translation type="unfinished">Başadön</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <source>Reset the bisect search data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> - <source>Mark as "good"...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> + <source>Mark as "good"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source>Preview a changegroup file containing a collecting of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collecting of changesets.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Identify</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Identify...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <source>Identify the project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> + <source><b>Identify</b><p>This identifies the project directory.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -16918,7 +16973,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="186"/> <source>Mercurial Status</source> <translation type="unfinished"></translation> </message> @@ -17004,95 +17059,110 @@ <translation type="unfinished">Kaynak havuzuna ekle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="61"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="63"/> <source>Revert changes</source> <translation type="unfinished">Değişiklikleri başa döndür</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="64"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="66"/> <source>Adjust column sizes</source> <translation type="unfinished">Sütün boyutlarını ayarla</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="85"/> - <source>added</source> - <translation type="unfinished">eklendi</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="88"/> - <source>modified</source> - <translation type="unfinished">değiştirildi</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="89"/> - <source>removed</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="90"/> - <source>not tracked</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="86"/> - <source>normal</source> - <translation type="unfinished">normal</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="87"/> - <source>ignored</source> - <translation type="unfinished">yoksayldı</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="91"/> + <source>added</source> + <translation type="unfinished">eklendi</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="94"/> + <source>modified</source> + <translation type="unfinished">değiştirildi</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> + <source>removed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="96"/> + <source>not tracked</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="92"/> + <source>normal</source> + <translation type="unfinished">normal</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="93"/> + <source>ignored</source> + <translation type="unfinished">yoksayldı</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="97"/> <source>missing</source> <translation type="unfinished">kayıp</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="187"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="193"/> <source>Process Generation Error</source> <translation type="unfinished">İşlem Üretecinde Hata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="187"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="193"/> <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/HgStatusDialog.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="374"/> <source>Commit</source> <translation type="unfinished">Teslimat</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="414"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="435"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished">Teslimat değişikliği yapılmış mümkün yada seçilebilecek dosyalar yok.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="400"/> <source>Add</source> <translation type="unfinished">Ekle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="400"/> <source>There are no unversioned entries available/selected.</source> <translation type="unfinished">Sürüm numarası verilmemiş mümkün yada seçilebilecek dosyalar yok.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="414"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="435"/> <source>Revert</source> <translation type="unfinished">Başa Dönme</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="61"/> + <source>Remove from repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="420"/> + <source>Remove</source> + <translation type="unfinished">Kaldır</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="420"/> + <source>There are no missing entries available/selected.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgStatusMonitorThread</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="103"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="107"/> <source>Mercurial status checked successfully</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="118"/> <source>Could not start the Mercurial process.</source> <translation type="unfinished"></translation> </message> @@ -23359,12 +23429,12 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="828"/> + <location filename="Preferences/__init__.py" line="829"/> <source>Export Preferences</source> <translation>Tercihleri Dışarı Aktar</translation> </message> <message> - <location filename="Preferences/__init__.py" line="847"/> + <location filename="Preferences/__init__.py" line="848"/> <source>Import Preferences</source> <translation>Tercihleri İçe Aktar</translation> </message> @@ -24948,34 +25018,39 @@ <context> <name>ProjectBrowser</name> <message> - <location filename="Project/ProjectBrowser.py" line="70"/> + <location filename="Project/ProjectBrowser.py" line="71"/> <source>up to date</source> <translation>güncelleniyor</translation> </message> <message> - <location filename="Project/ProjectBrowser.py" line="71"/> - <source>files added</source> - <translation>dosyalar eklendi</translation> - </message> - <message> <location filename="Project/ProjectBrowser.py" line="72"/> - <source>local modifications</source> - <translation>yerel düzenlemeler</translation> + <source>files added</source> + <translation>dosyalar eklendi</translation> </message> <message> <location filename="Project/ProjectBrowser.py" line="73"/> + <source>local modifications</source> + <translation>yerel düzenlemeler</translation> + </message> + <message> + <location filename="Project/ProjectBrowser.py" line="75"/> <source>files replaced</source> <translation>degiştirilen dosyalar</translation> </message> <message> + <location filename="Project/ProjectBrowser.py" line="76"/> + <source>update required</source> + <translation>güncelleme gerekiyor</translation> + </message> + <message> + <location filename="Project/ProjectBrowser.py" line="77"/> + <source>conflict</source> + <translation>çelişki</translation> + </message> + <message> <location filename="Project/ProjectBrowser.py" line="74"/> - <source>update required</source> - <translation>güncelleme gerekiyor</translation> - </message> - <message> - <location filename="Project/ProjectBrowser.py" line="75"/> - <source>conflict</source> - <translation>çelişki</translation> + <source>files removed</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -24991,7 +25066,7 @@ <translation>VCS Durumu</translation> </message> <message> - <location filename="Project/ProjectBrowserModel.py" line="599"/> + <location filename="Project/ProjectBrowserModel.py" line="601"/> <source>local</source> <translation>yerel</translation> </message> @@ -33025,22 +33100,22 @@ <context> <name>SvnProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="584"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="583"/> <source>Version Control</source> <translation>Sürüm Kontrol</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="595"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="594"/> <source>Update from repository</source> <translation>Kaynak Havuzundan güncelle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="597"/> <source>Commit changes to repository...</source> <translation>Yapılan değişiklekleri kaynak havuzuna teslim et...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="603"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="602"/> <source>Add to repository</source> <translation>Kaynak havuzuna ekle</translation> </message> @@ -33050,62 +33125,62 @@ <translation>Kaynak havuzuna dal ekle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="606"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="605"/> <source>Remove from repository (and disk)</source> <translation>Kaynak havuzundan kaldır (ve diskten)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="499"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="498"/> <source>Copy in repository</source> <translation>Kaynak havuzuna kopyala</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="501"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="500"/> <source>Move in repository</source> <translation>Kaynak havuzuna taşı</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="612"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="611"/> <source>Add to Changelist</source> <translation>Değişiklik Listesine Ekle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="615"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="614"/> <source>Remove from Changelist</source> <translation>Değişiklik listesinden çıkar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="512"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="511"/> <source>Show log</source> <translation>Kayıtı göster</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="515"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="514"/> <source>Show limited log</source> <translation>Sınırlı kayıtı göster</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="518"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="517"/> <source>Show log browser</source> <translation>Kayıt gözatıcısını gösted</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="619"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="618"/> <source>Show status</source> <translation>Durumu Göster</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="623"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="622"/> <source>Show difference</source> <translation>Farkları göster</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="625"/> <source>Show difference (extended)</source> <translation>Farkları göster (gelişmiş)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="630"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="629"/> <source>Show difference (URLs)</source> <translation>Farkları göster (URL'ler)</translation> </message> @@ -33115,82 +33190,82 @@ <translation>Açıklama dosyalarını göster</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="635"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="634"/> <source>Revert changes</source> <translation>Değişiklikleri başa döndür</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="638"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="637"/> <source>Merge changes</source> <translation>Değişiklikleri birleştir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="640"/> <source>Resolve conflict</source> <translation>Çelişkiyi çözümle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="393"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="392"/> <source>Lock</source> <translation>Kilitli</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="396"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="395"/> <source>Unlock</source> <translation>Kilitsiz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="399"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="398"/> <source>Break Lock</source> <translation>Kırma Kilidi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="402"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="401"/> <source>Steal Lock</source> <translation>Hırsızlık Kilidi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="643"/> <source>Set Property</source> <translation>Özellikleri Ayarla</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="646"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="645"/> <source>List Properties</source> <translation>Özellikleri Listele</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="648"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="647"/> <source>Delete Property</source> <translation>Özellikleri Sil</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="651"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="650"/> <source>Select all local file entries</source> <translation>tüm yerel dosyalırın girişini seç</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="653"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="652"/> <source>Select all versioned file entries</source> <translation>Giriş yapılan tüm dosyaları seç</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="655"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="654"/> <source>Select all local directory entries</source> <translation>Tüm yerel dizin kalemlerini seç</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="657"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="656"/> <source>Select all versioned directory entries</source> <translation>Giriş yapılan tüm dizinleri seç</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="660"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="659"/> <source>Configure...</source> <translation>Yapılandır...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="525"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="524"/> <source>Show repository info</source> <translation>Kaynak havuzu bilgisini göster</translation> </message> @@ -40851,6 +40926,16 @@ <source>Automatic updates enabled</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/VcsPage.ui" line="262"/> + <source>VCS status "removed":</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/VcsPage.ui" line="275"/> + <source>Select the background colour for entries with VCS status "removed".</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>VcsProjectBrowserHelper</name> @@ -44354,30 +44439,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1014"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1381"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1388"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1385"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1392"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1033"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1047"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1054"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -44388,23 +44473,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1382"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1377"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1384"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1389"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1396"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1392"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1399"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr>
--- a/i18n/eric5_zh_CN.GB2312.ts Fri Apr 30 16:45:56 2010 +0000 +++ b/i18n/eric5_zh_CN.GB2312.ts Sat May 01 18:26:14 2010 +0000 @@ -14495,205 +14495,225 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="164"/> <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="165"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="167"/> + <source>The hg process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="169"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="222"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="238"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="377"/> <source>Commiting changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="416"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="423"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="464"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="471"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="524"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="582"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="589"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="690"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="697"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="720"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="727"/> <source>Reverting changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="761"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="768"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="961"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="968"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1130"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> <source>Select number of entries to show.</source> <translation type="unfinished">选择要显示的条目数。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1319"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1326"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1428"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1435"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1461"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/> <source>Creating branch in 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="1533"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1550"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1557"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1573"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1596"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1603"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <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="1746"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1697"/> - <source>Create changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> - <source>Apply changegroups</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> - <source>Bisect subcommand ({0}) invalid.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> - <source>Mercurial Bisect ({0})</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1655"/> - <source>Mercurial Bundle Files (*.hg)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> - <source>Preview changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1740"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1803"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <source>Mercurial Bisect ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1698"/> + <source>Mercurial Bundle Files (*.hg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1752"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> <source>Mercurial Bundle Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1626"/> + <source>Identifying project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <source>Create .hgignore file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> + <source>Removing files from the Mercurial repository only</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -15843,100 +15863,115 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="460"/> <source>Version Control</source> <translation type="unfinished">版本控制</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="461"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="471"/> <source>Commit changes to repository...</source> <translation type="unfinished">将更改提交到储存库中……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="466"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="476"/> <source>Add to repository</source> <translation type="unfinished">添加到储存库</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="469"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="479"/> <source>Remove from repository (and disk)</source> <translation type="unfinished">从储存库（和磁盘）中移除</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="391"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="401"/> <source>Copy in repository</source> <translation type="unfinished">在储存库中复制</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="393"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403"/> <source>Move in repository</source> <translation type="unfinished">在储存库中移动</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="396"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="406"/> <source>Show log</source> <translation type="unfinished">显示日志</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="399"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="409"/> <source>Show limited log</source> <translation type="unfinished">显示受限日志</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="412"/> <source>Show log browser</source> <translation type="unfinished">显示日志浏览器</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="474"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484"/> <source>Show status</source> <translation type="unfinished">显示状态</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="488"/> <source>Show difference</source> <translation type="unfinished">显示差异</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="491"/> <source>Show difference (extended)</source> <translation type="unfinished">显示差异（扩展）</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="240"/> <source>Show annotated file</source> <translation type="unfinished">显示有注释的文件</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="486"/> - <source>Revert changes</source> - <translation type="unfinished">还原改变</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="489"/> - <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">选择所有版本化的文件条目</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="496"/> + <source>Revert changes</source> + <translation type="unfinished">还原改变</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="499"/> + <source>Resolve conflict</source> + <translation type="unfinished">解析冲突</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="502"/> + <source>Select all local file entries</source> + <translation type="unfinished">选择所有本地文件条目</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="504"/> + <source>Select all versioned file entries</source> + <translation type="unfinished">选择所有版本化的文件条目</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="506"/> <source>Select all local directory entries</source> <translation type="unfinished">选择所有本地文件夹条目</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="508"/> <source>Select all versioned directory entries</source> <translation type="unfinished">选择所有版本化的文件夹条目</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <source>Remove from repository only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="615"/> + <source>Do you really want to remove these translation files from the repository?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <source>Do you really want to remove these files from the repository?</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -16626,67 +16661,67 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> - <source>Create .hgignore</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Create a .hgignore file with default values</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> - <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="584"/> - <source>Create changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="584"/> - <source>Create changegroup...</source> + <source>Create .hgignore</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> - <source>Create changegroup file collecting changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> - <source>Apply changegroups</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> - <source>Apply changegroups...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> - <source>Apply one or several changegroup files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> - <source>Changegroup Management</source> + <source>Create a .hgignore file with default values</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> + <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="597"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="597"/> + <source>Create changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <source>Create changegroup file collecting changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <source>Apply changegroups...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <source>Apply one or several changegroup files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> + <source>Changegroup Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <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="619"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> <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> @@ -16706,100 +16741,120 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> - <source>Mark a selectable changeset as good</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> - <source>Mark as "bad"</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> - <source>Mark a selectable changeset as bad</source> + <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> - <source>Skip</source> - <translation type="unfinished">跳过</translation> + <source>Mark as "bad"</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> - <source>Skip the current changeset</source> + <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> - <source><b>Skip</b><p>This skips the current changeset.</p></source> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> - <source>Reset</source> - <translation type="unfinished">重置</translation> + <source>Skip</source> + <translation type="unfinished">跳过</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> - <source>Reset the bisect search data</source> + <source>Skip the current changeset</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <source><b>Skip</b><p>This skips the current changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="679"/> + <source>Reset</source> + <translation type="unfinished">重置</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <source>Reset the bisect search data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> - <source>Mark as "good"...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> + <source>Mark as "good"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source>Preview a changegroup file containing a collecting of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collecting of changesets.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Identify</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Identify...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <source>Identify the project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> + <source><b>Identify</b><p>This identifies the project directory.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -16995,7 +17050,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="186"/> <source>Mercurial Status</source> <translation type="unfinished"></translation> </message> @@ -17081,95 +17136,110 @@ <translation type="unfinished">添加到储存库</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="61"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="63"/> <source>Revert changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="64"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="66"/> <source>Adjust column sizes</source> <translation type="unfinished">调整列宽</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="85"/> - <source>added</source> - <translation type="unfinished">已添加</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="88"/> - <source>modified</source> - <translation type="unfinished">已修改</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="89"/> - <source>removed</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="90"/> - <source>not tracked</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="86"/> - <source>normal</source> - <translation type="unfinished">标准</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="87"/> - <source>ignored</source> - <translation type="unfinished">已忽略</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="91"/> + <source>added</source> + <translation type="unfinished">已添加</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="94"/> + <source>modified</source> + <translation type="unfinished">已修改</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> + <source>removed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="96"/> + <source>not tracked</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="92"/> + <source>normal</source> + <translation type="unfinished">标准</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="93"/> + <source>ignored</source> + <translation type="unfinished">已忽略</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="97"/> <source>missing</source> <translation type="unfinished">遗漏</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="187"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="193"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="187"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="193"/> <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/HgStatusDialog.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="374"/> <source>Commit</source> <translation type="unfinished">提交</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="414"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="435"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished">没有未提交的更改可用或被选择。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="400"/> <source>Add</source> <translation type="unfinished">添加</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="400"/> <source>There are no unversioned entries available/selected.</source> <translation type="unfinished">没有未版本化的条目可用或被选择。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="414"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="435"/> <source>Revert</source> <translation type="unfinished">还原</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="61"/> + <source>Remove from repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="420"/> + <source>Remove</source> + <translation type="unfinished">移除</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="420"/> + <source>There are no missing entries available/selected.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgStatusMonitorThread</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="103"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="107"/> <source>Mercurial status checked successfully</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="118"/> <source>Could not start the Mercurial process.</source> <translation type="unfinished"></translation> </message> @@ -23501,12 +23571,12 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="828"/> + <location filename="Preferences/__init__.py" line="829"/> <source>Export Preferences</source> <translation>导出首选项</translation> </message> <message> - <location filename="Preferences/__init__.py" line="847"/> + <location filename="Preferences/__init__.py" line="848"/> <source>Import Preferences</source> <translation>导入首选项</translation> </message> @@ -25279,34 +25349,39 @@ <context> <name>ProjectBrowser</name> <message> - <location filename="Project/ProjectBrowser.py" line="70"/> + <location filename="Project/ProjectBrowser.py" line="71"/> <source>up to date</source> <translation>最新</translation> </message> <message> - <location filename="Project/ProjectBrowser.py" line="71"/> - <source>files added</source> - <translation>文件已添加</translation> - </message> - <message> <location filename="Project/ProjectBrowser.py" line="72"/> - <source>local modifications</source> - <translation>本地修改</translation> + <source>files added</source> + <translation>文件已添加</translation> </message> <message> <location filename="Project/ProjectBrowser.py" line="73"/> + <source>local modifications</source> + <translation>本地修改</translation> + </message> + <message> + <location filename="Project/ProjectBrowser.py" line="75"/> <source>files replaced</source> <translation>文件已替换</translation> </message> <message> + <location filename="Project/ProjectBrowser.py" line="76"/> + <source>update required</source> + <translation>已请求更新</translation> + </message> + <message> + <location filename="Project/ProjectBrowser.py" line="77"/> + <source>conflict</source> + <translation>冲突</translation> + </message> + <message> <location filename="Project/ProjectBrowser.py" line="74"/> - <source>update required</source> - <translation>已请求更新</translation> - </message> - <message> - <location filename="Project/ProjectBrowser.py" line="75"/> - <source>conflict</source> - <translation>冲突</translation> + <source>files removed</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -25322,7 +25397,7 @@ <translation>版本控制系统状态</translation> </message> <message> - <location filename="Project/ProjectBrowserModel.py" line="599"/> + <location filename="Project/ProjectBrowserModel.py" line="601"/> <source>local</source> <translation>本地</translation> </message> @@ -33728,22 +33803,22 @@ <context> <name>SvnProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="584"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="583"/> <source>Version Control</source> <translation>版本控制</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="595"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="594"/> <source>Update from repository</source> <translation>从储存库更新</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="597"/> <source>Commit changes to repository...</source> <translation>将更改提交到储存库中……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="603"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="602"/> <source>Add to repository</source> <translation>添加到储存库</translation> </message> @@ -33753,62 +33828,62 @@ <translation>添加树到储存库</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="606"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="605"/> <source>Remove from repository (and disk)</source> <translation>从储存库（和磁盘）中移除</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="499"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="498"/> <source>Copy in repository</source> <translation>在储存库中复制</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="501"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="500"/> <source>Move in repository</source> <translation>在储存库中移动</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="612"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="611"/> <source>Add to Changelist</source> <translation>添加更改列表</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="615"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="614"/> <source>Remove from Changelist</source> <translation>从更改列表中移除</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="512"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="511"/> <source>Show log</source> <translation>显示日志</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="515"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="514"/> <source>Show limited log</source> <translation>显示受限日志</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="518"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="517"/> <source>Show log browser</source> <translation>显示日志浏览器</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="619"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="618"/> <source>Show status</source> <translation>显示状态</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="623"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="622"/> <source>Show difference</source> <translation>显示差异</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="625"/> <source>Show difference (extended)</source> <translation>显示差异（扩展）</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="630"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="629"/> <source>Show difference (URLs)</source> <translation>显示差异（URL）</translation> </message> @@ -33818,82 +33893,82 @@ <translation>显示有注释的文件</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="635"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="634"/> <source>Revert changes</source> <translation>还原改变</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="638"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="637"/> <source>Merge changes</source> <translation>合并更改</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="640"/> <source>Resolve conflict</source> <translation>解析冲突</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="393"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="392"/> <source>Lock</source> <translation>闭锁</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="396"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="395"/> <source>Unlock</source> <translation>解锁</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="399"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="398"/> <source>Break Lock</source> <translation>Break Lock</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="402"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="401"/> <source>Steal Lock</source> <translation>Steal Lock</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="643"/> <source>Set Property</source> <translation>设置属性</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="646"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="645"/> <source>List Properties</source> <translation>列出属性</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="648"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="647"/> <source>Delete Property</source> <translation>删除属性</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="651"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="650"/> <source>Select all local file entries</source> <translation>选择所有本地文件条目</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="653"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="652"/> <source>Select all versioned file entries</source> <translation>选择所有版本化的文件条目</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="655"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="654"/> <source>Select all local directory entries</source> <translation>选择所有本地文件夹条目</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="657"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="656"/> <source>Select all versioned directory entries</source> <translation>选择所有版本化的文件夹条目</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="660"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="659"/> <source>Configure...</source> <translation>配置……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="525"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="524"/> <source>Show repository info</source> <translation>显示储存库信息</translation> </message> @@ -41715,6 +41790,16 @@ <source>Automatic updates enabled</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/VcsPage.ui" line="262"/> + <source>VCS status "removed":</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/VcsPage.ui" line="275"/> + <source>Select the background colour for entries with VCS status "removed".</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>VcsProjectBrowserHelper</name> @@ -45224,30 +45309,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1014"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1381"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1388"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1385"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1392"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1033"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1047"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1054"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -45258,23 +45343,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1382"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1377"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1384"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1389"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1396"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1392"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1399"/> <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>
